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

src/views/customerFundManagement/customerFundList.vue

@@ -59,18 +59,23 @@
         </el-table-column>
         <el-table-column prop="customerType" label="客户类型" width="80"></el-table-column>
         <el-table-column prop="compName" label="企业名称" width="200"></el-table-column>
-        <el-table-column prop="customerName" label="客户姓名" width="100"></el-table-column>
+        <el-table-column prop="customerName" label="客户姓名" width="120"></el-table-column>
         <el-table-column prop="customerPhone" label="电话" width="100"> </el-table-column>
-        <el-table-column prop="totalDeposit" label="定金(元)" width="100"></el-table-column>
-        <el-table-column prop="advancePayment" label="预付金(元)" width="100"></el-table-column>
-        <el-table-column prop="securityDeposit" label="保证金(元)" width="100"></el-table-column>
-        <el-table-column prop="bankCard" label="账号"> </el-table-column>
-        <el-table-column prop="bankDeposit" label="开户行" width="200">
+        <el-table-column prop="totalDeposit" label="定金(元)" width="110"></el-table-column>
+        <el-table-column prop="advancePayment" label="预付金(元)" width="110"></el-table-column>
+        <el-table-column prop="securityDeposit" label="保证金(元)" width="110"></el-table-column>
+        <el-table-column prop="bankCard" label="账号" width="200"> </el-table-column>
+        <el-table-column prop="bankDeposit" label="开户行" width="280">
           <template slot-scope="scope">
             {{ scope.row.bankDeposit }} - {{ scope.row.bankDepositBranch }}
           </template>
         </el-table-column>
-        <el-table-column prop="payeeName" label="收款人姓名"> </el-table-column>
+        <!-- <el-table-column prop="bankDepositBranch" label="开户支行" width="260">
+         <template slot-scope="scope">
+            {{ scope.row.bankDeposit }} - {{ scope.row.bankDepositBranch }}
+          </template> 
+        </el-table-column> -->
+        <el-table-column prop="payeeName" label="收款人姓名" width="150"> </el-table-column>
         <el-table-column prop="seller" label="操作" width="150">
           <template slot-scope="scope">
             <el-button

src/views/houseSelfCollect/inspectInfo.vue

@@ -62,7 +62,7 @@
                 disabled />
             </ws-form-item>
             <ws-form-item label="类型" span="1" prop="type">
-              <ws-select v-model="inspect.type" :disabled="disabled" @change="typeChange">
+              <ws-select v-model="inspect.type" disabled @change="typeChange">
                 <ws-option v-for="item in typeList" :key="item" :label="item" :value="item" />
               </ws-select>
             </ws-form-item>
