xzt-780,691

src/views/purchase/DemandSummary/add.vue

@@ -63,11 +63,19 @@
               :disabled="scope.row.status !== '1' || lineDisable"
               active-value="Y"
               inactive-value="N"
+              @change="clean(scope.row, '选择补单供应商')"
               active-color="#13ce66"
               inactive-color="#a1a3a9">
             </el-switch>
           </template>
         </el-table-column>
+        <el-table-column show-overflow-tooltip label="补单供应商" align="center"  prop="additionalSupplierName" width="200px">
+          <template slot-scope="scope">
+              <el-input clearable :disabled="scope.row.isReplenishment == 'N' || lineDisable" size="mini" v-model="scope.row.additionalSupplierName" @clear="clean(scope.row, '选择补单供应商')" @focus="chooseMxHW(scope.$index, 'SUPPLIER_PARAM', true, '选择补单供应商')">
+                <el-button size="mini" :disabled="scope.row.isReplenishment == 'N' || lineDisable" slot="append" icon="el-icon-more" @click="chooseMxHW(scope.$index, 'SUPPLIER_PARAM', true, '选择补单供应商')"></el-button>
+              </el-input>
+          </template>
+        </el-table-column>
         <el-table-column show-overflow-tooltip label="需求单单号" align="center" prop="code" width="150"/>
         <el-table-column show-overflow-tooltip label="供应仓库" align="center" prop="lastWarehouseName" width="150"/>
         <el-table-column show-overflow-tooltip label="供应货位" align="center" prop="lastAllocationName" width="150"/>
@@ -75,7 +83,7 @@
         <el-table-column show-overflow-tooltip label="收货仓库" align="center" prop="deliveryWarehouseName" width="150"/>
         <el-table-column show-overflow-tooltip label="收货货位" align="center" prop="deliveryAllocationName" width="200">
           <template slot-scope="scope">
-            <el-input clearable :disabled="scope.row.status !== '1' || lineDisable" size="mini" v-model="scope.row.deliveryAllocationName" @clear="clean(scope.row)" @focus="chooseMxHW(scope.$index, 'ALLOCATION_PARAM', true, '收货货位', scope.row.deliveryWarehouse)">
+            <el-input clearable :disabled="scope.row.status !== '1' || lineDisable" size="mini" v-model="scope.row.deliveryAllocationName" @clear="clean(scope.row, '收货货位')" @focus="chooseMxHW(scope.$index, 'ALLOCATION_PARAM', true, '收货货位', scope.row.deliveryWarehouse)">
               <el-button size="mini" :disabled="scope.row.status !== '1' || lineDisable" slot="append" icon="el-icon-more" @click="chooseMxHW(scope.$index, 'ALLOCATION_PARAM', true, '收货货位', scope.row.deliveryWarehouse)"></el-button>
             </el-input>
           </template>
@@ -298,11 +306,21 @@ export default {
         this.tableList[this.tableIndex].deliveryAllocationName = selection[0].name
         this.tableList[this.tableIndex].deliveryAllocation = selection[0].id
       }
+      if (this.referCondition.title == '选择补单供应商') {
+        this.tableList[this.tableIndex].additionalSupplierName = selection[0].name
+        this.tableList[this.tableIndex].additionalSupplier = selection[0].id
+      }
     },
     // 清空选中的货位
-    clean(row) {
-      row.deliveryAllocation = ''
-      row.deliveryAllocationName = ''
+    clean(row, title) {
+      if (title == '收货货位') {
+        row.deliveryAllocation = ''
+        row.deliveryAllocationName = ''
+      }
+      if (title == '选择补单供应商') {
+        row.additionalSupplier = ''
+        row.additionalSupplierName = ''
+      }
     }
   }
 }

src/views/purchase/PurchaseDemandList/add.vue

@@ -212,7 +212,7 @@
           <el-table-column show-overflow-tooltip label="物料编码" align="center" prop="materialCode" width="230px">
             <template slot-scope="scope">
               <el-form-item class="hang" :prop="'puDemandItemList.' + scope.$index + '.' + 'materialCode'" :rules="{ required: true, message: '请选择物料编码', trigger: 'blur' }">
-                <el-input clearable :disabled="sonDisable" size="mini" v-model="scope.row.materialCode" @paste.native="pasteMe($event, scope)">
+                <el-input clearable :disabled="sonDisable" size="mini" v-model="scope.row.materialCode" @paste.native="pasteMe($event, scope, scope.$index)">
                   <el-button size="mini" :disabled="sonDisable" slot="append" icon="el-icon-more" @click="chooseMaterial(scope.$index)"></el-button>
                 </el-input>
               </el-form-item>
@@ -256,7 +256,7 @@
             </el-table-column>
             <el-table-column show-overflow-tooltip label="预留周期" align="center" prop="reservedPeriod" width="150px">
               <template slot-scope="scope">
-                <el-form-item class="hang" :prop="'puDemandItemList.' + scope.$index + '.' + 'reservedPeriod'" :rules="{ required: scope.row.reservedProportion !== '', message: '请填写预留周期', trigger: 'blur' }">
+                <el-form-item class="hang" :prop="'puDemandItemList.' + scope.$index + '.' + 'reservedPeriod'" :rules="{ required: scope.row.reservedProportion && scope.row.reservedProportion !== '' , message: '请填写预留周期', trigger: 'blur' }">
                   <el-input type="number" min="0" clearable :readonly="sonDisable" size="mini" v-model="scope.row.reservedPeriod"></el-input>
                 </el-form-item>
               </template>
@@ -738,11 +738,11 @@ export default {
         scope.row.reservedQty = Math.ceil(scope.row.reservedProportion.replace('%', '') / 100 * scope.row.qty)
       }
       // 如果选择预留比例,预留周期必填
-      if(scope.row.reservedQty && scope.row.reservedQty !== 0) {
-        this.isYl = true
-      } else {
-        this.isYl = false
-      }
+      // if(scope.row.reservedQty && scope.row.reservedQty !== 0) {
+      //   this.isYl = true
+      // } else {
+      //   this.isYl = false
+      // }
     },
     copy() {
       this.$modal.msgSuccess("复制成功");
@@ -1184,7 +1184,7 @@ export default {
       }
     },
     // 粘贴来的数据
-    pasteMe(e, scope) {
+    pasteMe(e, scope, index) {
       e.preventDefault() //阻止默认粘贴事件
       let source = e.clipboardData.getData("Text");
       console.log('scope', scope.column.property)
@@ -1196,6 +1196,9 @@ export default {
       console.log('列表的数组',this.basicForm.puDemandItemList)
       rows.forEach(item => {
         console.log('items',item)
+        // getRefer({ type: 'MATERIAL_PARAM', code: item }).then(res => {
+
+        // })
         this.basicForm.puDemandItemList.push(this.basicForm.puDemandItemList[scope.$index])
       })
       console.log('列表', this.basicForm.puDemandItemList)
@@ -1471,6 +1474,10 @@ export default {
 .hang ::v-deep .el-form-item__content{
   margin-left: 0px !important;
 }
+.el-table ::v-deep .el-form-item__error{
+  padding-top: 0;
+  top: 70%
+}
 .el-table ::v-deep .success-row {
   background: #f11616;
 }