From 135ff8e48e04ffd89ac35a30c3552100282466d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= <vayne0702@163.com>
Date: Tue, 21 Feb 2023 16:03:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TradeuploadController.java     |  4 +-
 .../scm/basicInformation/poundlist/Form.vue   | 39 +++++++++++++++----
 .../basicInformation/tradeupload/Form2.vue    | 35 ++++++++---------
 3 files changed, 49 insertions(+), 29 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java
index 42ce3dff..c05e5597 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java
@@ -805,9 +805,9 @@ public class TradeuploadController {
                 return ActionResult.fail("磅单重复");
             }
             tradeuploadService.update(id, subentity);
-            return ActionResult.success("审核成功");
+            return ActionResult.success("更新成功");
         }else{
-            return ActionResult.fail("审核失败，数据不存在");
+            return ActionResult.fail("更新失败，数据不存在");
         }
     }
 
diff --git a/SC-web/src/views/scm/basicInformation/poundlist/Form.vue b/SC-web/src/views/scm/basicInformation/poundlist/Form.vue
index 755fbf3d..cb0ccf08 100644
--- a/SC-web/src/views/scm/basicInformation/poundlist/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/poundlist/Form.vue
@@ -31,7 +31,7 @@
  prop="customerId" >
                     <popupSelect    v-model="dataForm.customerId"
  placeholder="请选择客户名称"  clearable  field="customerId" interfaceId="395936123471343749" :columnOptions="customerIdcolumnOptions" propsValue="id" relationField="supplier_nm" popupType="dialog"
- popupTitle="选择数据"  popupWidth="800px"
+ popupTitle="选择数据"  popupWidth="800px" @change="customerSelect"
   >
 
                 </popupSelect>
@@ -125,7 +125,7 @@
             <el-col :span="12" >
                 <el-form-item  label="单位"
  prop="unit" >
-                    <el-select    v-model="dataForm.unit"
+                    <el-select    v-model="unit"
  placeholder="请选择"  clearable  :style='{"width":"100%"}' @change="unitChange">
                             <el-option v-for="(item, index) in unitOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
 
@@ -135,7 +135,7 @@
             <el-col :span="12" >
                 <el-form-item  label="运输类型"
  prop="transportType" >
-                    <el-select    v-model="dataForm.transportType"
+                    <el-select    v-model="transportType"
  placeholder="请选择"  clearable  :style='{"width":"100%"}' @change="transportTypeChange">
                             <el-option v-for="(item, index) in transportTypeOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
 
@@ -145,7 +145,7 @@
             <el-col :span="12" >
                 <el-form-item  label="是否垫资"
  prop="advance" >
-                    <el-select    v-model="dataForm.advance"
+                    <el-select    v-model="advance"
  placeholder="请选择"  clearable  :style='{"width":"100%"}' @change="advanceChange">
                             <el-option v-for="(item, index) in advanceOptions" :key="index" :label="item.fullName" :value="item.id" :disabled="item.disabled" ></el-option>
 
@@ -207,7 +207,7 @@
                 <el-form-item  label="供应商名称"
  prop="supplierName" >
                     <el-input    v-model="dataForm.supplierName"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+ placeholder="请输入"  clearable  :style='{"width":"100%"}' disabled>
 
                 </el-input>
                 </el-form-item>
@@ -215,10 +215,10 @@
             <el-col :span="12" >
                 <el-form-item  label="结算重量"
  prop="settlement" >
-                    <el-input    v-model="dataForm.settlement"
- placeholder="请输入"  clearable  :style='{"width":"100%"}'>
+                    <el-input-number    v-model="dataForm.settlement"
+ placeholder="请输入"  :step="1"  :style='{"width":"100%"}'>
 
-                </el-input>
+                </el-input-number>
                 </el-form-item>
             </el-col>
             <el-col :span="12" >
@@ -438,6 +438,13 @@
                   trigger: 'change'
                 },
               ],