@@ -713,6 +713,12 @@
 
       waterContentChange(type) {
         if (this.inspect.goodsName&&type!='water') {
+          if(this.inspect.goodsName.indexOf('潮粮') !=-1){
+                this.inspect.type='潮粮'
+          }
+          else{
+            this.inspect.type='干粮'
+          }
           if(!this.inspect.dryGrainPrice||this.inspect.dryGrainPrice == 0){
             getDryGrainPrice({warehouseId:this.cangid,goodsName:this.inspect.goodsName})
             .toPromise()

src/views/houseSelfCollect/inspectionManagement.vue

@@ -261,6 +261,12 @@
 						this.warehouseList = []
 						let _wareHouse = sessionStorage.getItem('houseSelfCollect_house')
 						_wareHouse = JSON.parse(_wareHouse)
+						if (_wareHouse) {
+								this.cangid = _wareHouse.id
+								this.warehouseName = _wareHouse.value
+								this.warehouseNo = _wareHouse.No
+								this.warehouseCount = _wareHouse.count
+							} 
 						for (let i = 0; i < response.length; i++) {
 							this.warehouseList.push({
 								value: response[i].warehouseName,
@@ -268,13 +274,8 @@
 								count: response[i].count,
 								No: response[i].commonWarehouseNo
 							})
-							if (_wareHouse) {
-								this.cangid = _wareHouse.id
-								this.warehouseName = _wareHouse.warehouseName
-								this.warehouseNo = _wareHouse.commonWarehouseNo
-								this.warehouseCount = _wareHouse.count
-							} else {
-								if (this.cangid && this.cangid == response[i].id) {
+							if (!_wareHouse) {
+									if (this.cangid && this.cangid == response[i].id) {
 									this.warehouseName = response[i].warehouseName
 									this.warehouseCount = response[i].count
 									this.warehouseNo = response[i].commonWarehouseNo
@@ -305,6 +306,7 @@
 						console.log(response)
 						this.inspect = response.records
 						this.deptBudgetTotal = response.total
+						// this.$forceUpdate();
 					})
 			},
 			print(row) {

src/views/houseSelfCollect/weighingManagement.vue

@@ -162,9 +162,9 @@
 						this.monitorUrl1 = this.warehouseList[i].monitorUrl1
 						this.monitorUrl2 = this.warehouseList[i].monitorUrl2
 						sessionStorage.setItem('ck', e)
+						sessionStorage.setItem('houseSelfCollect_house1', JSON.stringify(this.warehouseList[i]))
 					}
 				}
-
 				this.getList()
 			},
 			weightCheck(row, num) {
@@ -206,7 +206,7 @@
 				this.getList()
 			},
 			selectWarehouse() {
-				let _wareHouse = sessionStorage.getItem('houseSelfCollect_house')
+				let _wareHouse = sessionStorage.getItem('houseSelfCollect_house1')
 				_wareHouse = JSON.parse(_wareHouse)
 				selectWarehouseSelf({
 						compId: sessionStorage.getItem('ws-pf_compId'),
@@ -221,15 +221,16 @@
 								warehouseId: response[i].id,
 								allowEdit: response[i].allowEdit,
 								monitorUrl1: response[i].monitorUrl1,
-								monitorUrl2: response[i].monitorUrl2
+								monitorUrl2: response[i].monitorUrl2,
+								id: response[i].id,
+								warehouseNo:response[i].commonWarehouseNo
 							})
 							if (_wareHouse) {
-
 								this.cangid = _wareHouse.id
-								this.warehouseName = _wareHouse.warehouseName
-								this.common.name = _wareHouse.warehouseName
+								this.warehouseName = _wareHouse.value
+								this.common.name = _wareHouse.value
 								this.warehouseId = _wareHouse.id
-								this.warehouseNo = _wareHouse.commonWarehouseNo
+								this.warehouseNo = _wareHouse.warehouseNo
 								this.monitorUrl1 = _wareHouse.monitorUrl1
 								this.allowEdit = _wareHouse.allowEdit
 								this.monitorUrl2 = _wareHouse.monitorUrl2

src/views/tranManagement/tranManagementFireReceivingFeedback.vue

@@ -603,6 +603,7 @@ export default {
             if (valid) {
               var tranProcessInfo = {}
               tranProcessInfo.id = this.deptBudgetList.id
+              tranProcessInfo.weight = this.total
               stateRec(tranProcessInfo)
                 .toPromise()
                 .then((response) => {
@@ -741,9 +742,9 @@ export default {
               this.freightspace[i].loadNetWeight = 0
             }
             if (this.freightspace[i].unloadPoundImg) {
-                this.freightspace[i].imgCount = this.freightspace[i].unloadPoundImg.split(",").length
+                this.freightspace[i].imgCount = this.freightspace[i].unloadPoundImg.split(',').length
               } else {
-                this.freightspace[i].unloadPoundImg = ""
+                this.freightspace[i].unloadPoundImg = ''
                 this.freightspace[i].imgCount = 0
               }
           }
@@ -755,7 +756,7 @@ export default {
         that.$forceUpdate();
         that.freightspace[that.index].imgCount++
         console.log(that.freightspace[that.index].imgCount)
-        that.freightspace[that.index].unloadPoundImg += e.url + ","
+        that.freightspace[that.index].unloadPoundImg += e.url + ','
     },
   },
 }

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -665,6 +665,7 @@ export default {
             if (valid) {
               var tranProcessInfo = {}
               tranProcessInfo.id = this.deptBudgetList.id
+              tranProcessInfo.weight = this.total
               stateRec(tranProcessInfo)
                 .toPromise()
                 .then((response) => {

src/views/tranManagement/tranManagementUnShippingFeedback.vue

@@ -329,9 +329,9 @@
               "
               >未上传</span
             >
-          </div>
-          <el-button v-if="deptBudgetList.tranCarInfoList.length>0&&deptBudgetList.tranCarInfoList[0].unloadPoundImg != null" 
+            <el-button v-if="deptBudgetList.tranCarInfoList.length>0&&deptBudgetList.tranCarInfoList[0].unloadPoundImg != null" 
                class="bg-bottom-preview" type="primary" size="small" :data-img="deptBudgetList.tranCarInfoList[0].unloadPoundImg" @click="$imgPreview">预览</el-button>
+          </div>
         </template>
       </ws-form-item>
     </ws-form>
@@ -669,6 +669,7 @@ export default {
             if (valid) {
               var tranProcessInfo = {}
               tranProcessInfo.id = this.deptBudgetList.id
+              tranProcessInfo.weight = this.total
               stateRec(tranProcessInfo)
                 .toPromise()
                 .then((response) => {