xzt-576

src/views/purchase/PurchaseDemandList/add.vue

@@ -89,6 +89,7 @@
                 clearable
                 type="date"
                 value-format="yyyy-MM-dd"
+                @change="changeDemandDate"
                 size="small"
                 style="width: 200px"
               >
@@ -278,10 +279,10 @@
                   v-model="scope.row.deliveryDate"
                   :readonly="sonDisable"
                   clearable
-                  type="datetime"
+                  type="date"
                   size="small"
-                  format="yyyy-MM-dd"
-                  value-format="yyyy-MM-dd HH:mm:ss"
+                  value-format="yyyy-MM-dd"
+                  :picker-options="pickerOptionsEnd"
                   placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>
@@ -332,6 +333,11 @@
               </el-form-item>
             </template>
           </el-table-column>
+          <el-table-column show-overflow-tooltip label="最终采购执行数量" align="center"  prop="executeQty" width="150px">
+            <template slot-scope="scope">
+              {{scope.row.executeQty ? scope.row.executeQty : 0 }}
+            </template>
+          </el-table-column>
           <el-table-column show-overflow-tooltip label="收货仓库" align="center"  prop="deliveryWarehouseName" width="200px">
             <template slot-scope="scope">
               <el-form-item class="hang">
@@ -551,6 +557,17 @@ export default {
       personOptions: [],
       deptOptions: [],
       customerOptions: [],
+      pickerOptionsEnd: {
+        disabledDate: (time) => {
+          let beginDateVal = this.basicForm.demandDate;
+          if (beginDateVal) {
+            return (
+              time.getTime() <
+              new Date(beginDateVal).getTime() - 8.64e7
+            );
+          }
+        }
+      },
       isBDXQ: false,
       isYl: false
     }
@@ -564,6 +581,12 @@ export default {
     }
   },
   methods: {
+    // 改变单据日期时清空子表的调拨日期
+    changeDemandDate() {
+      this.basicForm.puDemandItemList.forEach(item => {
+        item.deliveryDate = null
+      })
+    },
     // 更改业务类型调整明细行内补单或紧急标识
     changeBillType() {
       if (this.basicForm.billType == 'BDXQ' && this.basicForm.puDemandItemList.length != 0) {

src/views/purchase/transferOrder/add.vue

@@ -324,6 +324,7 @@
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-date-picker
+                  ref="findDate"
                   v-model="scope.row.allotDate"
                   :readonly="sonDisable"
                   type="date"