From 602483053dabc07d963b1013072778da6a583daf Mon Sep 17 00:00:00 2001
From: bawei <95887577@qq.com>
Date: Wed, 19 Apr 2023 14:22:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BD=A6=E8=BE=86=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E4=BF=AE=E6=94=B9=E6=88=90=E5=90=88=E5=90=8C=E5=92=8C?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/tradeupload/TradeuploadInfoVO.java  |   6 +
 .../model/tradeupload/TradeuploadListVO.java  |   6 +
 .../poundlist/VechicleForm.vue                | 162 +++++++++++++-----
 .../scm/basicInformation/poundlist/index.vue  |   6 +-
 4 files changed, 133 insertions(+), 47 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadInfoVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadInfoVO.java
index e233c68c..09a74746 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadInfoVO.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadInfoVO.java
@@ -153,4 +153,10 @@ public class TradeuploadInfoVO{
 
         @JsonProperty("purchaseName")
         private String purchaseName;
+
+        @JsonProperty("salesStatus")
+        private String salesStatus;
+
+        @JsonProperty("purchaseStatus")
+        private String purchaseStatus;
 }
\ No newline at end of file
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadListVO.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadListVO.java
index b949a5a0..e5975992 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadListVO.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadListVO.java
@@ -185,4 +185,10 @@ public class TradeuploadListVO{
     /** 收货单价 **/
     @JsonProperty("collectPrice")
     private String collectPrice;
+
+    @JsonProperty("salesStatus")
+    private String salesStatus;
+
+    @JsonProperty("purchaseStatus")
+    private String purchaseStatus;
 }
\ No newline at end of file
diff --git a/SC-web/src/views/scm/basicInformation/poundlist/VechicleForm.vue b/SC-web/src/views/scm/basicInformation/poundlist/VechicleForm.vue
index d0e21a20..829848cd 100644
--- a/SC-web/src/views/scm/basicInformation/poundlist/VechicleForm.vue
+++ b/SC-web/src/views/scm/basicInformation/poundlist/VechicleForm.vue
@@ -1,12 +1,12 @@
 <template>
-  <el-dialog :title="!dataForm.id ? '添加车辆图片' :  isDetail ? '添加车辆图片':'添加车辆图片'" :close-on-click-modal="false" append-to-body
+  <el-dialog :title="!dataForm.id ? '编辑合同与图片' :  isDetail ? '编辑合同与图片':'编辑合同与图片'" :close-on-click-modal="false" append-to-body
              :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll width="1500px">
     <el-row :gutter="15" class="">
       <el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="100px" label-position="right">
         <template v-if="!loading">
           <el-col :span="12">
-            <el-form-item label="磅单上传" disabled prop="poundPictures">
-              <JNPF-UploadImgB disabled v-model="dataForm.poundPictures" :fileSize="500" sizeUnit="MB" :limit="1" :disabled="true">
+            <el-form-item label="磅单上传"  prop="poundPictures">
+              <JNPF-UploadImgB  v-model="dataForm.poundPictures" :fileSize="500" sizeUnit="MB" :limit="1">
               </JNPF-UploadImgB>
             </el-form-item>
           </el-col>
@@ -37,7 +37,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="销售合同" prop="salesId">
-              <popupSelect disabled v-model="dataForm.salesId" placeholder="请选择合同" clearable field="salesId"
+              <popupSelect  v-model="dataForm.salesId" placeholder="请选择合同" clearable field="salesId"
                            interfaceId="396203872441416837" :columnOptions="salesIdcolumnOptions" propsValue="id"
                            relationField="contract_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px" :bissId="dataForm.customerId"
                            hasPage :pageSize="20">
@@ -46,7 +46,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="采购合同" prop="purchaseId">
-              <popupSelect disabled v-model="dataForm.purchaseId" placeholder="请选择合同" clearable field="purchaseId"
+              <popupSelect  v-model="dataForm.purchaseId" placeholder="请选择合同" clearable field="purchaseId"
                            interfaceId="397408984857931205" :columnOptions="salesIdcolumnOptions" propsValue="id"
                            relationField="contract_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px"
                            hasPage :pageSize="20" @change="customerSelect2">
