zhongtianhaoyuan пре 4 година
родитељ
комит
6753814774

+ 40 - 15
src/views/contractManagement/salesContract.vue

@@ -14,8 +14,7 @@
           >添加</ws-button
         >
         <ws-button
-          :disable="checkBtn"
-          @click="enquiry(3)"
+          @click="exportlist()"
           v-hasPermission="
             `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
           "
@@ -191,7 +190,7 @@ import {
 import { downloadFile } from '@/utils/batchDown'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
-import { dayjs, fmoney, EventBus } from 'base-core-lib'
+import {dayjs, EventBus } from 'base-core-lib'
 export default {
   name: 'viewSpareMoney',
   components: {
@@ -220,8 +219,11 @@ export default {
       // 年
       year: '',
       // 提交类型
-
-      contractType: 1,
+      date: {
+        year: dayjs().format('YYYY'),
+        month: dayjs().format('MM'),
+      },
+      
       currentPage: 1,
       pageSize: 10,
       searchType: 1,
@@ -231,18 +233,18 @@ export default {
       appendixIdsAdd: '',
 
       contractType: 1,
-      currentPage: 1,
-      pageSize: 10,
-      searchType: 1,
-      searchKeyWord: '',
-      startDate: null,
-      endDate: null,
       historyList: {},
       submitType: true,
       contractForm: {},
       categoryIndex: 0,
       rulesVendor: {},
 
+      deptBudgetTotal:{},
+      handleSizeChange:{},
+      handleCurrentChange:{},
+      compId:{},
+      size:{},
+ 
       deptCircularPage: {},
       accessoryTFs: false,
       // pickerBeginDateBefore: {},
@@ -282,6 +284,8 @@ export default {
     this.showType = this.isShow
     console.log(11111)
   },
+
+
   methods: {
     handleClose() {
       this.accessoryTFs = false
@@ -333,10 +337,7 @@ export default {
           this.contractList = response
         })
     },
-    // 上传附件
-    uploadSuccess(data, files, url) {
-      console.log(data, files, url)
-    },
+
 
     // this.deptBudgetList.
     // this.formData.append('files', files)
@@ -354,6 +355,30 @@ export default {
     find() {
       console.log(this)
       this.getList()
+    },
+     async exportlist() {
+    
+      const { data } = await export1(
+        {
+          compId: sessionStorage.getItem('ws-pf_compId'),
+          contractType: this.contractType,
+          currentPage: this.currentPage,
+          pageSize: this.pageSize,
+          searchType: this.searchType,
+          searchKeyWord: this.searchKeyWord,
+          startDate: this.startDate,
+          endDate: this.endDate,
+        },
+        {},
+        { responseType: 'blob' }
+      ).toPromise()
+      downloadFile({
+        res: data,
+        fileName: `${
+          this.date.year + (this.date.month ? `-${this.date.month}` : '')
+        }_销售合同`,
+        type: 'xls',
+      })
     },
     editClick(row) {
       var status = ''

+ 219 - 33
src/views/contractManagement/salesContractAdd.vue

@@ -25,7 +25,7 @@
     <div class="center">
       <ws-form
         ref="deptBudgetList"
-        :rules="ruleDeptBudget"
+        
         :model="deptBudgetList"
       >
         <!--基本信息-->
@@ -33,27 +33,31 @@
         <ws-info-table>
           <!--合同编号-->
           <ws-form-item label="合同编号" span="1" prop="contractNo">
-            <ws-input
+            <ws-input prop="contractNo1"
               v-model="deptBudgetList.contractNo"
-              maxlength="100"
+              placeholder="请输入合同编号"
+              maxlength="20"
               size="small"
+              :rules="ruleDeptBudget"
             />
             <span class="unchangeable">*</span>
           </ws-form-item>
 
           <!--运输方式-->
-          <ws-form-item label="运输方式" span="1" prop="contractNo">
+          <ws-form-item label="运输方式" span="1" prop="shippingType">
             <ws-input
               v-model="deptBudgetList.shippingType"
+              placeholder="请输入运输方式"
               maxlength="100"
               size="small"
             />
           </ws-form-item>
 
           <!--买方-->
-          <ws-form-item label="买方" span="1" prop="contractNo">
+          <ws-form-item label="买方" span="1" prop="buyer">
             <ws-input
               v-model="deptBudgetList.buyer"
+              placeholder="请输入买方名称"
               maxlength="100"
               size="small"
             />
@@ -61,18 +65,20 @@
           </ws-form-item>
 
           <!--结算方式-->
-          <ws-form-item label="结算方式" span="1" prop="contractNo">
+          <ws-form-item label="结算方式" span="1" prop="settlementMethod">
             <ws-input
               v-model="deptBudgetList.settlementMethod"
+              placeholder="请输入结算方式"
               maxlength="100"
               size="small"
             />
           </ws-form-item>
 
           <!--卖方-->
-          <ws-form-item label="卖方" span="1" prop="contractNo">
+          <ws-form-item label="卖方" span="1" prop="seller">
             <ws-input
               v-model="deptBudgetList.seller"
+              placeholder="请输入卖方名称"
               maxlength="100"
               size="small"
             />
@@ -80,36 +86,40 @@
           </ws-form-item>
 
           <!--货源地-->
-          <ws-form-item label="货源地" span="1" prop="contractNo">
+          <ws-form-item label="货源地" span="1" prop="sourceGoods">
             <ws-input
               v-model="deptBudgetList.sourceGoods"
+              placeholder="请输入货源地"
               maxlength="100"
               size="small"
             />
           </ws-form-item>
 
           <!--买方电话-->
-          <ws-form-item label="买方电话" span="1" prop="contractNo">
+          <ws-form-item label="买方电话" span="1" prop="buyerPhone">
             <ws-input
               v-model="deptBudgetList.buyerPhone"
+              placeholder="请输入买方电话"
               maxlength="100"
               size="small"
             />
           </ws-form-item>
 
           <!--交货地-->
-          <ws-form-item label="交货地" span="1" prop="contractNo">
+          <ws-form-item label="交货地" span="1" prop="placeDelivery">
             <ws-input
               v-model="deptBudgetList.placeDelivery"
+              placeholder="请输入交货地"
               maxlength="100"
               size="small"
             />
           </ws-form-item>
 
           <!--卖方电话-->
-          <ws-form-item label="卖方电话" span="1" prop="contractNo">
+          <ws-form-item label="卖方电话" span="1" prop="sellerPhone">
             <ws-input
               v-model="deptBudgetList.sellerPhone"
+              placeholder="请输入卖方电话"
               maxlength="100"
               size="small"
             />
@@ -133,9 +143,10 @@
           </ws-form-item>
 
           <!--重量(吨)-->
-          <ws-form-item label="重量(吨)" span="1" prop="contractNo">
+          <ws-form-item label="重量(吨)" span="1" prop="weight">
             <ws-input
               v-model="deptBudgetList.weight"
+              placeholder="请输入重量(吨)"
               maxlength="100"
               size="small"
             />
@@ -209,9 +220,10 @@
           </ws-form-item>
 
           <!--溢短装(%)-->
-          <ws-form-item label="溢短装(%)" span="1" prop="contractNo">
+          <ws-form-item label="溢短装(%)" span="1" prop="overShort">
             <ws-input
               v-model="deptBudgetList.overShort"
+              placeholder="请输入溢短装比例(%)"
               maxlength="100"
               size="small"
             />
@@ -234,9 +246,10 @@
           </ws-form-item>
 
           <!--合同单价(元/吨)-->
-          <ws-form-item label="合同单价(元/吨)" span="1" prop="contractNo">
+          <ws-form-item label="合同单价(元/吨)" span="1" prop="unitContractPrice">
             <ws-input
               v-model="deptBudgetList.unitContractPrice"
+              placeholder="请输入合同单价"
               maxlength="100"
               size="small"
             />
@@ -257,9 +270,10 @@
           </ws-form-item>
 
           <!--合同总价-->
-          <ws-form-item label="合同总价" span="1" prop="contractNo">
+          <ws-form-item label="合同总价" span="1" prop="totalContractPrice">
             <ws-input
               v-model="deptBudgetList.totalContractPrice"
+              placeholder="请输入合同总价"
               maxlength="100"
               size="small"
             />
@@ -311,9 +325,10 @@
           </ws-form-item>
 
           <!--水分(%)<=-->
-          <ws-form-item label="水分(%)" span="1" prop="contractNo">
+          <ws-form-item label="水分(%)" span="1" prop="waterContent">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.waterContent"
+              placeholder="请输入水分占比"
               maxlength="100"
               size="small"
             />
@@ -337,44 +352,49 @@
           </ws-form-item>
 
           <!--杂质(%)<=-->
-          <ws-form-item label="杂质(%)" span="1" prop="contractNo">
+          <ws-form-item label="杂质(%)" span="1" prop="impurity">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.impurity"
+              placeholder="请输入杂质占比(%)"
               maxlength="100"
               size="small"
             />
           </ws-form-item>
 
           <!--容量(克/升)>=-->
-          <ws-form-item label="容量(克/升)" span="1" prop="contractNo">
+          <ws-form-item label="容量(克/升)" span="1" prop="bulkDensity">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.bulkDensity"
+              placeholder="请输入容重"
               maxlength="100"
               size="small"
             />
           </ws-form-item>
 
           <!--霉变粒(%)<=-->
-          <ws-form-item label="霉变粒(%)" span="1" prop="contractNo">
+          <ws-form-item label="霉变粒(%)" span="1" prop="mildewGrain">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
+              placeholder="请输入霉变粒占比(%)"
               maxlength="100"
               size="small"
             />
           </ws-form-item>
 
           <!--热损伤(%)<=-->
-          <ws-form-item label="热损伤(%)" span="1" prop="contractNo">
+          <ws-form-item label="热损伤(%)" span="1" prop="jiaorenli">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
+              placeholder="请输入输入热损伤占比(%)"
               maxlength="100"
               size="small"
             />
           </ws-form-item>
           <!--不完整粒(%)<=-->
-          <ws-form-item label="不完整粒(%)" span="1" prop="contractNo">
+          <ws-form-item label="不完整粒(%)" span="1" prop="imperfectGrain">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.imperfectGrain"
+              placeholder="请输入不完整粒占比(%)"
               maxlength="100"
               size="small"
             />
@@ -396,54 +416,60 @@
 
         <ws-info-table>
           <!--合同收入(元)-->
-          <ws-form-item label="合同收入(元)" span="1" prop="contractNo">
+          <ws-form-item label="合同收入(元)" span="1" prop="goodsNameKey">
             <ws-input
               v-model="deptBudgetList.contractProcessInfo.goodsNameKey"
+              placeholder="请输入合同收入(元)"
               maxlength="100"
               size="small"
             />
           </ws-form-item>
 
           <!--已开发票(元)-->
-          <ws-form-item label="已开发票(元)" span="1" prop="contractNo">
+          <ws-form-item label="已开发票(元)" span="1" prop="goodsName">
             <ws-input
               v-model="deptBudgetList.contractProcessInfo.goodsName"
+              placeholder="请输入已开发票(元)"
               maxlength="100"
               size="small"
             />
           </ws-form-item>
 
           <!--费用支出(元)-->
-          <ws-form-item label="费用支出(元)" span="1" prop="contractNo">
+          <ws-form-item label="费用支出(元)" span="1" prop="waterContent">
             <ws-input
               v-model="deptBudgetList.contractProcessInfo.waterContent"
+              placeholder="请输入费用支出(元)"
               maxlength="100"
               size="small"
             />
           </ws-form-item>
 
           <!--未开发票(元)-->
-          <ws-form-item label="未开发票(元)" span="1" prop="contractNo">
+          <ws-form-item label="未开发票(元)" span="1" prop="impurity">
             <ws-input
               v-model="deptBudgetList.contractProcessInfo.impurity"
+              placeholder="请输入未开发票(元)"
               maxlength="100"
               size="small"
             />
           </ws-form-item>
 
           <!--未回款(元)-->
-          <ws-form-item label="未回款(元)" span="1" prop="contractNo">
+          <ws-form-item label="未回款(元)" span="1" prop="mildewGrain">
             <ws-input
               v-model="deptBudgetList.contractProcessInfo.mildewGrain"
+              placeholder="请输入未回款(元)"
               maxlength="100"
               size="small"
             />
           </ws-form-item>
 
           <!--已完成发货量(吨)-->
-          <ws-form-item label="已完成发货量(吨)" span="1" prop="contractNo">
+          <ws-form-item label="已完成发货量(吨)" span="1" prop="imperfectGrain">
             <ws-input
               v-model="deptBudgetList.contractProcessInfo.imperfectGrain"
+              placeholder="请输入已完成发货量(吨)"
               maxlength="100"
               size="small"
             />
@@ -500,7 +526,7 @@
       </ws-form>
     </div>
     <div style="text-align: right; padding: 10px" class="center">
-      <el-button class="bg-bottom" type="primary" size="small" @click="submit()"
+      <el-button class="bg-bottom" type="primary" size="small" @click="submit(deptBudgetList)"
         >提交</el-button
       >
     </div>
@@ -521,9 +547,8 @@ import WsUpload from '@/components/WsUpload'
 
 export default {
   name: 'viewSpareMoney',
-  components:{
-  WsUpload,
-
+  components: {
+    WsUpload,
   },
   watch: {
     vesselId(val) {
@@ -584,7 +609,13 @@ export default {
       // selectCrtDuty: {},
       // dutyList: {},
       // sexList: {},
-      ruleDeptBudget: {},
+      ruleDeptBudget: {
+          contractNo: [
+            { required: true, message: '请输入活动名称', trigger: 'blur' },
+            { min: 6, max: 20, message: '长度在 6 到 20 个字符', trigger: 'blur' }
+          ],
+          
+      },
       selectIntendedShip: {},
       interviewTypeList: {},
     }
@@ -670,7 +701,133 @@ export default {
           }
         })
     },
+   
     submit() {
+      if(!this.deptBudgetList.contractNo){
+        this.$message({
+            message: '请输入合同编号',
+            type: 'warning'
+          });
+        return
+      }
+     
+      if(!this.deptBudgetList.shippingType){
+        this.$message({
+          message:'请输入运输方式!',
+          type:'warning'
+        });
+        return
+      }
+      
+      if(!this. deptBudgetList.buyer){
+        this.$message({
+          message:'请输入买方名称!',
+          type:'warning'
+        });
+        return
+      }
+      if(!this.deptBudgetList.seller){
+        this.$message({
+          message:'请输入卖方名称!',
+          type:'warning'
+        });
+        return
+      }
+     
+       if(!this.deptBudgetList.buyerPhone){
+        this.$message({
+          message:'请输入买方电话!',
+          type:'warning'
+        });
+        return
+      }
+       if(isNaN(this.deptBudgetList.buyerPhone)){
+        this.$message({
+          message:'输入买方电话有误!',
+          type:'warning'
+        });
+        return
+      }
+      
+      if(!this.deptBudgetList.sellerPhone){
+        this.$message({
+          message:'请输入卖方电话!',
+          type:'warning'
+        });
+        return
+      }
+       if(isNaN(this.deptBudgetList.sellerPhone)){
+        this.$message({
+          message:'输入卖方电话有误!',
+          type:'warning'
+        });
+        return
+      }
+      if(!this. deptBudgetList.settlementMethod){
+        this.$message({
+          message:'请输入结算方式!',
+          type:'warning'
+        });
+        return
+      }
+     
+      if(!this.deptBudgetList.sourceGoods){
+        this.$message({
+          message:'请输入货源地!',
+          type:'warning'
+        });
+        return
+      }
+      if(!this.deptBudgetList.placeDelivery){
+        this.$message({
+          message:'请输入交货地!',
+          type:'warning'
+        });
+        return
+      }
+      if(!this.deptBudgetList.weight){
+        this.$message({
+          message:'请输入重量!',
+          type:'warning'
+        });
+        return
+      }
+       if(isNaN(this.deptBudgetList.weight)){
+        this.$message({
+          message:'输入重量有误!',
+          type:'warning'
+        });
+        return
+      }
+       if(!this.deptBudgetList.overShort && isNaN(this.deptBudgetList.overShort)){
+        this.$message({
+          message:'溢短装输入有误!',
+          type:'warning'
+        });
+        return
+      }
+    if(!this.deptBudgetList.unitContractPrice && isNaN(this.deptBudgetList.unitContractPrice)){
+        this.$message({
+          message:'合同单价输入有误!',
+          type:'warning'
+        });
+        return
+      }
+       if(!this.deptBudgetList.totalContractPrice && isNaN(this.deptBudgetList.totalContractPrice)){
+        this.$message({
+          message:'合同总价输入有误!',
+          type:'warning'
+        });
+        return
+      }
+      //时间
+        if(this.deptBudgetList.deliveryDateStart>this.deptBudgetList.deliveryDateEnd){
+           this.$message({
+          message:'时间输入有误!',
+          type:'warning'
+        });
+        return
+        }
       this.$refs.deptBudgetList.validate((valid) => {
         if (valid) {
           this.deptBudgetList.compId = this.compId
@@ -686,7 +843,11 @@ export default {
           return false
         }
       })
+      
     },
+     resetForm(deptBudgetList) {
+        this.$refs[deptBudgetList].resetFields();
+      },
     saveClick(item, index) {
       console.log(item)
 
@@ -731,7 +892,7 @@ export default {
     //   let key = this.unitList.find((item) => item.constValue === val).constKey
     //   this.pleaseChoose = val
     // },
-   
+
     handleExamine() {},
     approve() {},
     // returnsales() {
@@ -967,4 +1128,29 @@ export default {
   overflow: scroll;
   height: 93vh;
 }
+.unchangeable {
+  position: absolute;
+  width: 9px;
+  height: 22px;
+  font-size: 16px;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #ff2727;
+  line-height: 22px;
+  display: inline-block;
+  right: 14px;
+}
+/deep/.el-input,
+/deep/.el-date-editor {
+  font-size: 13px;
+  width: 232px;
+  left: 21px;
+}
+/deep/.el-textarea {
+  width: 900px;
+  margin: 0px;
+}
+/deep/el-date-editor--date {
+  width: 200px;
+}
 </style>

+ 76 - 16
src/views/contractManagement/salesContractEdit.vue

@@ -32,12 +32,12 @@
         <ws-info-table>
           <!--合同编号-->
           <ws-form-item label="合同编号" span="1" prop="contractNo">
-            <!-- <ws-input
-              v-model="deptBudgetList.contractNo"
-              maxlength="100"
-              size="small"
-            /> -->
-            {{deptBudgetList.contractNo}}
+            
+           <div class="unchanged">
+           {{deptBudgetList.contractNo}} 
+           </div>
+               <span class='unchangeable'>*</span>
+            
             
           </ws-form-item>
 
@@ -45,6 +45,7 @@
           <ws-form-item label="运输方式" span="1" prop="contractNo">
             <ws-input
               v-model="deptBudgetList.shippingType"
+              placeholder='请输入运输方式'
               maxlength="100"
               size="small"
             />
@@ -52,15 +53,18 @@
 
           <!--买方-->
           <ws-form-item label="买方" span="1" prop="contractNo">
-            
+            <div class="unchanged">
             {{deptBudgetList.buyer}}
-            
+            </div>
+             <span class="unchangeable">*</span>
+
           </ws-form-item>
 
           <!--结算方式-->
           <ws-form-item label="结算方式" span="1" prop="contractNo">
             <ws-input
               v-model="deptBudgetList.settlementMethod"
+               placeholder='请输入结算方式'
               maxlength="100"
               size="small"
             />
@@ -68,15 +72,17 @@
 
           <!--卖方-->
           <ws-form-item label="卖方" span="1" prop="contractNo">
-           
+           <div  class="unchanged">
             {{deptBudgetList.seller}}
-          
+            </div>
+           <span class="unchangeable">*</span>
           </ws-form-item>
 
           <!--货源地-->
           <ws-form-item label="货源地" span="1" prop="contractNo">
             <ws-input
               v-model="deptBudgetList.sourceGoods"
+               placeholder='请输入货源地'
               maxlength="100"
               size="small"
             />
@@ -85,6 +91,7 @@
           <ws-form-item label="买方电话" span="1" prop="contractNo">
             <ws-input
               v-model="deptBudgetList.buyerPhone"
+               placeholder='请输入买方电话'
               maxlength="100"
               size="small"
             />
@@ -94,6 +101,7 @@
           <ws-form-item label="交货地" span="1" prop="contractNo">
             <ws-input
               v-model="deptBudgetList.placeDelivery"
+               placeholder='请输入交货地'
               maxlength="100"
               size="small"
             />
@@ -103,6 +111,7 @@
           <ws-form-item label="卖方电话" span="1" prop="contractNo">
             <ws-input
               v-model="deptBudgetList.sellerPhone"
+               placeholder='请输入卖房电话'
               maxlength="100"
               size="small"
             />
@@ -128,6 +137,7 @@
           <ws-form-item label="重量(吨)" span="1" prop="contractNo">
             <ws-input
               v-model="deptBudgetList.weight"
+               placeholder='请输入重量(吨)'
               maxlength="100"
               size="small"
             />
@@ -204,6 +214,7 @@
           <ws-form-item label="溢短装(%)" span="1" prop="contractNo">
             <ws-input
               v-model="deptBudgetList.overShort"
+               placeholder='请输入溢短装(%)'
               maxlength="100"
               size="small"
             />
@@ -227,11 +238,9 @@
 
           <!--合同单价(元/吨)-->
           <ws-form-item label="合同单价(元/吨)" span="1" prop="contractNo">
-            <ws-input
-              v-model="deptBudgetList.unitContractPrice"
-              maxlength="100"
-              size="small"
-            />
+          <div class="unchanged">
+            {{deptBudgetList.unitContractPrice}}
+            </div>
             <span class="unchangeable">*</span>
           </ws-form-item>
 
@@ -252,6 +261,7 @@
           <ws-form-item label="合同总价" span="1" prop="contractNo">
             <ws-input
               v-model="deptBudgetList.totalContractPrice"
+                placeholder='请输入合同总价'
               maxlength="100"
               size="small"
             />
@@ -297,14 +307,17 @@
                   :value="item.constValue"
                 />
               </ws-select> -->
+               <div  class="unchanged">
               {{deptBudgetList.contractGoodsInfo.goodsName}}
-              
+              </div>
+              <span class='unchangeable'>*</span>
             </ws-form-item>
 
             <!--水分(%)<=-->
             <ws-form-item label="水分(%)" span="1" prop="contractNo">
               <ws-input
                 v-model="deptBudgetList.contractGoodsInfo.waterContent"
+                 placeholder='请输入水分(%)'
                 maxlength="100"
                 size="small"
               />
@@ -331,6 +344,7 @@
             <ws-form-item label="杂质(%)" span="1" prop="contractNo">
               <ws-input
                 v-model="deptBudgetList.contractGoodsInfo.impurity"
+                 placeholder='请输入杂质(%)'
                 maxlength="100"
                 size="small"
               />
@@ -340,6 +354,7 @@
             <ws-form-item label="容量(克/升)" span="1" prop="contractNo">
               <ws-input
                 v-model="deptBudgetList.contractGoodsInfo.bulkDensity"
+                   placeholder='请输入容量(克/升)'
                 maxlength="100"
                 size="small"
               />
@@ -349,6 +364,7 @@
             <ws-form-item label="霉变粒(%)" span="1" prop="contractNo">
               <ws-input
                 v-model="deptBudgetList.contractGoodsInfo.mildewGrain"
+                 placeholder='请输入霉变粒(%)'
                 maxlength="100"
                 size="small"
               />
@@ -358,6 +374,7 @@
             <ws-form-item label="热损伤(%)" span="1" prop="contractNo">
               <ws-input
                 v-model="deptBudgetList.contractGoodsInfo.jiaorenli"
+                  placeholder='请输入热损伤(%)'
                 maxlength="100"
                 size="small"
               />
@@ -366,6 +383,7 @@
             <ws-form-item label="不完整粒(%)" span="1" prop="contractNo">
               <ws-input
                 v-model="deptBudgetList.contractGoodsInfo.imperfectGrain"
+                 placeholder='请输入不完整粒(%)'
                 maxlength="100"
                 size="small"
               />
@@ -389,6 +407,7 @@
             <ws-form-item label="合同收入(元)" span="1" prop="contractNo">
               <ws-input
                 v-model="deptBudgetList.contractProcessInfo.goodsNameKey"
+                  placeholder='请输入合同收入(元)'
                 maxlength="100"
                 size="small"
               />
@@ -398,6 +417,7 @@
             <ws-form-item label="已开发票(元)" span="1" prop="contractNo">
               <ws-input
                 v-model="deptBudgetList.contractProcessInfo.goodsName"
+                   placeholder='请输入已开发票(元))'
                 maxlength="100"
                 size="small"
               />
@@ -407,6 +427,7 @@
             <ws-form-item label="费用支出(元)" span="1" prop="contractNo">
               <ws-input
                 v-model="deptBudgetList.contractProcessInfo.waterContent"
+                placeholder='请输入费用支出(元)'
                 maxlength="100"
                 size="small"
               />
@@ -416,6 +437,7 @@
             <ws-form-item label="未开发票(元)" span="1" prop="contractNo">
               <ws-input
                 v-model="deptBudgetList.contractProcessInfo.impurity"
+                   placeholder='请输入未开发票(元)'
                 maxlength="100"
                 size="small"
               />
@@ -424,6 +446,7 @@
             <ws-form-item label="未回款(元)" span="1" prop="contractNo">
               <ws-input
                 v-model="deptBudgetList.contractProcessInfo.mildewGrain"
+                 placeholder='请输入未回款(元)'
                 maxlength="100"
                 size="small"
               />
@@ -433,6 +456,7 @@
             <ws-form-item label="已完成发货量(吨)" span="1" prop="contractNo">
               <ws-input
                 v-model="deptBudgetList.contractProcessInfo.imperfectGrain"
+                 placeholder='请输入已完成发货量(吨)'
                 maxlength="100"
                 size="small"
               />
@@ -897,4 +921,40 @@ ChapterTwoList:{},
   overflow: scroll;
   height: 93vh;
 }
+//*号
+.unchangeable{
+position: absolute;
+ width: 9px;
+height: 22px;
+font-size: 16px;
+font-family: PingFangSC-Medium, PingFang SC;
+font-weight: 500;
+color: #FF2727;
+line-height: 22px;
+display: inline-block;
+right: 14px;
+}
+/deep/.el-input ,/deep/.el-date-editor{
+    font-size: 13px;
+    width: 232px;
+    left: 21px;
+}
+/deep/.el-textarea{
+  width: 900px;
+  margin: 0px;
+}
+/deep/el-date-editor--date{
+  width: 200px;
+}
+.unchanged{
+  position: absolute;
+  left: 37px;
+  width: 102px;
+height: 14px;
+font-size: 14px;
+font-family: PingFangSC-Regular, PingFang SC;
+font-weight: 400;
+color: #AFB5CB;
+line-height: 14px;
+}
 </style>

+ 192 - 141
src/views/contractManagement/salesContractExamine.vue

@@ -18,7 +18,7 @@
         >
       </el-col>
     </el-row>
-   
+
     <ws-form
       ref="deptBudgetList"
       :rules="mainReportAdd"
@@ -29,62 +29,102 @@
       </div>
       <ws-info-table>
         <ws-form-item label="合同编号" span="1" prop="contractNo">
-          {{ deptBudgetList.contractNo }}
+          <div class="unchanged">
+            {{ deptBudgetList.contractNo }}
+          </div>
+          <span class="unchangeable">*</span>
         </ws-form-item>
         <ws-form-item label="运输方式" span="1" prop="shippingType">
-          {{ deptBudgetList.shippingType }}
+          <div class="unchanged">
+            {{ deptBudgetList.shippingType }}
+          </div>
         </ws-form-item>
         <ws-form-item label="买方" span="1" prop="buyer">
-          {{ deptBudgetList.buyer }}
+          <div class="unchanged">
+            {{ deptBudgetList.buyer }}
+          </div>
+          <span class="unchangeable">*</span>
         </ws-form-item>
-        <ws-form-item label="结算方式" span="1" prop="settlementMethod"
-          >{{ deptBudgetList.settlementMethod }}
+        <ws-form-item label="结算方式" span="1" prop="settlementMethod">
+          <div class="unchanged">
+            {{ deptBudgetList.settlementMethod }}
+          </div>
         </ws-form-item>
-        <ws-form-item label="卖方" span="1" prop="seller"
-          >{{ deptBudgetList.seller }}
+        <ws-form-item label="卖方" span="1" prop="seller">
+          <div class="unchanged">
+            {{ deptBudgetList.seller }}
+          </div>
+          <span class="unchangeable">*</span>
         </ws-form-item>
-        <ws-form-item label="货源地" span="1" prop="sourceGoods"
-          >{{ deptBudgetList.sourceGoods }}
+        <ws-form-item label="货源地" span="1" prop="sourceGoods">
+          <div class="unchanged">
+            {{ deptBudgetList.sourceGoods }}
+          </div>
         </ws-form-item>
-        <ws-form-item label="买方电话" span="1" prop="buyerPhone"
-          >{{ deptBudgetList.buyerPhone }}
+        <ws-form-item label="买方电话" span="1" prop="buyerPhone">
+          <div class="unchanged">
+            {{ deptBudgetList.buyerPhone }}
+          </div>
         </ws-form-item>
         <ws-form-item label="交货地" span="1" prop="placeDelivery">
-          {{ deptBudgetList.placeDelivery }}
+          <div class="unchanged">
+            {{ deptBudgetList.placeDelivery }}
+          </div>
         </ws-form-item>
         <ws-form-item label="卖方电话" span="1" prop="sellerPhone">
-          {{ deptBudgetList.sellerPhone }}
+          <div class="unchanged">
+            {{ deptBudgetList.sellerPhone }}
+          </div>
         </ws-form-item>
         <ws-form-item label="包装方式" span="1" prop="packingMethod">
-          {{ deptBudgetList.packingMethod }}
+          <div class="unchanged">
+            {{ deptBudgetList.packingMethod }}
+          </div>
         </ws-form-item>
         <ws-form-item label="重量(吨)" span="1" prop="weight">
-          {{ deptBudgetList.weight }}
+          <div class="unchanged">
+            {{ deptBudgetList.weight }}
+          </div>
         </ws-form-item>
         <ws-form-item label="验收方式" span="1" prop="acceptanceMethod">
-          {{ deptBudgetList.acceptanceMethod }}
+          <div class="unchanged">
+            {{ deptBudgetList.acceptanceMethod }}
+          </div>
         </ws-form-item>
         <ws-form-item label="溢短装(%)" span="1" prop="overShort">
-          {{ deptBudgetList.overShort }}
+          <div class="unchanged">
+            {{ deptBudgetList.overShort }}
+          </div>
         </ws-form-item>
         <ws-form-item label="交货日期(起)" span="1" prop="deliveryDateStart">
-          {{ deptBudgetList.deliveryDateStart }}
+          <div class="unchanged">
+            {{ deptBudgetList.deliveryDateStart }}
+          </div>
         </ws-form-item>
         <ws-form-item
           label="合同单价(元/吨)"
           span="1"
           prop="unitContractPrice"
         >
-          {{ deptBudgetList.unitContractPrice }}
+          <div class="unchanged">
+            {{ deptBudgetList.unitContractPrice }}
+          </div>
+          <span class="unchangeable">*</span>
         </ws-form-item>
         <ws-form-item label="交货日期(止)" span="1" prop="deliveryDateEnd">
-          {{ deptBudgetList.deliveryDateEnd }}
+          <div class="unchanged">
+            {{ deptBudgetList.deliveryDateEnd }}
+          </div>
         </ws-form-item>
         <ws-form-item label="合同总价(元)" span="1" prop="totalContractPrice">
-          {{ deptBudgetList.totalContractPrice }}
+          <div class="unchanged">
+            {{ deptBudgetList.totalContractPrice }}
+          </div>
         </ws-form-item>
         <ws-form-item label="签订日期" span="1" prop="signingDate">
-          {{ deptBudgetList.signingDate }}
+          <div class="unchanged">
+            {{ deptBudgetList.signingDate }}
+          </div>
         </ws-form-item>
       </ws-info-table>
 
@@ -92,123 +132,113 @@
 
       <!--面试信息-->
       <div class="remark">
-      <h3>货物信息</h3>
-    </div>
-        <ws-info-table>
-          <ws-form-item
-            label="货名"
-            span="1"
-            prop="waterContent"
-          >
-          {{deptBudgetList.contractGoodsInfo.goodsName}}
-          </ws-form-item>
-          <ws-form-item
-            label="水分(%)<="
-            span="1"
-            prop="intendedShipId"
-          >
-          {{deptBudgetList.contractGoodsInfo.waterContent}}
-          </ws-form-item>
-          <ws-form-item
-            label="品级"
-            span="1"
-            prop="grade"
-          >
-           {{deptBudgetList.contractGoodsInfo.grade}}
-          </ws-form-item>
-          <ws-form-item
-            label="杂质(%)<="
-            span="1"
-            prop="impurity"
-          >
-          {{deptBudgetList.contractGoodsInfo.impurity}}
-          </ws-form-item>
-          <ws-form-item
-            label="容重(克/升)<="
-            span="1"
-            prop="bulkDensity"
-          >
-          {{deptBudgetList.contractGoodsInfo.bulkDensity}}
-          </ws-form-item>
-          <ws-form-item
-            label="霉变粒(%)<="
-            span="1"
-            prop="mildewGrain"
-            class="result"
-          >
-            {{deptBudgetList.contractGoodsInfo.mildewGrain}}
-          </ws-form-item>
-           <ws-form-item
-            label="热损伤(%)<="
-            span="1"
-            prop="jiaorenli"
-          >
-            {{deptBudgetList.contractGoodsInfo.jiaorenli}}
-          </ws-form-item>
-          <ws-form-item
-            label="不完善粒(%)<="
-            span="1"
-            prop="imperfectGrain"
-            class="result"
-          >
-            {{deptBudgetList.contractGoodsInfo.imperfectGrain}}
-          </ws-form-item>
-        </ws-info-table>
-        <div class="remark">
-          <h3>流程信息</h3>
-        </div>
-        <ws-info-table>
-          <ws-form-item
-            label="合同收入(元)"
-            span="1"
-            prop="goodsNameKey"
-          >
-          {{deptBudgetList.contractProcessInfo.goodsNameKey}}
-          </ws-form-item>
-          <ws-form-item
-            label="已开发票(元)"
-            span="1"
-            prop="goodsName"
-          >
-          {{deptBudgetList.contractProcessInfo.goodsName}}
-          </ws-form-item>
-          <ws-form-item
-            label="费用支出(元)"
-            span="1"
-            prop="waterContent"
-          >{{deptBudgetList.contractProcessInfo.waterContent}}
-          </ws-form-item>
-          <ws-form-item
-            label="未开发票(元)"
-            span="1"
-            prop="impurity"
-          >{{deptBudgetList.contractProcessInfo.impurity}}
-          </ws-form-item>
-          <ws-form-item
-            label="未回款(元)"
-            span="1"
-            prop="mildewGrain"
-          >{{deptBudgetList.contractProcessInfo.mildewGrain}}
-          </ws-form-item>
-          <ws-form-item
-            label="已完成发运量(吨)"
-            span="1"
-            prop="imperfectGrain"
-            class="result"
-          >{{deptBudgetList.contractProcessInfo.imperfectGrain}}
-          </ws-form-item>
-           <ws-form-item
-            label="双章原件回收情况"
-            span="1"
-            prop="grade"
-          >{{deptBudgetList.contractProcessInfo.grade}}
-          </ws-form-item>
-        </ws-info-table>
-        <div class="remark">
-          <h3>备注信息</h3>
+        <h3>货物信息</h3>
+      </div>
+      <ws-info-table>
+        <ws-form-item label="货名" span="1" prop="waterContent">
+          <div class="unchanged">
+            {{ deptBudgetList.contractGoodsInfo.goodsName }}
+          </div>
+          <span class="unchangeable">*</span>
+        </ws-form-item>
+        <ws-form-item label="水分(%)<=" span="1" prop="intendedShipId">
+          <div class="unchanged">
+            {{ deptBudgetList.contractGoodsInfo.waterContent }}
+          </div>
+        </ws-form-item>
+        <ws-form-item label="品级" span="1" prop="grade">
+          <div class="unchanged">
+            {{ deptBudgetList.contractGoodsInfo.grade }}
+          </div>
+        </ws-form-item>
+        <ws-form-item label="杂质(%)<=" span="1" prop="impurity">
+          <div class="unchanged">
+            {{ deptBudgetList.contractGoodsInfo.impurity }}
+          </div>
+        </ws-form-item>
+        <ws-form-item label="容重(克/升)<=" span="1" prop="bulkDensity">
+          <div class="unchanged">
+            {{ deptBudgetList.contractGoodsInfo.bulkDensity }}
+          </div>
+        </ws-form-item>
+        <ws-form-item
+          label="霉变粒(%)<="
+          span="1"
+          prop="mildewGrain"
+          class="result"
+        >
+          <div class="unchanged">
+            {{ deptBudgetList.contractGoodsInfo.mildewGrain }}
+          </div>
+        </ws-form-item>
+        <ws-form-item label="热损伤(%)<=" span="1" prop="jiaorenli">
+          <div class="unchanged">
+            {{ deptBudgetList.contractGoodsInfo.jiaorenli }}
+          </div>
+        </ws-form-item>
+        <ws-form-item
+          label="不完善粒(%)<="
+          span="1"
+          prop="imperfectGrain"
+          class="result"
+        >
+          <div class="unchanged">
+            {{ deptBudgetList.contractGoodsInfo.imperfectGrain }}
+          </div>
+        </ws-form-item>
+      </ws-info-table>
+      <div class="remark">
+        <h3>流程信息</h3>
+      </div>
+      <ws-info-table>
+        <ws-form-item label="合同收入(元)" span="1" prop="goodsNameKey">
+          <div class="unchanged">
+            {{ deptBudgetList.contractProcessInfo.goodsNameKey }}
+          </div>
+        </ws-form-item>
+        <ws-form-item label="已开发票(元)" span="1" prop="goodsName">
+          <div class="unchanged">
+            {{ deptBudgetList.contractProcessInfo.goodsName }}
+          </div>
+        </ws-form-item>
+        <ws-form-item label="费用支出(元)" span="1" prop="waterContent">
+          <div class="unchanged">
+            {{ deptBudgetList.contractProcessInfo.waterContent }}
+          </div>
+        </ws-form-item>
+        <ws-form-item label="未开发票(元)" span="1" prop="impurity">
+          <div class="unchanged">
+            {{ deptBudgetList.contractProcessInfo.impurity }}
+          </div>
+        </ws-form-item>
+        <ws-form-item label="未回款(元)" span="1" prop="mildewGrain">
+          <div class="unchanged">
+            {{ deptBudgetList.contractProcessInfo.mildewGrain }}
+          </div>
+        </ws-form-item>
+        <ws-form-item
+          label="已完成发运量(吨)"
+          span="1"
+          prop="imperfectGrain"
+          class="result"
+        >
+          <div class="unchanged">
+            {{ deptBudgetList.contractProcessInfo.imperfectGrain }}
+          </div>
+        </ws-form-item>
+        <ws-form-item label="双章原件回收情况" span="1" prop="grade">
+          <div class="unchanged">
+            {{ deptBudgetList.contractProcessInfo.grade }}
+          </div>
+        </ws-form-item>
+      </ws-info-table>
+      <div class="remark">
+        <h3>备注信息</h3>
+      </div>
+        <div class="unchanged">
+      {{ deptBudgetList.remarks }}
         </div>
-        {{deptBudgetList.remarks}}
-        <img :src="deptBudgetList.addressUrl" alt="">
+      <img :src="deptBudgetList.addressUrl" alt="" />
 
       <!-- </base-card> -->
     </ws-form>
@@ -226,7 +256,6 @@
 
 <script>
 import {
-  
   getList,
   packList,
   addList,
@@ -280,7 +309,6 @@ export default {
     this.examineList()
   },
   methods: {
-    
     loaddata() {
       // 数据
       examineList({ id: this.$route.params.id })
@@ -503,4 +531,27 @@ export default {
   overflow: scroll;
   height: 93vh;
 }
+.unchanged {
+  position: absolute;
+  left: 37px;
+  width: 102px;
+  height: 14px;
+  font-size: 14px;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #afb5cb;
+  line-height: 14px;
+}
+.unchangeable {
+  position: absolute;
+  width: 9px;
+  height: 22px;
+  font-size: 16px;
+  font-family: PingFangSC-Medium, PingFang SC;
+  font-weight: 500;
+  color: #ff2727;
+  line-height: 22px;
+  display: inline-block;
+  right: 14px;
+}
 </style>

+ 1 - 1
vue.config.js

@@ -144,7 +144,7 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         // target: 'http://192.168.1.124:8090/',
-        target: 'http://192.168.1.110:8090/',
+        target: 'http://192.168.1.124:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',
         // target: 'http://192.168.24.5:8098',//目标地址