Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-web

src/views/reportForms/order-statistics/chart/interior/customerChart.vue

@@ -38,18 +38,18 @@ export default {
     // 初次加载
     firstCusData() {
       this.$nextTick(() => {
-        let nowDate = new Date()
-        let date = {
-          year: nowDate.getFullYear(),
-          month: nowDate.getMonth() + 1
-        }
-        if (date.month >= 1 && date.month <= 9) {
-          date.month = '0' + date.month
-        }
-        var time = date.year + '-' + date.month
+        // let nowDate = new Date()
+        // let date = {
+        //   year: nowDate.getFullYear(),
+        //   month: nowDate.getMonth() + 1
+        // }
+        // if (date.month >= 1 && date.month <= 9) {
+        //   date.month = '0' + date.month
+        // }
+        // var time = date.year + '-' + date.month
 
-        this.queryParam.startYearMonth = time
-        this.queryParam.endYearMonth = time
+        // this.queryParam.startYearMonth = time
+        // this.queryParam.endYearMonth = time
         // this.queryParam.vendorType = '内部'
         cusChart(this.queryParam).then(res => {
           if (res.result) {

src/views/reportForms/order-statistics/chart/interior/departmentChart.vue

@@ -40,18 +40,18 @@ export default {
     // 初次加载
     firstDepData() {
       this.$nextTick(() => {
-        let nowDate = new Date()
-        let date = {
-          year: nowDate.getFullYear(),
-          month: nowDate.getMonth() + 1
-        }
-        if (date.month >= 1 && date.month <= 9) {
-          date.month = '0' + date.month
-        }
-        var time = date.year + '-' + date.month
+        // let nowDate = new Date()
+        // let date = {
+        //   year: nowDate.getFullYear(),
+        //   month: nowDate.getMonth() + 1
+        // }
+        // if (date.month >= 1 && date.month <= 9) {
+        //   date.month = '0' + date.month
+        // }
+        // var time = date.year + '-' + date.month
 
-        this.queryParam.startYearMonth = time
-        this.queryParam.endYearMonth = time
+        // this.queryParam.startYearMonth = time
+        // this.queryParam.endYearMonth = time
         this.queryParam.vendorType = '内部'
         depChart(this.queryParam).then(res => {
           // console.log('2', this.queryParam)

src/views/reportForms/order-statistics/external-statistics.vue

@@ -318,6 +318,8 @@ export default {
     // 时间发生变化的回调，发生在用户选择时间时
     monthChange(value) {
       this.value = value
+      this.queryParam.startYearMonth = ''
+      this.queryParam.endYearMonth = ''
     },
 
     handleTableChange(pagination, filters, sorter) {

src/views/reportForms/order-statistics/interior-statistics.vue

@@ -325,6 +325,8 @@ export default {
     // 时间发生变化的回调，发生在用户选择时间时
     monthChange(value) {
       this.value = value
+      this.queryParam.startYearMonth = ''
+      this.queryParam.endYearMonth = ''
     },
 
     handleTableChange(pagination, filters, sorter) {

src/views/shipment-details/addShipDetDrawer.vue

@@ -657,8 +657,11 @@ export default {
             var rowData = newObj.syShippingDetailsItemList[i];
             for (var j=i+1;j<newObj.syShippingDetailsItemList.length; j++){
               var nextData = newObj.syShippingDetailsItemList[j];
-              if (rowData.syOrderDataItemId == nextData.syOrderDataItemId){
-                this.$message.error('第'+(i+1)+'行和第'+(j+1)+'行物订单子表id重复，无法保存');
+              if (rowData.smallPo == nextData.smallPo && rowData.orderNumber == nextData.orderNumber  && 
+              rowData.preDeliveryDate == nextData.preDeliveryDate  && rowData.preCompletionDate == nextData.preCompletionDate && 
+              rowData.itemNumber == nextData.itemNumber && rowData.inventoryCode == nextData.inventoryCode&& 
+              rowData.colour == nextData.colour&& rowData.size == nextData.size){
+                this.$message.error('第'+(i+1)+'行和第'+(j+1)+'行数据相同，无法保存');
                 return;
               }
             }
@@ -798,7 +801,6 @@ export default {
    //输入手册纱单价或者手册纱占比时触发
    changeManualYarn(data,val){
      console.log(this.syShippingDetailsItemList)
-     debugger
      this.syShippingDetailsItemList.map(item => {
        if(data === 'Price'){item.manualYarnUnitPrice = val}
        else{item.manualYarnProportion = val}

src/views/shipment-details/referOrderDataModal.vue

@@ -441,7 +441,7 @@ export default {
   // props: {},
 
   created() {
-    this.getOrderList()
+    // this.getOrderList()
   },
   methods: {
     // 参照订单数据 查询
@@ -497,8 +497,12 @@ export default {
     },
 
     searchQuery() {
-      this.queryParam.pageNo = '';
+      if(this.queryParam.flourOrGarment === ''){
+        this.$message.error('请选择查询类型！');
+      }else {
+           this.queryParam.pageNo = '';
       this.getOrderList();
+      }
     },
 
     // 重置

src/views/shipment-details/shipmentList.vue

@@ -60,6 +60,17 @@
                   </a-select>
                 </a-form-item>
               </a-col>
+
+              <a-col :md="6" :sm="8">
+                <a-form-model-item label="类型">
+                  <a-select v-model="queryParam.flourOrGarment">
+                    <a-select-option value="">请选择</a-select-option>
+                    <a-select-option value="1">成衣</a-select-option>
+                    <a-select-option value="0">面辅料</a-select-option>
+                  </a-select>
+                </a-form-model-item>
+              </a-col>
+
             </template>
 
             <a-col :md="6" :sm="8">
@@ -496,6 +507,7 @@ export default {
         salesman: '',
         itemNumber: '', // 款号
         refer: '',
+        flourOrGarment: '', //类型
         pageNo: '' // 点击的页数
       },
 
@@ -509,7 +521,7 @@ export default {
     }
   },
   created() {
-    this.getShipmentList() // 渲染 发运明细列表
+    // this.getShipmentList() // 渲染 发运明细列表
   },
   methods: {
     // 分页查询 发运明细
@@ -557,6 +569,7 @@ export default {
         })
       }
     },
+
     //  维护款号成分
     itemNumberElement(record) {
       this.$refs.itemNumEleModal.itemNumEleModVis = true
@@ -704,8 +717,12 @@ export default {
     },
 
     searchQuery() {
+      if(this.queryParam.flourOrGarment === ''){
+       this.$message.error('请选择查询类型！');
+      }else {
       this.queryParam.pageNo = ''
-      this.getShipmentList()
+      this.getShipmentList()        
+      }
     },
 
     searchReset() {