Merge remote-tracking branch 'origin/master'

src/views/bpm/handleTask/components/inoutBound/common.js

@@ -81,6 +81,12 @@ export const tableHeader = (selectEquiType) => {
         { label: '规格', prop: 'specification' },
         { label: '型号', prop: 'modelType' }
       ];
+    default:
+      return [
+        { label: '牌号', prop: 'brandNum' },
+        { label: '规格', prop: 'specification' },
+        { label: '型号', prop: 'modelType' }
+      ];
   }
 
   return [];

src/views/bpm/handleTask/components/purchaseOrder/invoice/detailDialog.vue

@@ -165,6 +165,7 @@
     <add
       ref="add"
       v-if="activeComp == 'inoutBound'"
+      :inboundType="form.sourceType"
       type="sourceBizNo"
       @success="success"
     ></add>

src/views/bpm/handleTask/components/purchaseOrder/invoice/procurementWarehousing.vue

@@ -670,11 +670,7 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
-            <el-table-column
-              v-if="formData.bizType == 2 || formData.bizType == 1"
-              label="物料代号"
-              prop="materielCode"
-            >
+            <el-table-column label="物料代号" prop="materielCode">
               <template slot-scope="{ row }">
                 <el-input
                   v-if="!row.isPack"
@@ -880,24 +876,16 @@
               label="计量单位"
               prop="measuringUnit"
             ></el-table-column>
-            <el-table-column
-              v-if="formData.bizType == 2"
-              label="物料代号"
-              prop="meterielCode"
-            >
+            <el-table-column label="物料代号" prop="meterielCode">
               <template slot-scope="{ row }">
                 <el-input
                   v-model="row.materielCode"
                   v-if="!row.isPack"
                 ></el-input>
-                <span v-else>{{ row.materialCode }}</span>
+                <span v-else>{{ row.materielCode }}</span>
               </template>
             </el-table-column>
-            <el-table-column
-              v-if="formData.bizType == 2 || formData.bizType == 1"
-              label="客户代号"
-              prop="clientCode"
-            >
+            <el-table-column label="客户代号" prop="clientCode">
               <template slot-scope="{ row }">
                 <el-input
                   v-model="row.clientCode"
@@ -906,33 +894,19 @@
                 <span v-else> {{ row.clientCode }}</span>
               </template>
             </el-table-column>
-            <el-table-column
-              v-if="formData.bizType == 1"
-              label="刻码"
-              prop="engrave"
-            >
+            <el-table-column label="刻码" prop="engrave">
               <template slot-scope="{ row }">
                 <el-input v-model="row.engrave" v-if="!row.isPack"></el-input>
                 <span v-else> {{ row.engrave }}</span>
               </template>
             </el-table-column>
-            <el-table-column
-              width="100"
-              v-if="formData.bizType == 2 || formData.bizType == 1"
-              label="重量"
-              prop="weight"
-            >
+            <el-table-column width="100" label="重量" prop="weight">
               <template slot-scope="{ row }">
                 <el-input v-model="row.weight" v-if="!row.isPack"></el-input>
                 <span v-else>{{ row.weight }}</span>
               </template>
             </el-table-column>
-            <el-table-column
-              v-if="formData.bizType == 2 || formData.bizType == 1"
-              label="重量单位"
-              prop="weightUnit"
-              width="100"
-            >
+            <el-table-column label="重量单位" prop="weightUnit" width="100">
             </el-table-column>
             <el-table-column label="质检结果" prop="result" width="120">
               <template slot-scope="{ row }">
@@ -1209,6 +1183,7 @@
           .flat();
       },
       tableHeader() {
+        console.log('tableHeader--------', tableHeader(this.selectEquiType));
         return tableHeader(this.selectEquiType);
       }
     },
@@ -1374,6 +1349,7 @@
         // 根据编码获取物品类别信息详情
         this.formData.sourceBizNo = this.infoData.receiveNo; // 来源单号
         this.formData.extInfo.assetType = this.infoData.categoryLevelTopId; // 入库物品类型
+        this.selectEquiType = 1;
         this.formData.bizType = '2'; // 入库场景(销售入库)
         this.formData.type = '1'; // 出入库类型 2出库 1入库
         this.formData.extInfo.deptName = this.user.info.deptName; // 权属部门

src/views/bpm/outgoingManagement/add.vue

@@ -96,12 +96,12 @@
                     : null
                 "
               >
-                <el-button
+                <!-- <el-button
                   v-if="formData.bizType == 4 || formData.bizType == 3"
                   slot="append"
                   icon="el-icon-circle-close"
                   @click.stop="onClear"
-                ></el-button>
+                ></el-button> -->
               </el-input>
             </el-form-item>
           </el-col>

src/views/bpm/stockManagement/add.vue

@@ -1268,6 +1268,7 @@
         }
       };
     },
+    props: ['inboundType'],
     computed: {
       // 条码信息
       materialCodeReqList() {
@@ -2033,12 +2034,22 @@
                   this.$set(i, 'minPackingCount ', item.minPackingCount);
                   this.$set(i, 'measuringUnit', item.measuringUnit);
                   this.$set(i, 'isPack', false);
-                  if (this.formData.extInfo.assetType == 1) {
+                  console.log('inboundType------------', this.inboundType);
+                  if (this.inboundType == '1') {
+                    // 生产性采购
+                    this.$set(i, 'result', '');
                     this.$set(i, 'status', '0');
                   } else {
+                    // 非生产性采购
                     this.$set(i, 'result', '0');
                     this.$set(i, 'status', '1');
                   }
+                  // if (this.formData.extInfo.assetType == 1) {
+                  //   this.$set(i, 'status', '0');
+                  // } else {
+                  //   this.$set(i, 'result', '0');
+                  //   this.$set(i, 'status', '1');
+                  // }
 
                   if (!item.isUnpack) {
                     if (index < item.warehouseLedgerDetails.length - 1) {