Merge branch 'dev' of http://172.16.100.139/new-business/drp-web into dev

src/views/material/changeApply/add/column.js

@@ -167,6 +167,8 @@ export default function useColumns(){
               ratifyBatchNo:'ratifyBatchNo',
               expiryUnitId:'expiryUnitId',
               usefulLifeUnitId: 'usefulLifeUnitId',
+              recentWarningPeriod: 'recentWarningPeriod',
+              nearOnsetManagerment: 'nearOnsetManagerment',
             },
 
 
@@ -355,6 +357,28 @@ export default function useColumns(){
             clearable: true,
           },
         },
+        {
+          item:{
+            key:'nearOnsetManagerment',
+            title:'近效期管理',
+          },
+          attr:{
+            is: "el-select",
+            dictName: "sys_number_yes_no",
+            clearable:true,
+          },
+        },
+        {
+          item:{
+            key:'recentWarningPeriod',
+            title:'近效期预警天数',
+          },
+          attr:{
+            is: "el-input-number",
+            min: 0,
+            controlsPosition: "right",
+          },
+        },
 
 
         // {

src/views/material/changeApply/add/index.vue

@@ -357,6 +357,8 @@ export default {
         row.usefulLife = "";
         row.expiryUnitId = "";
         row.usefulLifeUnitId = "";
+        row.nearOnsetManagerment = "2";
+        row.recentWarningPeriod = "";
       }
     },
     // 物料编码
@@ -634,6 +636,18 @@ export default {
               </component>
             </template>
 
+            <!-- 近效期预警天数 -->
+            <template slot="recentWarningPeriod" slot-scope="scope">
+              <component
+                v-bind="scope.attr"
+                v-model="scope.row[scope.item.key]"
+                :size="$attrs.size"
+                :source.sync="scope.row"
+                :disabled="scope.row.expiryDateManagerment !== '0'"
+              >
+              </component>
+            </template>
+
             <ux-table-column
               fixed="right"
               title="操作"

src/views/purchase/PurchaseDemandList/add.vue

@@ -872,7 +872,6 @@ export default {
     },
     // 更改业务类型调整明细行内补单或紧急标识
     changeBillType(val) {
-      console.log(val)
       if (val == 'BDXQ' && this.basicForm.puDemandItemList.length != 0) {
         this.isBDXQ = true
         this.BDZT = false
@@ -888,6 +887,8 @@ export default {
       }
       if (val == 'JJXQ') {
         this.basicForm.planType = 'JJXQ'
+        // 判断需求日期
+        this.dafaultDate()
       } else {
         if (this.basicForm.planType == 'JJXQ') {
           this.basicForm.planType = ''

src/views/purchase/PurchaseDemandList/index.vue

@@ -345,7 +345,7 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column property="deadline" label="截止星期/月份">
+        <el-table-column property="deadline" label="截止星期">
           <template slot-scope="scope">
             <el-input-number size="mini" :min=1 :max="scope.row.ways == 'ZJH' ? 7 : 12 " v-model="scope.row.deadline" clearable @input=changeDeadline(scope.row)></el-input-number>
           </template>
@@ -356,7 +356,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <span style="color: red">注:周计划星期填写范围1-7，月计划填写范围1-12</span>
+      <!-- <span style="color: red">注:周计划星期填写范围1-7，月计划填写范围1-12</span> -->
     </el-dialog>
 
     <Add v-model="isList" v-if="!isList" :pageStu="page" :disable="disable" :row="rowDetail" @refresh="searchList"/>

src/views/purchase/purchase-order/add/index.vue

@@ -839,7 +839,7 @@ export default {
             .map((item, index) => {
               return {
                 ...item,
-                qty: munList[index],
+                qty: munList[index] || item.qty,
               };
             });
           this.params.puOrderItemList = [...invariant, ...change];

src/views/purchase/purchase-order/edit/index.vue

@@ -801,11 +801,18 @@ export default {
             .map((item, index) => {
               return {
                 ...item,
-                qty: munList[index],
+                qty: munList[index] || item.qty,
               };
             });
           this.params.puOrderItemList = [...invariant, ...change];
-          this.handleGetPrice();
+          if (this.params.status === "2") {
+            // 修订
+            this.handleCalculateOrderAmount();
+          } else {
+            // row['whetherCompleteInquiry'] = false;
+
+            this.handleGetPrice();
+          }
         }
       }
     },