Merge branch 'master' of http://git.zthymaoyi.com/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/statisticalReport/huoyunList.vue

@@ -50,7 +50,7 @@
           > -->
         </el-col>
         <el-col
-          style="text-align: right; line-height: 60px; padding-right: 10px;display: flex;"
+          style="display: flex; justify-content:flex-end;margin-top:13px"
           :span="14"
         >
           <el-select
@@ -76,7 +76,6 @@
             placeholder="请选择运输任务编号"
             clearable
             filterable
-           
             @change="taskNochange"
             maxlength="500"
             type="input"
@@ -106,17 +105,10 @@
               :label="item.processNoValue "
               :value="item.processNoValue"
             />
-            <!-- <el-option
-              v-if="!item.reportStatus"
-              v-for="item in options"
-              :key="item.constKey"
-              :label="item.contractNo"
-              :value="item.contractNo"
-            /> -->
           </el-select>
         </el-col>
       </el-row>
-      <div class="freightSet">
+      <div class="freightSet" v-if="actualFreight && tranPriceIng">
         <div style="display: flex;width:200px;line-height: 30px;"> 预计运费（元）：{{tranPriceIng}}元</div>
         <span style="display: flex;line-height: 30px;">实际运费（元）：<el-input type="text" maxlength="70" size="small"  v-model="actualFreight" v-show="textShow"/><span v-show="!textShow">{{actualFreight}}</span>元</span>
         <i @click="actualFreightchange" class="iconfont icon-dui" v-show="textShow" style="margin-top:10px"></i>
@@ -1325,10 +1317,6 @@ export default {
   border-top-left-radius: 0px;
   border-bottom-left-radius: 0px;
 }
-/deep/.findValue .el-input__inner {
-  width: 300px;
-
-}
 .completed.el-button--default {
   border-color: #5878e8;
   background-color: #f6f7fc;
@@ -1550,4 +1538,8 @@ hr {
 /deep/.freightSet .el-input{
   width: 44%;
 }
+.findValue{
+  width: 300px;
+  margin-left: 5px;
+}
 </style>

src/views/statisticalReport/shippingList.vue

@@ -106,17 +106,10 @@
               :label="item.processNoValue "
               :value="item.processNoValue"
             />
-            <!-- <el-option
-              v-if="!item.reportStatus"
-              v-for="item in options"
-              :key="item.constKey"
-              :label="item.contractNo"
-              :value="item.contractNo"
-            /> -->
           </el-select>
         </el-col>
       </el-row>
-       <div class="freightSet">
+       <div class="freightSet" v-if="actualFreight && tranPriceIng">
         <div style="display: flex;width:200px;line-height: 30px;"> 预计运费（元）：{{tranPriceIng}}元</div>
         <span style="display: flex;line-height: 30px;">实际运费（元）：<el-input type="text" maxlength="70" size="small"  v-model="actualFreight" v-show="textShow"/><span v-show="!textShow">{{actualFreight}}</span>元</span>
         <i @click="actualFreightchange" class="iconfont icon-dui" v-show="textShow" style="margin-top:10px"></i>
@@ -1331,9 +1324,6 @@ export default {
   border-top-left-radius: 0px;
   border-bottom-left-radius: 0px;
 }
-/deep/.findValue .el-input__inner {
-  width: 300px;
-}
 .completed.el-button--default {
   border-color: #5878e8;
   background-color: #f6f7fc;
@@ -1558,4 +1548,8 @@ hr {
 /deep/.freightSet .el-input{
   width: 44%;
 }
+.findValue{
+  width: 300px;
+  margin-left: 5px;
+}
 </style>

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -82,7 +82,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="establishDate" class="table_td" label="创建时间"></el-table-column>
-        <el-table-column prop="seller" label="操作" width="180">
+        <el-table-column prop="seller" label="操作" width="230">
           <template slot-scope="scope">
             <span class="corles" @click="nocomplete(scope.row)" v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.View`

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -109,12 +109,12 @@
 							value-format="yyyy-MM-dd" />
 					</el-form-item>
 					<!--经办人-->
-					<!-- <el-form-item label="出库经办人">
-            <el-select v-model="dataList.agent" placeholder="请选择经办人" filterable
+					<el-form-item label="发货人">
+            <el-select v-model="dataList.agent" placeholder="请选择发货人" filterable
               @change="selectstaff">
               <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
             </el-select>
-          </el-form-item> -->
+          </el-form-item>
 					<!--业务描述=-->
 					<el-form-item v-if="dataList.taskTypeKey != 3" label="业务描述" span="20">
 						<el-input v-model="dataList.businessDescribe" placeholder="请输入业务描述（运输方式），不超过150字"
@@ -209,13 +209,13 @@
 						<el-date-picker v-model="dataList1.predictDate" type="date" placeholder="请选择预计入库日期"
 							value-format="yyyy-MM-dd" />
 					</el-form-item>
-					<!--经办人-->
-					<!-- <el-form-item label="入库经办人">
-            <el-select v-model="dataList1.agent" placeholder="请选择经办人" filterable :filter-method="dataFilter1"
+					<!-- 经办人-->
+					<el-form-item label="收货人">
+            <el-select v-model="dataList1.agent" placeholder="请选择收货人" filterable :filter-method="dataFilter1"
               @change="selectstaff1">
               <el-option v-for="item in options1" :key="item.value" :label="item.staffName" :value="item.staffName" />
             </el-select>
-          </el-form-item> -->
+          </el-form-item>
 					<!--业务描述=-->
 					<el-form-item v-if="dataList.taskTypeKey != 4" label="业务描述">
 						<el-input v-model="dataList1.businessDescribe" placeholder="请输入业务描述（运输方式），不超过150字"
@@ -312,13 +312,13 @@
 						<el-date-picker v-model="dataList.predictDate" type="date" placeholder="请选择预计出库日期"
 							value-format="yyyy-MM-dd" />
 					</el-form-item>
-					<!--经办人-->
-					<!-- <el-form-item label="出库经办人">
-            <el-select v-model="dataList.agent" placeholder="请选择经办人" filterable
+					<!--发货人-->
+					<el-form-item label="发货人">
+            <el-select v-model="dataList.agent" placeholder="请选择发货人" filterable
               @change="selectstaff">
               <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
             </el-select>
-          </el-form-item> -->
+          </el-form-item>
 					<!--业务描述=-->
 					<el-form-item label="业务描述">
 						<el-input v-model="dataList.businessDescribe" placeholder="请输入业务描述（运输方式），不超过150字"

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

@@ -541,7 +541,6 @@ export default {
           // _this.freightspace.concat(arr)
           let _ispushData = true
           console.log(arr, _this.deptBudgetList.tranCarInfoList)
-          // debugger
           for (let i = 0; i < _this.excelFreightspace.length; i++) {
             _ispushData = true
             for (let k = 0; k < _this.deptBudgetList.tranCarInfoList.length; k++) {
@@ -664,6 +663,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) => {