+              supplierName: [
+                {
+                  required: true,
+                  message: '请输入',
+                  trigger: 'blur'
+                },
+              ],
             },
                     materialIdcolumnOptions:[ {"label":"物料编码","value":"item_code"}, {"label":"物料名称","value":"item_name"}, {"label":"单位","value":"primary_unit_of_measure"}, {"label":"默认入库区","value":"in_area"}, {"label":"默认出库区","value":"out_area"},],
                     customerIdcolumnOptions:[ {"label":"客户编码","value":"supplier_cd"}, {"label":"客户名称","value":"supplier_nm"}, {"label":"地址","value":"address"}, {"label":"银行账号","value":"bank_account"},],
@@ -471,6 +478,22 @@
             this.dataForm.supplierName = k.name;
             this.dataForm.supplierId = k.code;
           },
+          customerSelect(e, d) {
+            const query = {
+              code: d.id
+            }
+            request({
+              url: '/api/example/ContractFile/getListByCustomer',
+              method: 'post',
+              data: query
+            }).then((res) => {
+              if(res.data.length > 0){
+                //确定后 根据type 进行保存 不需要组件通讯
+                this.dataForm.salesId = res.data[0].id
+                this.dataForm.salesName = res.data[0].contractName
+              }
+            })
+          },
           handleAvatarSuccess(res, file) {
             this.imageUrl = URL.createObjectURL(file.raw);
             this.dataForm.customerId = res.data.customerId;
diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/Form2.vue b/SC-web/src/views/scm/basicInformation/tradeupload/Form2.vue
index 720bf98c..f722de04 100644
--- a/SC-web/src/views/scm/basicInformation/tradeupload/Form2.vue
+++ b/SC-web/src/views/scm/basicInformation/tradeupload/Form2.vue
@@ -43,30 +43,22 @@
               </popupSelect>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="供应商" prop="supplierName">
-<!--              <popupSelect v-model="dataForm.supplierId" placeholder="请选择供应商" clearable field="supplierId"-->
-<!--                interfaceId="395936123471343749" :columnOptions="supplierIdcolumnOptions" propsValue="id"-->
-<!--                relationField="supplier_nm" popupType="dialog" popupTitle="选择数据" popupWidth="800px" hasPage-->
-<!--                :pageSize="20" @change="customerSelect"-->
-<!--                           disabled >-->
-
-<!--              </popupSelect>-->
-              <el-input v-model="dataForm.supplierName" placeholder="请输入" clearable :style='{"width":"100%"}'>
-
-              </el-input>
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="采购合同" prop="purchaseId">
               <popupSelect v-model="dataForm.purchaseId" placeholder="请选择合同" clearable field="purchaseId"
-                interfaceId="397408984857931205" :columnOptions="purchaseIdcolumnOptions" propsValue="id"
-                relationField="contract_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px"
-                hasPage :pageSize="20" @change="purchaseSelect">
+                           interfaceId="397408984857931205" :columnOptions="purchaseIdcolumnOptions" propsValue="id"
+                           relationField="contract_name" popupType="dialog" popupTitle="选择数据" popupWidth="800px"
+                           hasPage :pageSize="20" @change="purchaseSelect">
 
               </popupSelect>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="供应商" prop="supplierName">
+              <el-input v-model="dataForm.supplierName" placeholder="请输入" clearable :style='{"width":"100%"}' disabled>
+              </el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="采购价格" prop="purchasePrice">
               <el-input-number v-model="dataForm.purchasePrice" :style='{"width":"100%"}'></el-input-number>
@@ -309,12 +301,17 @@
             message: '请输入',
             trigger: 'blur'
           }, ],
-          salesPrice: [{
+          purchaseId: [{
+            required: true,
+            message: '请选择',
+            trigger: 'change'
+          }, ],
+          supplierName: [{
             required: true,
             message: '请输入',
             trigger: 'blur'
           }, ],
-          purchasePrice: [{
+          salesPrice: [{
             required: true,
             message: '请输入',
             trigger: 'blur'