Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/contractManagement/futuresPurchaseContract.vue

@@ -4,13 +4,7 @@
 		<BaseHeaderLayout :leftSpan="8">
 			<template slot="left">
 				<ws-button type="primary" @click="handleAdd()"
-					v-hasPermission="`contractManagement.buyContract.buyContractInfo.add`"><img width="13" height="13"
-						style="
-              vertical-align: text-top;
-              position: relative;
-              top: 2px;
-              left: -4px;
-            " src="../../../public/img/header-add.png" alt="" />添加</ws-button>
+					v-hasPermission="`contractManagement.buyContract.buyContractInfo.add`">添加</ws-button>
 				<ws-button @click="exportlist()" v-hasPermission="
             `contractManagement.buyContract.buyContractInfo.view`
           ">导出</ws-button>
@@ -347,7 +341,7 @@
 					.toPromise()
 					.then((response) => {
 						for (var i = 0; i < response.records.length; i++) {
-							if (response.records[i].addressUrl != null && response.records[i].addressUrl != "") {
+							if (response.records[i].addressUrl != null && response.records[i].addressUrl != '') {
 								response.records[i].addressUrlArray =
 									response.records[i].addressUrl.split(',')
 							} else {

src/views/contractManagement/futuresSalesContract.vue

@@ -4,13 +4,7 @@
 		<BaseHeaderLayout :leftSpan="8">
 			<template slot="left">
 				<ws-button type="primary" @click="handleAdd()"
-					v-hasPermission="`contractManagement.buyContract.buyContractInfo.add`"><img width="13" height="13"
-						style="
-              vertical-align: text-top;
-              position: relative;
-              top: 2px;
-              left: -4px;
-            " src="../../../public/img/header-add.png" alt="" />添加</ws-button>
+					v-hasPermission="`contractManagement.buyContract.buyContractInfo.add`">添加</ws-button>
 				<ws-button @click="exportlist()" v-hasPermission="
             `contractManagement.buyContract.buyContractInfo.view`
           ">导出</ws-button>
@@ -359,7 +353,7 @@
 					.toPromise()
 					.then((response) => {
 						for (var i = 0; i < response.records.length; i++) {
-							if (response.records[i].addressUrl != null && response.records[i].addressUrl != "") {
+							if (response.records[i].addressUrl != null && response.records[i].addressUrl != '') {
 								response.records[i].addressUrlArray =
 									response.records[i].addressUrl.split(',')
 							} else {

src/views/contractManagement/purchaseContract.vue

@@ -5,13 +5,7 @@
 		<BaseHeaderLayout :leftSpan="8">
 			<template slot="left">
 				<ws-button type="primary" @click="handleAdd()"
-					v-hasPermission="`contractManagement.buyContract.buyContractInfo.add`"><img width="13" height="13"
-						style="
-              vertical-align: text-top;
-              position: relative;
-              top: 2px;
-              left: -4px;
-            " src="../../../public/img/header-add.png" alt="" />添加</ws-button>
+					v-hasPermission="`contractManagement.buyContract.buyContractInfo.add`">添加</ws-button>
 				<ws-button @click="exportlist()" v-hasPermission="
             `contractManagement.buyContract.buyContractInfo.view`
           ">导出</ws-button>

src/views/contractManagement/purchaseContractAdd.vue

@@ -60,7 +60,7 @@
         </ws-form-item>
 
         <!--合同编号-->
-        <ws-form-item label="合同编号" span="1" prop="contractNo" class="readonly" required>
+        <ws-form-item label="合同编号" span="1" prop="contractNo" class="readonly" required v-show="deptBudgetList.agreementType =='采购合同'">
           <ws-input v-model="deptBudgetList.contractNo" placeholder="请输入合同编号" maxlength="50" size="small" />
         </ws-form-item>
 
@@ -175,7 +175,7 @@
         </ws-form-item>
 
         <!--签订日期-->
-        <ws-form-item label="签订日期" span="1" prop="signingDate">
+        <ws-form-item label="签订日期" span="1" prop="signingDate" v-show="deptBudgetList.agreementType =='采购合同'">
           <ws-date-picker v-model="deptBudgetList.signingDate" type="date" placeholder="请选择合同签订日期"
             value-format="yyyy-MM-dd" />
         </ws-form-item>
@@ -212,6 +212,11 @@
         </ws-form-item>
         <ws-form-item label="交货详细地址" span="1" prop="placeDelivery">
           <ws-input v-model="deptBudgetList.placeDelivery" placeholder="请输入交货详细地址" maxlength="20" size="small" />
+        </ws-form-item>
+          <!--签订日期-->
+        <ws-form-item label="签订日期" span="1" prop="signingDate" v-show="deptBudgetList.agreementType =='补充协议'">
+          <ws-date-picker v-model="deptBudgetList.signingDate" type="date" placeholder="请选择合同签订日期"
+            value-format="yyyy-MM-dd" />
         </ws-form-item>
         <ws-form-item label="最终实际成交量（吨）" span="1" prop="finalTradingVolume">
           <ws-input v-model="deptBudgetList.finalTradingVolume" placeholder="请输入最终实际成交量" maxlength="100" size="small" />

src/views/contractManagement/salesContract.vue

@@ -6,12 +6,7 @@
 			<template slot="left">
 				<ws-button type="primary" @click="handleAdd()" v-hasPermission="
             `contractManagement.salesContract.salesContractInfo.add`
-          "><img width="13" height="13" style="
-              vertical-align: text-top;
-              position: relative;
-              top: 2px;
-              left: -4px;
-            " src="../../../public/img/header-add.png" alt="" />添加</ws-button>
+          ">添加</ws-button>
 				<ws-button @click="exportlist()" v-hasPermission="
             `contractManagement.salesContract.salesContractInfo.view`"
           >导出</ws-button
@@ -467,7 +462,7 @@
 					.then((response) => {
 						for (var i = 0; i < response.records.length; i++) {
 							if (response.records[i].addressUrl != null) {
-								if (response.records[i].addressUrl != "") {
+								if (response.records[i].addressUrl != '') {
 									response.records[i].addressUrlArray =
 										response.records[i].addressUrl.split(',')
 								}

src/views/contractManagement/salesContractAdd.vue

@@ -28,7 +28,7 @@
           </ws-form-item>
           <!--合同编号-->
           <!-- v-if="deptBudgetList.agreementType == '销售合同'" -->
-          <ws-form-item label="合同编号" span="1" prop="contractNo" class="readonly">
+          <ws-form-item label="合同编号" span="1" prop="contractNo" class="readonly" v-if="deptBudgetList.agreementType == '销售合同'">
             <ws-input v-model="deptBudgetList.contractNo" placeholder="请输入合同编号" maxlength="50" size="small"
               :rules="ruleDeptBudget" />
           </ws-form-item>
@@ -169,6 +169,11 @@
           <ws-form-item label="合同总价" span="1" prop="totalContractPrice" v-if="deptBudgetList.priceType == '定价销售'">
             <ws-input v-model="deptBudgetList.totalContractPrice" placeholder="请输入合同总价" maxlength="100" size="small" />
           </ws-form-item>
+          <!--签订日期-->
+          <ws-form-item label="签订日期" span="1" prop="signingDate" v-if="deptBudgetList.agreementType == '补充协议'">
+            <ws-date-picker v-model="deptBudgetList.signingDate" type="date" placeholder="请选择合同签订日期"
+              value-format="yyyy-MM-dd" />
+          </ws-form-item>
           <ws-form-item label="货源所在地区" span="1" prop="sourceGoods">
             <!-- <el-cascader
               :options="options_"
@@ -204,7 +209,7 @@
             <ws-input v-model="deptBudgetList.placeDelivery" placeholder="请输入交货详细地址" maxlength="20" size="small" />
           </ws-form-item>
           <!--签订日期-->
-          <ws-form-item label="签订日期" span="1" prop="signingDate">
+          <ws-form-item label="签订日期" span="1" prop="signingDate" v-if="deptBudgetList.agreementType == '销售合同'">
             <ws-date-picker v-model="deptBudgetList.signingDate" type="date" placeholder="请选择合同签订日期"
               value-format="yyyy-MM-dd" />
           </ws-form-item>

src/views/contractManagement/salesContractEdit.vue

@@ -171,6 +171,11 @@
           <ws-form-item label="合同总价" span="1" prop="contractNo">
             <ws-input v-model="deptBudgetList.totalContractPrice" placeholder="请输入合同总价" maxlength="100" size="small" />
           </ws-form-item>
+          <!--签订日期-->
+          <ws-form-item label="签订日期" span="1" prop="signingDate" v-if="deptBudgetList.agreementType=='销售合同'">
+            <ws-date-picker v-model="deptBudgetList.signingDate" type="date" placeholder="请选择合同签订日期"
+              value-format="yyyy-MM-dd" />
+          </ws-form-item>
           <!-- 货源所在地区 -->
           <ws-form-item label="货源所在地区" span="1" prop="sourceGoods">
             <!-- <el-cascader
@@ -210,7 +215,7 @@
             <ws-input v-model="deptBudgetList.placeDelivery" maxlength="100" placeholder="请输入交货地详细地址" size="small" />
           </ws-form-item>
           <!--签订日期-->
-          <ws-form-item label="签订日期" span="1" prop="signingDate">
+          <ws-form-item label="签订日期" span="1" prop="signingDate" v-if="deptBudgetList.agreementType=='补充协议'">
             <ws-date-picker v-model="deptBudgetList.signingDate" type="date" placeholder="请选择合同签订日期"
               value-format="yyyy-MM-dd" />
           </ws-form-item>

src/views/contractManagement/salesContractExamine.vue

@@ -143,7 +143,11 @@
               {{ deptBudgetList.totalContractPrice }}
             </div>
           </ws-form-item>
-
+          <ws-form-item label="签订日期" span="1" prop="signingDate"  v-if="deptBudgetList.agreementType=='销售合同'">
+            <div class="unchanged">
+              {{ deptBudgetList.signingDate }}
+            </div>
+          </ws-form-item>
           <ws-form-item label="货源所在地区" span="1">
             <div class="unchanged">
               {{ deptBudgetList.sourceProvince }}
@@ -171,7 +175,7 @@
               {{ deptBudgetList.placeDelivery }}
             </div>
           </ws-form-item>
-          <ws-form-item label="签订日期" span="1" prop="signingDate">
+          <ws-form-item label="签订日期" span="1" prop="signingDate"  v-if="deptBudgetList.agreementType=='补充协议'">
             <div class="unchanged">
               {{ deptBudgetList.signingDate }}
             </div>

src/views/houseSelfCollect/customerManagementAdd.vue

@@ -123,17 +123,17 @@
     watch: {},
     data() {
       return {
-        imageUrl1: "",
-        imageUrl2: "",
-        imageUrl3: "",
-        imageUrl4: "",
+        imageUrl1: '',
+        imageUrl2: '',
+        imageUrl3: '',
+        imageUrl4: '',
         dialogImageUrl: '',
         dialogVisible: false,
         customerList: {
-          customerName: "",
-          customerNumberCard: "",
-          bankCard: "",
-          bankDeposit: "",
+          customerName: '',
+          customerNumberCard: '',
+          bankCard: '',
+          bankDeposit: '',
         },
         disabledFlag: true,
         disabled: false,
@@ -159,20 +159,20 @@
         bankLows: 'bankLow',
         sendText: '60S后重发',
         sendDisabled: false,
-        verifyCode: "",
+        verifyCode: '',
         bankList:[],
         bankInput:false,
-        bankText:"手动填写"
+        bankText:'手动填写'
       }
     },
     activated() {
       this.switchType = this.$route.query.types
       if (this.$route.query.types == null) {
         this.switchType = 1
-        this.imageUrl1 = ""
-        this.imageUrl2 = ""
-        this.imageUrl3 = ""
-        this.imageUrl4 = ""
+        this.imageUrl1 = ''
+        this.imageUrl2 = ''
+        this.imageUrl3 = ''
+        this.imageUrl4 = ''
         this.customerList = {}
       }
       let id = this.$route.query.id
@@ -190,10 +190,10 @@
       bankInputChange(){
         this.bankInput = !this.bankInput
         if(this.bankInput){
-          this.bankText = "自动识别"
+          this.bankText = '自动识别'
         }
         else{
-          this.bankText = "手动填写"
+          this.bankText = '手动填写'
         }
       },
       handleRemove(file, index) {
@@ -257,7 +257,7 @@
                   that.sendText = sec + 'S后重发'
                   if (sec <= 0) {
                     that.sendDisabled = false
-                    that.sendText = "获取验证码"
+                    that.sendText = '获取验证码'
                     clearInterval(interval)
                   }
                 }, 1000)
@@ -269,7 +269,7 @@
       },
       cancel() {
         this.customerList = {}
-        this.verifyCode = ""
+        this.verifyCode = ''
         this.$router.push({
           path: 'customerManagement'
         })
@@ -291,6 +291,9 @@
               this.$set( this.customerList,'customerNumberCard',response.recPersonNo)
                this.$set( this.customerList,'payeeNumberCard',response.recPersonNo)
             }
+            if (response.recPersonAddr ) {
+              this.$set( this.customerList,'compAddress',response.recPersonAddr)
+            }
           })
       },
       upLoadSuccess2(e) {
@@ -312,6 +315,9 @@
                this.$set( this.customerList,'payeeNumberCard',response.recPersonNo)
             }
             
+            if (response.recPersonAddr ) {
+              this.$set( this.customerList,'compAddress',response.recPersonAddr)
+            }
           })
       },
       bankSuccess1(e) {
@@ -442,7 +448,7 @@
                     .then((response) => {
                       this.$message.success('添加成功')
                       this.customerList = {}
-                      this.verifyCode = ""
+                      this.verifyCode = ''
                       this.$router.go(-1)
                     })
                 })
@@ -461,7 +467,7 @@
                     .then((response) => {
                       this.$message.success('修改成功')
                          this.customerList = {}
-                         this.verifyCode = ""
+                         this.verifyCode = ''
                       this.$router.push({
                         path: 'customerManagement'
                       })

src/views/houseSelfCollect/paymentManagement.vue

@@ -502,6 +502,7 @@ import download from '../../components/WsDownload/download'
               
               var arr=[]
               for (let i = 0; i < response.length; i++) {
+                debugger
                 arr.push({fileUrl:response[i],renameFileName:'发票'+i+'.xml'})
               }
               this.filesToRar(arr, '开票XML文件')

src/views/warehouse/warehouseManagementDelivery.vue

@@ -251,7 +251,7 @@
             accept=".jpg, .jpeg, .png, .gif"
             ><el-button size="small" type="primary">点击上传</el-button>
           </el-upload>
-          <div v-if='deptBudgetList.addressUrl!=""'>
+          <div @click='imgBig(deptBudgetList.addressUrl)' v-if='deptBudgetList.addressUrl!=""'>
             <img style='width:100px;height:100px;' :src="deptBudgetList.addressUrl" alt="">
           </div>
       <div class="small-title">化验数据（选填）</div>
@@ -359,6 +359,9 @@
         >
       </div>
     </ws-form>
+    <div @click='imgshow=false' style='overflow:scroll;position:fixed;left:0;top:0;background:rgba(0,0,0,0.1);width:100%;height:100%;z-index:1030;' v-if='imgshow'>
+      <img style='position:absolute;left:50%;top:50%;transform: translateX(-50%) translateY(-50%);height:80%;' :src="img" alt="">
+    </div>
   </div>
 </template>
 <script>
@@ -403,6 +406,8 @@ export default {
       // 年
       year: '',
       deptBudgetTotal: 0,
+      img:'',
+      imgshow:false,
       currentPage: 1,
       pageSize: 10,
       searchType: 1,
@@ -468,6 +473,11 @@ export default {
   
   },
   methods: {
+    imgBig(item){
+      console.log(item)
+      this.img=item
+      this.imgshow=true
+    },
       qualityInspectorChange(e){
       console.log(e)
     },
@@ -1294,14 +1304,14 @@ export default {
       if (this.deptBudgetList.grossWeight && this.deptBudgetList.tare) {
         this.deptBudgetList.netWeight = Number(
           this.deptBudgetList.grossWeight - this.deptBudgetList.tare
-        )
+        ).toFixed(2)
       }
     },
     grossWeightchange(e) {
       if (this.deptBudgetList.grossWeight && this.deptBudgetList.tare) {
         this.deptBudgetList.netWeight = Number(
           this.deptBudgetList.grossWeight - this.deptBudgetList.tare
-        )
+        ).toFixed(2)
       }
     },
     selectgoodsName(e) {

src/views/warehouse/warehouseManagementGross.vue

@@ -1683,7 +1683,7 @@
             this.deptBudgetList.grossWeight -
             this.deptBudgetList.tare -
             this.deptBudgetList.deductionWeight
-          )
+          ).toFixed(2)
         }
       },
       grossWeightchange(e) {
@@ -1696,7 +1696,7 @@
             this.deptBudgetList.grossWeight -
             this.deptBudgetList.tare -
             this.deptBudgetList.deductionWeight
-          )
+          ).toFixed(2)
         }
       },
       contractNoChange(e) {
@@ -2107,4 +2107,4 @@
   /deep/.neifor .el-input--small .el-input__inner {
     width: 100%;
   }
-</style>
+</style>

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -1254,14 +1254,14 @@
         if (this.dataList.grossWeight && this.dataList.tare) {
           this.dataList.netWeight = Number(
             this.dataList.grossWeight - this.dataList.tare
-          )
+          ).toFixed(2)
         }
       },
       grossWeightchange(e) {
         if (this.dataList.grossWeight && this.dataList.tare) {
           this.dataList.netWeight = Number(
             this.dataList.grossWeight - this.dataList.tare
-          )
+          ).toFixed(2)
         }
       },
       selectgoodsName(e) {

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -1007,14 +1007,14 @@
         if (this.dataList.grossWeight && this.dataList.tare) {
           this.dataList.netWeight = Number(
             this.dataList.grossWeight - this.dataList.tare
-          )
+          ).toFixed(2)
         }
       },
       grossWeightchange(e) {
         if (this.dataList.grossWeight && this.dataList.tare) {
           this.dataList.netWeight = Number(
             this.dataList.grossWeight - this.dataList.tare
-          )
+          ).toFixed(2)
         }
       },
       selectgoodsName(e) {

src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -244,8 +244,8 @@
             accept=".jpg, .jpeg, .png, .gif"
             ><el-button size="small" type="primary">点击上传</el-button>
           </el-upload>
-          <div v-if='dataList.addressUrl!=""'>
-            <img style='width:100px;height:100px;' :src="dataList.addressUrl" alt="">
+          <div @click='imgBig(dataList.addressUrl)' v-if='dataList.addressUrl!=""'>
+            <img  style='width:100px;height:100px;' :src="dataList.addressUrl" alt="">
           </div>
       <div class="small-title">化验数据（选填）</div>
       <div class="inspector">
@@ -334,6 +334,9 @@
         >
       </div>
     </ws-form>
+  <div @click='imgshow=false' style='overflow:scroll;position:fixed;left:0;top:0;background:rgba(0,0,0,0.1);width:100%;height:100%;z-index:1030;' v-if='imgshow'>
+      <img style='position:absolute;left:50%;top:50%;transform: translateX(-50%) translateY(-50%);height:80%;' :src="img" alt="">
+    </div>
   </div>
 </template>
 <script>
@@ -423,6 +426,8 @@ export default {
         month: dayjs().format('MM'),
       },
       contractList: [],
+      img:'',
+      imgshow:false,
       dataList: {
         id: '',
         grossWeight: '',
@@ -431,6 +436,7 @@ export default {
         netWeight: '',
         grade: '',
         agent: '',
+        
         carNo: '',
         inOutDate: '',
         inOutType: '',
@@ -486,6 +492,11 @@ export default {
     console.log(this.dataList)
   },
   methods: {
+    imgBig(item){
+      console.log(item)
+      this.img=item
+      this.imgshow=true
+    },
     pureweight(status){
       console.log(this.deptBudgetList)
       if(this.deptBudgetList.netWeight&&this.deptBudgetList.tidalGrainWater&&this.deptBudgetList.solidGrainWater&&this.deptBudgetList.buckleWeightRatio){

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -327,7 +327,7 @@
             accept=".jpg, .jpeg, .png, .gif"
             ><el-button size="small" type="primary">点击上传</el-button>
           </el-upload>
-          <div>
+          <div @click='imgBig(dataList.addressUrl)'>
             <img v-if='dataList.addressUrl' style='width:100px;height:100px;' :src="dataList.addressUrl" alt="">
           </div>
       <div class="small-title">化验数据（选填）</div>
@@ -433,6 +433,9 @@
         >
       </div>
     </ws-form>
+    <div @click='imgshow=false' style='overflow:scroll;position:fixed;left:0;top:0;background:rgba(0,0,0,0.1);width:100%;height:100%;z-index:1030;' v-if='imgshow'>
+      <img style='position:absolute;left:50%;top:50%;transform: translateX(-50%) translateY(-50%);height:80%;' :src="img" alt="">
+    </div>
   </div>
 </template>
 <script>
@@ -531,6 +534,8 @@ export default {
       options2: [],
       carstatus:false,
       contractList: [],
+      img:'',
+      imgshow:false,
       dataList: {
         id: '',
         grossWeight: '',
@@ -610,6 +615,11 @@ export default {
 
   },
   methods: {
+    imgBig(item){
+      console.log(item)
+      this.img=item
+      this.imgshow=true
+    },
         kkInput(val){
       console.log(val)
       if(this.isGetCost){
@@ -1275,14 +1285,14 @@ export default {
       if (this.dataList.grossWeight && this.dataList.tare) {
         this.dataList.netWeight = Number(
           this.dataList.grossWeight - this.dataList.tare
-        )
+        ).toFixed(2)
       }
     },
     grossWeightchange(e) {
       if (this.dataList.grossWeight && this.dataList.tare) {
         this.dataList.netWeight = Number(
           this.dataList.grossWeight - this.dataList.tare
-        )
+        ).toFixed(2)
       }
     },
     selectgoodsName(e) {

src/views/warehouse/warehouseManagementPut.vue

@@ -406,7 +406,7 @@
       >
       <el-button size="small" type="primary">点击上传</el-button>
       </el-upload>
-      <div v-if='deptBudgetList.addressUrl!=""'>
+      <div @click='imgBig(deptBudgetList.addressUrl)' v-if='deptBudgetList.addressUrl!=""'>
         <img
           style="width: 100px; height: 100px"
           :src="deptBudgetList.addressUrl"
@@ -530,6 +530,9 @@
         >
       </div>
     </ws-form>
+    <div @click='imgshow=false' style='overflow:scroll;position:fixed;left:0;top:0;background:rgba(0,0,0,0.1);width:100%;height:100%;z-index:1030;' v-if='imgshow'>
+      <img style='position:absolute;left:50%;top:50%;transform: translateX(-50%) translateY(-50%);height:80%;' :src="img" alt="">
+    </div>
   </div>
 </template>
 <script>
@@ -601,6 +604,8 @@ export default {
       appendixIdsAdd: '',
       uploadSuccess: {},
       onChange: {},
+      img:'',
+      imgshow:false,
       gradeList: [],
       rules: {
         netWeight: [
@@ -670,6 +675,11 @@ export default {
     // }
   },
   methods: {
+    imgBig(item){
+      console.log(item)
+      this.img=item
+      this.imgshow=true
+    },
     qualityInspectorChange(e){
       console.log(e)
     },
@@ -1789,7 +1799,7 @@ export default {
           this.deptBudgetList.grossWeight -
             this.deptBudgetList.tare -
             this.deptBudgetList.deductionWeight
-        )
+        ).toFixed(2)
       }
     },
     grossWeightchange(e) {

src/views/warehouse/warehouseManagementTare.vue

@@ -1317,14 +1317,14 @@
         if (this.deptBudgetList.grossWeight && this.deptBudgetList.tare) {
           this.deptBudgetList.netWeight = Number(
             this.deptBudgetList.grossWeight - this.deptBudgetList.tare
-          )
+          ).toFixed(2)
         }
       },
       grossWeightchange(e) {
         if (this.deptBudgetList.grossWeight && this.deptBudgetList.tare) {
           this.deptBudgetList.netWeight = Number(
             this.deptBudgetList.grossWeight - this.deptBudgetList.tare
-          )
+          ).toFixed(2)
         }
       },
       selectgoodsName(e) {