第三步

src/api/outcomeWmsApply.js

@@ -76,3 +76,4 @@ export function sureStatus(data) {
   })
 }
 
+

src/data/cjlist.js

+const manufacturer = [
+  {
+    value: '1',
+    label: 'baidu'
+  },
+  {
+    value: '2',
+    label: 'ali'
+  },
+  {
+    value: '3',
+    label: 'taobao'
+  }
+]
+export default manufacturer

src/views/template/enterboundTwo.vue

@@ -50,13 +50,15 @@
           :icon="commonField.queryIcon"
           :size="commonField.smallSize"
           @click="handleQuery"
-        >查询</el-button>
+        >查询
+        </el-button>
         <el-button
           :class="commonField.resetClass"
           :icon="commonField.resetIcon"
           :size="commonField.smallSize"
           @click="resetQuery"
-        >重置</el-button>
+        >重置
+        </el-button>
       </el-form-item>
       <div style="float: right">
         <el-form-item>
@@ -73,7 +75,8 @@
             :icon="commonField.exportIcon"
             :size="commonField.smallSize"
             @click="handleExport"
-          >导出</el-button>
+          >导出
+          </el-button>
         </el-form-item>
       </div>
     </el-form>
@@ -88,6 +91,12 @@
             <span v-else>-</span>
           </template>
         </el-table-column>
+
+        <el-table-column label="cj" prop="cj" :show-overflow-tooltip="true" min-width="120">
+          <template slot-scope="scope">
+            <span v-if="scope.row.cj ">{{ getManufacturerLabel(scope.row.cj) ||'-' }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="code" prop="orderCode" :show-overflow-tooltip="true" min-width="150">
           <template slot-scope="scope">
             {{ scope.row.orderCode || '-' }}
@@ -175,12 +184,21 @@
       @pagination="getList"
     />
     <!--详情-->
-    <el-dialog class="aboutSingleDetails" :title="title" :visible.sync="openDetails" width="700px" append-to-body :close-on-click-modal="false">
+    <el-dialog
+      class="aboutSingleDetails"
+      :title="title"
+      :visible.sync="openDetails"
+      width="700px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
       <el-form ref="formDetails" :model="singleDetails" size="small" label-width="90px">
         <el-row>
           <el-col :span="12">
             <el-form-item label="仓库：" prop="whId">
-              <span v-if="singleDetails.whId && getDataDictLabel(singleDetails.whId)">{{ getDataDictLabel(singleDetails.whId) }}</span>
+              <span v-if="singleDetails.whId && getDataDictLabel(singleDetails.whId)">{{
+                getDataDictLabel(singleDetails.whId)
+              }}</span>
               <span v-else>-</span>
               <!--              <el-input v-model.trim="singleDetails.whId" :readonly="true" />-->
             </el-form-item>
@@ -214,10 +232,15 @@
         <el-row>
           <el-col :span="12">
             <el-form-item label="rank：" prop="rank">
-              <span>{{singleDetails.rank || '-'}}</span>
+              <span>{{ singleDetails.rank || '-' }}</span>
               <!--              <el-input v-model.trim="singleDetails.ioType" :readonly="true" />-->
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="cj:" prop="cj">
+              <span>{{  getManufacturerLabel(singleDetails.cj) || '-' }}</span>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
@@ -279,20 +302,25 @@
             </el-form-item>
           </el-col>
         </el-row>
+
       </el-form>
     </el-dialog>
   </div>
 </template>
 
 <script>
+import manufacturer from '@/data/cjlist'
 import {
   delOutcomeWmsApply,
   addOutcomeWmsApply,
   updateOutcomeWmsApply,
-  exportOutcomeWmsApply } from '@/api/outcomeWmsApply'
+  exportOutcomeWmsApply
+} from '@/api/outcomeWmsApply'
 import commonField from '@/utils/commonField'
 import { getDicts } from '@/api/system/dict/data'
 import { exportIncomeInoutWmsLog, getIncomeInoutWmsLog, listIncomeInoutWmsLog } from '@/api/incomeInoutWmsLog'