@@ -198,6 +198,7 @@
   export default {
     components: {},
     props: [],
+
     data() {
       return {
         submitDisabled: false,
@@ -238,6 +239,13 @@
           remark: '',
           creatorTime: "",
           isExamine: "",
+          purchaseStatus: 0,
+          salesStatus: 0,
+
+          purchaseIdOld:0,
+          purchaseId:0,
+          salesIdOld:0,
+          salesId:0,
         },
         rules: {
           materialId: [{
@@ -477,6 +485,7 @@
         this.dataForm.buckleWeight = res.data.buckleWeight;
         this.dataForm.netWeight = res.data.netWeight;
         this.dataForm.vehiclePictures = JSON.parse(res.data.vehiclePictures);
+
       },
       changePicture(a, b) {
         this.dataForm.vehiclePictures = JSON.parse(b.vehiclephotos);
@@ -516,19 +525,7 @@
           }
         })
       },
-      // poundAI(){
-      //   let formData = new FormData();
-      //   let file = this.dataForm.poundPictures
-      //   formData.append('file',file);
-      //   request({
-      //     url: '/api/tradeupload/Tradeupload/poundai',
-      //     method: 'post',
-      //     data: formData
-      //   }).then(res => {
-      //     this.dataInfo(res.data)
-      //     this.loading = false
-      //   });
-      // },
+
       clearData(data) {
         for (let key in data) {
           if (data[key] instanceof Array) {
@@ -566,38 +563,112 @@
       },
       // 表单提交
       dataFormSubmit() {
-        var tareWeight = this.dataForm.tareWeight;//皮重
-        var grossWeight = this.dataForm.grossWeight;//毛重
-        var buckleWeight = this.dataForm.buckleWeight;//扣重
-        var netWeight = this.dataForm.netWeight;//净重
+        var purchaseStatus = this.dataForm.purchaseStatus;//采购状态
+        var salesStatus = this.dataForm.salesStatus;//销售状态
         this.dataForm.isExamine = '1';
         this.dataForm.unit = this.dataForm.unit ? this.dataForm.unit : 0;
         this.dataForm.transportType = this.dataForm.transportType ? this.dataForm.transportType : 0;
         this.dataForm.advance = this.dataForm.advance ? this.dataForm.advance : 0;
-        if(grossWeight < tareWeight + buckleWeight + netWeight){
-          this.$message({
-            message: '毛重不得小于皮重+扣重+净重',
-            type: 'success',
-            duration: 1000
-          })
-          return
-        }
-        if(buckleWeight >= netWeight){
-          this.$message({
-            message: '扣重不得大于净重',
-            type: 'success',
-            duration: 1000
-          })
-          return
+
+        // var purchaseName1=this.dataForm.purchaseName;
+         var purchaseIdOld=this.dataForm.purchaseIdOld;
+         var salesIdOld=this.dataForm.salesIdOld;
+        if (purchaseIdOld !=this.dataForm.purchaseId ){
+          if (purchaseStatus==0){
+            this.$message({
+              message: '采购订单已经生成，现在是待开票状态',
+              type: 'success',
+              duration: 1000
+            })
+            return
+          }
+          if (purchaseStatus==1){
+            this.$message({
+              message: '采购订单已经生成，现在是开票中状态',
+              type: 'success',
+              duration: 1000
+            })
+            return
+          }
+          if (purchaseStatus==2){
+            this.$message({
+              message: '采购订单已经生成，现在是已入库状态',
+              type: 'success',
+              duration: 1000
+            })
+            return
+          }
+          if (purchaseStatus==3){
+            this.$message({
+              message: '采购订单已经生成，现在是归档状态',
+              type: 'success',
+              duration: 1000
+            })
+            return
+          }
         }
-        if(buckleWeight >= grossWeight){
-          this.$message({
-            message: '扣重不得大于毛重',
-            type: 'success',
-            duration: 1000
-          })
-          return
+
+
+        if (salesIdOld !=this.dataForm.salesId ){
+          if (salesStatus==0){
+            this.$message({
+              message: '销售订单已经生成，现在是待发货状态',
+              type: 'success',
+              duration: 1000
+            })
+            return
+          }
+          if (salesStatus==1){
+            this.$message({
+              message: '销售订单已经生成，现在是待开票状态',
+              type: 'success',
+              duration: 1000
+            })
+            return
+          }
+          if (salesStatus==2){
+            this.$message({
+              message: '销售订单已经生成，现在是待回款状态',
+              type: 'success',
+              duration: 1000
+            })
+            return
+          }
+          if (salesStatus==3){
+            this.$message({
+              message: '销售订单已经生成，现在是归档状态',
+              type: 'success',
+              duration: 1000
+            })
+            return
+          }
         }
+
+
+        // if(grossWeight < tareWeight + buckleWeight + netWeight){
+        //   this.$message({
+        //     message: '毛重不得小于皮重+扣重+净重',
+        //     type: 'success',
+        //     duration: 1000
+        //   })
+        //   return
+        // }
+        // if(buckleWeight >= netWeight){
+        //   this.$message({
+        //     message: '扣重不得大于净重',
+        //     type: 'success',
+        //     duration: 1000
+        //   })
+        //   return
+        // }
+        // if(buckleWeight >= grossWeight){
+        //   this.$message({
+        //     message: '扣重不得大于毛重',
+        //     type: 'success',
+        //     duration: 1000
+        //   })
+        //   return
+        // }
         this.$refs['elForm'].validate((valid) => {
           if (valid) {
             this.request2()
@@ -736,6 +807,9 @@
         }else{
           _dataAll.originPlace = []
         }
+        _dataAll.purchaseIdOld = _dataAll.purchaseId;
+        _dataAll.salesIdOld = _dataAll.salesId;
+        console.log(_dataAll)
         this.dataForm = _dataAll
       },
     },
diff --git a/SC-web/src/views/scm/basicInformation/poundlist/index.vue b/SC-web/src/views/scm/basicInformation/poundlist/index.vue
index 3e75b505..e7dee03d 100644
--- a/SC-web/src/views/scm/basicInformation/poundlist/index.vue
+++ b/SC-web/src/views/scm/basicInformation/poundlist/index.vue
@@ -649,7 +649,7 @@
                 type="text"
                 @click="addOvheicle(scope.row.id)"
                 v-has="'btn_addOvheicle'"
-                >添加车辆图片
+                >编辑合同与图片
               </el-button>
             </template>
           </el-table-column>
@@ -1275,10 +1275,10 @@ export default {
         this.$refs.JNPFForm.init(id, false);
       });
     },
-    addOvheicle(id, isDetail) {
+    addOvheicle(id, isDetail,salesStatus) {
       this.formVisible6 = true;
       this.$nextTick(() => {
-        this.$refs.JNPFForm6.init(id, isDetail);
+        this.$refs.JNPFForm6.init(id, isDetail,salesStatus);
       });
     },
     exportData() {