Merge remote-tracking branch 'origin/dev' into dev

src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@@ -291,6 +291,7 @@ import {  update as updatesign } from "@/api/distribution/distributionSignfor";
 import option from '@/option/basic/basicPdarecords';
 import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
+import dayjs from 'dayjs';
 
 export default {
   data() {
@@ -862,6 +863,7 @@ export default {
           row.id = this.signform.deliveryId
           row.clerkSignPictures = this.signform.clerkSignPictures
           row.clerkSignRemarks = this.signform.clerkSignRemarks
+          row.signingTime =dayjs().format("YYYY-MM-DD HH:mm:ss")
           row.signingStatus = '2'
           console.log("更新参数>>>>>>>>",row);
           //  if (!!row.id){

src/views/warehouse/warehouseWaybill.vue

@@ -328,7 +328,7 @@
               {{ itemlimit.productName }}
             </div>
             <div>
-              <el-input v-model="itemlimit.splitNum" placeholder="请输入数量" />
+              <el-input v-model="itemlimit.splitNum" type='number' placeholder="请输入数量" />
             </div>
           </div>
         </div>
@@ -365,7 +365,7 @@
       </div>
     </div>
     <div class="btsbx">
-      <el-button @click="hidedial">取消</el-button>
+      <el-button @click="close">取消</el-button>
       <el-button type="primary" @click="hidedial()">确认</el-button>
     </div>
   </el-dialog>
@@ -783,7 +783,7 @@ export default {
           goods: [
             {
               productName: '',
-              splitNum: 0,
+              splitNum: '',
             },
           ],
         },
@@ -796,7 +796,7 @@ export default {
         goods: [
           {
             productName: '',
-            splitNum: 0,
+            splitNum: '',
           },
         ],
       },
@@ -1097,16 +1097,46 @@ export default {
         var proN = t[i];
         var o = {};
         o.productName = proN;
-        o.splitNum = 0;
         arr[i] = o;
       }
       return arr;
     },
-
+    // inputChange(e){//验证输入饰品件数
+    //     var self = this
+    //     var o = e.target
+    //     o.value=o.value.replace(/[^\d.]/g,'')  
+    //     o.value = o.value.replace(/[^\d.]/g,"");  // 清除“数字”和“.”以外的字符  
+    //       o.value = o.value.replace(/\./g,""); // 只保留第一个. 清除多余的  
+    //       if(o.value.indexOf(".")< 0 && o.value !=""){// 以上已经过滤，此处控制的是如果没有小数点，首位不能为类似于 01、02的金额
+    //         o.value= parseFloat(o.value);
+    //       }
+    //       if(o.value.toString().split(".")[0].length>8){  // 整数部分大于8的时候，限制只能输入8位
+    //           if(o.value.toString().indexOf(".")>-1){
+    //                 o.value = o.value.toString().split(".")[0].substr(0,8)+"."+o.value.toString().split(".")[1]
+    //           }
+    //           else{
+    //                 o.value = o.value.toString().split(".")[0].substr(0,8)
+    //           }
+    //     }
+    //     //o.value  //这个就是最后过来之后的值
+    //     this.value = o.value
+    // },
     hidedial() {
+      //判
+
       let row = [];
       for (let index = 0; index < this.orderlist.length; index++) {
         const element = this.orderlist[index];
+        if(element.goods){
+          var o = element.goods[index]
+          if(!o.splitNum){
+            this.$message({
+              type: 'waring',
+              message: '请输入拆分数量!',
+            });
+            return
+          }
+        }
         let obj = {
           waybillNo: this.rowobj.waybillNo,
           customerPerson: element.name,
@@ -1116,17 +1146,23 @@ export default {
         };
         row.push(obj);
       }
+      console.log(row)
 
       splitOrder(row).then(res => {
         const data = res.data.data;
         this.page.total = data.total;
         this.data = data.records;
         this.loading = false;
+        this.orderlist = [];
         this.selectionClear();
       });
 
       this.dialogTableVisible = false;
     },
+    close() {
+      this.dialogTableVisible = false;
+    },
+
     addorder() {
       // 实现对对象内包含的元素进行copy