+// import manufacturer from "@/api/outcomeWmsJbapplyTemp";
+
 export default {
   name: 'EnterboundTwo',
   data() {
@@ -301,6 +329,8 @@ export default {
       loading: true,
       // 总条数
       total: 0,
+
+      manufacturer: {},
       // 入库记录表格数据
       incomeInoutWmsLogList: [],
       warehouseList: [],
@@ -308,6 +338,7 @@ export default {
         apply_create_date: '',
         income_create_date: '',
         whId: '',
+        cj: '',
         affirmName: '',
         orderCode: '',
         ptype: '',
@@ -324,6 +355,7 @@ export default {
         affirmBy: '',
         affirmDate: ''
       },
+
       // 是否显示弹出层（数据详情）
       openDetails: false,
       // 弹出层标题
@@ -422,6 +454,7 @@ export default {
       ],
       // 查询参数
       queryParams: {
+        cj: '1',
         page: 1,
         rows: 10,
         pn: null,
@@ -434,6 +467,7 @@ export default {
       },
       // 表单参数
       form: {
+        cj: '',
         whId: '',
         pn: null,
         qty: null,
@@ -442,8 +476,7 @@ export default {
         ptype: '2'
       },
       // 表单校验
-      rules: {
-      }
+      rules: {}
     }
   },
   computed: {
@@ -462,11 +495,15 @@ export default {
     next()
   },
   created() {
+    console.log('manufacturer', manufacturer)
+    this.manufacturer = manufacturer
     if (this.$store.getters.searchParams[this.$route.path]) {
-      const { searchParams } = this.$store.getters; const { path } = this.$route
+      const { searchParams } = this.$store.getters
+      const { path } = this.$route
       const param = JSON.parse(searchParams[path]) // 保留着的查询条件
       this.queryParams = { ...param }
     }
+
     this.getList() // 列表查询
     this.getwareHouse()
   },
@@ -476,6 +513,10 @@ export default {
       const dictItem = this.warehouseList.find(item => item.dictValue === whId)
       return dictItem ? dictItem.dictLabel : null
     },
+    getManufacturerLabel(cj) {
+      const manufacturer = this.manufacturer.find(item => item.value === cj)
+      return manufacturer ? manufacturer.label : null
+    },
     /** 查询????列表 */
     getList() {
       this.loading = true
@@ -503,6 +544,7 @@ export default {
     // 表单重置
     reset() {
       this.form = {
+        cj: '1',
         businessId: undefined,
         remarks: undefined,
         pn: undefined,
@@ -530,6 +572,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.queryParams = {
+        cj: '1',
         page: 1,
         rows: 10,
         pn: undefined,
@@ -610,7 +653,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-  .app-container {
+.app-container {
   font-size: 18px;
   padding: 0;
 
@@ -619,5 +662,5 @@ export default {
     background-color: #F4F4F4;
     margin-bottom: 10px
   }
-  }
+}
 </style>

src/views/template/incomeWmsBox.vue

@@ -11,6 +11,20 @@
           style="width: 150px"
         />
       </el-form-item>
+      <el-form-item label="cj" prop="cj">
+        <el-select
+          v-model="queryParams.cj"
+          class="normalSelect"
+          placeholder="请选择厂家"
+        >
+          <el-option
+            v-for="item in manufacturer"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="ptype" prop="ptype">
         <el-select
           v-model="queryParams.ptype"
@@ -95,6 +109,11 @@
             {{ scope.row.orderCode || '-' }}
           </template>
         </el-table-column>
+        <el-table-column label="cj" prop="cj" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            {{ getManufacturerLabel(scope.row.cj) || '-' }}
+          </template>
+        </el-table-column>
         <el-table-column label="ptype" prop="ptype" :show-overflow-tooltip="true" width="100">
           <template slot-scope="scope">
             <span v-if="scope.row.ptype === '1'">jb</span>
@@ -207,6 +226,7 @@ import {
   updateIncomeWmsBox,
   exportIncomeWmsBox } from '@/api/incomeWmsBox'
 import commonField from '@/utils/commonField'
+import manufacturer from '@/data/cjlist'
 export default {
   name: 'IncomeWmsBox',
   data() {
@@ -215,6 +235,7 @@ export default {
       loading: true,
       // 总条数
       total: 0,
+      manufacturer: {},
       // 库存管理表格数据
       incomeWmsBoxList: [],
       // 弹出层标题
@@ -294,6 +315,8 @@ export default {
     next()
   },
   created() {
+    console.log('manufacturer', manufacturer)
+    this.manufacturer = manufacturer
     if (this.$store.getters.searchParams[this.$route.path]) {
       const { searchParams } = this.$store.getters; const { path } = this.$route
       const param = JSON.parse(searchParams[path]) // 保留着的查询条件
@@ -302,6 +325,10 @@ export default {
     this.getList() // 列表查询
   },
   methods: {
+    getManufacturerLabel(cj) {
+      const manufacturer = this.manufacturer.find(item => item.value === cj)
+      return manufacturer ? manufacturer.label : null
+    },
     /** 查询库存管理列表 */
     getList() {
       this.loading = true

src/views/template/outcomeWmsJbapplyTemp.vue

@@ -18,6 +18,20 @@
         </el-select>
       </el-form-item>
 
+      <el-form-item label="cj" prop="cj">
+        <el-select
+          v-model="queryParams.cj"
+          class="normalSelect"
+          placeholder="请选择厂家"
+        >
+          <el-option
+            v-for="item in manufacturer"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="ptype" prop="ptype">
         <el-select
           v-model="queryParams.ptype"
@@ -117,11 +131,6 @@
             <span v-else>-</span>
           </template>
         </el-table-column>
-        <el-table-column label="cj" prop="cj" :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            {{ getManufacturerLabel(scope.row.cj) || '-' }}
-          </template>
-        </el-table-column>
         <el-table-column label="ptype" prop="ptype" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span v-if="scope.row.ptype=== '1'">jb</span>
@@ -129,6 +138,11 @@
             <span v-else>-</span>
           </template>
         </el-table-column>
+        <el-table-column label="cj" prop="cj" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            {{ getManufacturerLabel(scope.row.cj) || '-' }}
+          </template>
+        </el-table-column>
         <el-table-column label="code" prop="orderCode" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.orderCode || '-' }}