更新 sdy

src/views/contractManagement/purchaseContractAdd.vue

@@ -445,9 +445,9 @@
 
       <ws-info-table>
         <!--已付款（元）-->
-        <ws-form-item label="已付款（元）" span="1" prop="goodsNameKey">
+        <ws-form-item label="已付款（元）" span="1" prop="mildewGrain">
           <ws-input
-            v-model="deptBudgetList.contractProcessInfo.goodsNameKey"
+            v-model="deptBudgetList.contractProcessInfo.mildewGrain"
             placeholder="请输入已付款（元）"
             maxlength="100"
             size="small"
@@ -609,6 +609,7 @@ export default {
 
       deptBudgetList: {
         deliverType: '1',
+        addressUrl:'',
         finalTradingVolume: 0,
         totalContractPrice:0,
         contractGoodsInfo: {
@@ -1344,6 +1345,7 @@ export default {
                   goodsName: '',
                 },
                 contractProcessInfo: {},
+                addressUrl:'',
               }
               this.$router.push({ path: 'buyContract' })
             })

src/views/contractManagement/purchaseContractExamine.vue

@@ -189,8 +189,8 @@
       </div>
       <ws-info-table>
          <!--已付款（元）-->
-        <ws-form-item label="已付款（元）" span="1" prop="goodsNameKey">
-          {{deptBudgetList.contractProcessInfo.goodsNameKey}}
+        <ws-form-item label="已付款（元）" span="1" prop="mildewGrain">
+          {{deptBudgetList.contractProcessInfo.mildewGrain}}
         </ws-form-item>
         <ws-form-item label="已开发票（元）" span="1" prop="goodsName">
           {{ deptBudgetList.contractProcessInfo.goodsName }}

src/views/contractManagement/salesContractEdit.vue

@@ -425,7 +425,7 @@
 
         <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="请输入合同收入（元）"

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -228,7 +228,7 @@ export default {
           // if(this.userJurisdiction){
           //   this.warehouseList.unshift({warehouseName:response[0].flag})
           // }
-          debugger
+          // debugger
           let _wareHouse = sessionStorage.getItem('houseSelfCollect_house')
           if (_wareHouse) {
             _wareHouse = JSON.parse(_wareHouse)

src/views/houseSelfCollect/inspectionManagement.vue

@@ -66,9 +66,11 @@
       <el-table-column prop="customerName" label="客户"></el-table-column>
       <el-table-column prop="carNumber" label="车牌号"></el-table-column>
       <el-table-column prop="goodsName" label="货名"></el-table-column>
-      <el-table-column prop="waterContent" label="水分（%）">
+      <el-table-column prop="waterContent" label="水分（%）" width="120">
         <template scope="scope">
-          <span>{{scope.row.waterContent}} | {{scope.row.reWaterContent ? scope.row.reWaterContent : '未复检' }}</span>
+          <span class="water-left">{{scope.row.waterContent}}</span> 
+          <span class="water-line">|</span> 
+          <span class="water-right">{{scope.row.reWaterContent ? scope.row.reWaterContent : '未复检' }}</span> 
         </template>
       </el-table-column>
        <el-table-column prop="buckleMiscellaneous" label="扣杂">
@@ -176,6 +178,7 @@ export default {
       searchType: 0,
       warehouseName: '',
       inspect: [],
+      warehouseList1:[],
       warehouseList: [],
       cangid: '', //仓库id
       warehouseCount: '',
@@ -232,6 +235,11 @@ export default {
           this.WAREHOUSE[1].payname = this.warehouseList[i].value
         }
       }
+      for(let i = 0 ; i < this.warehouseList1.length; i++){
+        if(this.warehouseList1[i].warehouseName == e){
+           sessionStorage.setItem('houseSelfCollect_house',JSON.stringify(this.warehouseList[i]))
+        }
+      }
       this.getList()
     },
     del(row) {
@@ -277,26 +285,36 @@ export default {
       })
         .toPromise()
         .then((response) => {
+          this.warehouseList1=response
           this.warehouseList = []
+          let _wareHouse = sessionStorage.getItem('houseSelfCollect_house')
+          _wareHouse = JSON.parse(_wareHouse)
           for (let i = 0; i < response.length; i++) {
             this.warehouseList.push({
               value: response[i].warehouseName,
               id: response[i].id,
               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) {
               this.warehouseName = response[i].warehouseName
               this.warehouseCount =  response[i].count
               this.warehouseNo =  response[i].commonWarehouseNo
             } 
+            if(this.warehouseList.length > 0 && !this.cangid){
+              this.warehouseName = this.warehouseList[0].value
+              this.warehouseCount =  this.warehouseList[0].count
+              this.warehouseNo =  this.warehouseList[0].No
+              this.cangid =  this.warehouseList[0].id
+              this.WAREHOUSE[1].payname = this.warehouseList[0].value
+            }
           }
-          if(this.warehouseList.length > 0 && !this.cangid){
-            this.warehouseName = this.warehouseList[0].value
-            this.warehouseCount =  this.warehouseList[0].count
-            this.warehouseNo =  this.warehouseList[0].No
-            this.cangid =  this.warehouseList[0].id
-            this.WAREHOUSE[1].payname = this.warehouseList[0].value
           }
           this.getList()
         })
@@ -385,4 +403,8 @@ export default {
 /deep/.el-dialog__body {
   padding: 20px !important;
 }
+.water-left,.water-right{
+  width: 45%;
+  display: inline-block;
+}
 </style>

src/views/houseSelfCollect/paymentManagement.vue

@@ -287,19 +287,25 @@ export default {
       }
     },
     getWarehouse() {
+      let _wareHouse = sessionStorage.getItem('houseSelfCollect_house')
+      _wareHouse = JSON.parse(_wareHouse)
       selectWarehouseSelf({
         compId: sessionStorage.getItem('ws-pf_compId')
       })
         .toPromise()
         .then(response => {
           this.warehouseList = response
-          console.log(this.WAREHOUSE[3].payname)
-          this.warehouseNameKey = this.warehouseList[0].id
-          if (this.warehouseName) {
-            this.warehouseNameKey = this.WAREHOUSE[3].payname
+           if (_wareHouse) {
+            this.warehouseNameKey = _wareHouse.id
+            this.warehouseName = _wareHouse.warehouseName
           } else {
-            this.WAREHOUSE[3].payname = this.warehouseList[0].id
-            this.warehouseName =  this.warehouseList[0].warehouseName
+          this.warehouseNameKey = this.warehouseList[0].id
+            if (this.warehouseName) {
+              this.warehouseNameKey = this.WAREHOUSE[3].payname
+            } else {
+              this.WAREHOUSE[3].payname = this.warehouseList[0].id
+              this.warehouseName =  this.warehouseList[0].warehouseName
+            }
           }
           this.getList()
         })
@@ -344,21 +350,21 @@ export default {
           this.deptBudgetTotal = response.total
         })
         this.isShowAdopt = true
-     getpayment({
-         currentPage: 1,
-        pageSize: 99999,
-        warehouseName: this.warehouseName,
-        managementType : 1 
-      })
-        .toPromise()
-        .then((response) => {
-          for(let i = 0 ; i < response.length ; i++){
-            if(response[i].taskId){
-              this.isShowAdopt = true
-              return
-            }
-          }
-        })
+    //  getpayment({
+    //      currentPage: 1,
+    //     pageSize: 99999,
+    //     warehouseName: this.warehouseName,
+    //     managementType : 1 
+    //   })
+    //     .toPromise()
+    //     .then((response) => {
+    //       for(let i = 0 ; i < response.length ; i++){
+    //         if(response[i].taskId){
+    //           this.isShowAdopt = true
+    //           return
+    //         }
+    //       }
+    //     })
     },
     del(row) {
       this.$confirm(
@@ -598,6 +604,7 @@ export default {
       for (let i = 0; i < this.warehouseList.length; i++) {
         if (this.warehouseList[i].id == this.warehouseNameKey) {
           this.warehouseName = this.warehouseList[i].warehouseName
+          sessionStorage.setItem('houseSelfCollect_house',JSON.stringify(this.warehouseList[i]))
           this.WAREHOUSE[3].payname = this.warehouseList[i].id
         }
       }

src/views/houseSelfCollect/settlement.vue

@@ -164,7 +164,10 @@
               />
             </ws-form-item>
             <ws-form-item v-if='paymentList.type=="潮粮" && paymentList.qualityInspectionManagement.paramType == "1"' label="扣重" span="1" prop="waterContent">
-              <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.qualityInspectionManagement.weightDeduction" placeholder="请输入扣重" maxlength="100" size="small" disabled/>
+              <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.weightDeduction" placeholder="请输入扣重" maxlength="100" size="small" disabled/>
+            </ws-form-item>
+            <ws-form-item v-if='paymentList.type=="潮粮" && paymentList.qualityInspectionManagement.paramType == "2"' label="扣重（公斤）" span="1" prop="waterContent">
+              <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.weightDeduction" placeholder="请输入扣重" maxlength="100" size="small" disabled/>
             </ws-form-item>
             <ws-form-item v-if='paymentList.type=="潮粮" && paymentList.qualityInspectionManagement.paramType != 1' label="掉水(%)" span="1" prop="waterContent" >
               <ws-input type="number" @mousewheel.native.prevent v-model="paymentList.qualityInspectionManagement.waterContent-paymentList.qualityInspectionManagement.waterMin" placeholder="请输入掉水" maxlength="100" size="small" disabled/>

src/views/houseSelfCollect/weighingManagement.vue

@@ -250,12 +250,15 @@ export default {
       this.getList()
     },
     selectWarehouse(){
+      let _wareHouse = sessionStorage.getItem('houseSelfCollect_house')
+      _wareHouse = JSON.parse(_wareHouse)
       selectWarehouseSelf({
         compId: sessionStorage.getItem('ws-pf_compId'),
       })
         .toPromise()
         .then((response) => {
           this.warehouseList = []
+          
           for (let i = 0; i < response.length; i++) {
             this.warehouseList.push({
               value: response[i].warehouseName,
@@ -264,6 +267,16 @@ export default {
               monitorUrl1:response[i].monitorUrl1,
               monitorUrl2:response[i].monitorUrl2
             })
+             if (_wareHouse) {
+            
+            this.cangid = _wareHouse.id
+            this.warehouseName = _wareHouse.warehouseName
+            this.common.name=_wareHouse.warehouseName
+            this.warehouseId=_wareHouse.id
+             this.warehouseNo =_wareHouse.commonWarehouseNo
+             this.monitorUrl1=_wareHouse.monitorUrl1
+             this.monitorUrl2=_wareHouse.monitorUrl2
+          } else {
             if (this.cangid&&this.cangid == response[i].id) {
               this.warehouseName = response[i].warehouseName
               this.allowEdit = response[i].allowEdit
@@ -273,7 +286,7 @@ export default {
               this.monitorUrl1 =  response[i].monitorUrl1
               this.monitorUrl2 =  response[i].monitorUrl2
             }
-          }
+         
            if(this.warehouseList.length > 0 && !this.cangid){
             this.warehouseName = this.warehouseList[0].value
             this.cangid =  this.warehouseList[0].warehouseId
@@ -282,8 +295,11 @@ export default {
             this.common.name  =  this.warehouseList[0].value
             this.monitorUrl1 =  this.warehouseList[0].monitorUrl1
             this.monitorUrl2 =  this.warehouseList[0].monitorUrl2
+            } 
+          }
           }
            sessionStorage.setItem('ck',this.common.name)
+           console.log(this.warehouseList)
          this.getList()
         })
     },

src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -645,8 +645,6 @@ export default {
     },
     //定金
     amendconfirm() {
-      this.contractManagementInfo.deposit = this.orderList.deposit 
-      this.contractManagementInfo.depositUrl = this.depositUrl
       this.$confirm(`确定提交定金信息？`, {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
@@ -657,8 +655,7 @@ export default {
             this.contractManagementInfoList.id = this.contractNoList[i].id
           }
         }
-         this.contractManagementInfoList.deposit = this.deposit
-        // this.$set(this.contractManagementInfoList,'deposit',this.deposit)
+        this.contractManagementInfoList.deposit = this.orderList.deposit 
         this.contractManagementInfoList.depositUrl = this.depositUrl
         addDisOrRemarks(this.contractManagementInfoList)
           .toPromise()
@@ -1009,6 +1006,7 @@ export default {
           this.contractNoList = response
           this.option = this.contractNoList
        this.contractNo = this.option[0].contractNo
+       this.contractchange(this.contractNo)
        this.getList()
         })
     },

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -380,7 +380,7 @@
 				this.collectForm1 = true
 			},
 			adoptRemarks() {
-				this.remarkInformation.remark = this.orderList.remark
+				// this.remarkInformation.remark = this.orderList.remark
 				this.$confirm(`确定要保存备注信息？`, {
 						confirmButtonText: '确定',
 						cancelButtonText: '取消',
@@ -392,7 +392,7 @@
 								this.remarkInformationList.id = this.contractNoList[i].id
 							}
 						}
-						this.remarkInformationList.remark = this.remark
+						this.remarkInformationList.remark = this.orderList.remark
 						disOrRemarks(this.remarkInformationList)
 							.toPromise()
 							.then(() => {

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -21,9 +21,13 @@
       <div class="nav">
         <span class="ziti">
           任务类型：
-          <h1 class="ziti1" v-show="dataList.inOutType == '移库入库'||dataList.inOutType == '移库出库'"> 移库任务</h1>
+          <h1 class="ziti1" v-show="dataList.taskTypeKey == '3'||dataList1.taskTypeKey == '3'"> 移库任务</h1>
+          <h1 class="ziti1"  v-show="dataList.taskTypeKey == '4'||dataList1.taskTypeKey == '4'"> 退库并出库任务</h1>
+          <h1 class="ziti1" v-show="dataList.taskTypeKey == '1'||dataList1.taskTypeKey == '1'"> 出库任务</h1>
+          <h1 class="ziti1"  v-show="dataList.taskTypeKey == '2'||dataList1.taskTypeKey == '2'"> 入库任务</h1>
+          <!-- <h1 class="ziti1" v-show="dataList.inOutType == '移库入库'||dataList.inOutType == '移库出库'"> 移库任务</h1>
           <h1 class="ziti1" v-show="dataList.inOutType == '销售出库'||dataList.inOutType == '暂存出库'||dataList.inOutType == '贸易服务出库'||dataList.inOutType == '采购出库'"> 出库任务</h1>
-          <h1 class="ziti1" v-show="dataList.inOutType == '采购入库'||dataList.inOutType == '暂存入库'||dataList.inOutType == '贸易服务入库'||dataList.inOutType == '退库'"> 入库任务</h1>
+          <h1 class="ziti1" v-show="dataList.inOutType == '采购入库'||dataList.inOutType == '暂存入库'||dataList.inOutType == '贸易服务入库'||dataList.inOutType == '退库'"> 入库任务</h1> -->
         </span>
       </div>
       <div class="nav2"></div>
@@ -67,22 +71,14 @@
               :value="item.constValue"
             />
             {{dataList.inOutType}}
-            <!-- </el-select> -->
           </el-form-item>
           <!-- 合同编号 -->
-          <el-form-item label="合同编号">
-            <!-- <el-option
-              v-for="item in contractNoList"
-              :key="item.constKey"
-              :label="item.contractNo"
-              :value="item.contractNo"
-            ></el-option> -->
-            
-            {{dataList.moveTaskNo}}
-            {{dataList.contractNo}}
-            <div v-if="dataList.inOutType == '移库入库' || dataList.inOutType == '移库出库'">  {{dataList.moveTaskNo}}</div>
+          <el-form-item label="移库任务编号" v-if="dataList.inOutType == '移库入库' || dataList.inOutType == '移库出库'">
+            <div>  {{dataList.moveTaskNo}}</div>
             <div v-if="dataList.inOutType != '移库入库' || dataList.inOutType != '移库出库'">  {{dataList.contractNo}}</div>
-            <!-- </el-select> -->
+          </el-form-item>
+           <el-form-item label="合同编号" v-else>
+            <div>  {{dataList.contractNo}}</div>
           </el-form-item>
           <!-- 货名 -->
           <el-form-item label="货名" class="huom">
@@ -183,15 +179,12 @@
             <!-- </el-select> -->
           </el-form-item>
           <!-- 合同编号 -->
-          <el-form-item label="合同编号">
-            <!-- <el-option
-              v-for="item in contractNoList"
-              :key="item.constKey"
-              :label="item.contractNo"
-              :value="item.contractNo"
-            ></el-option> -->
-               <div v-if="dataList.inOutType == '移库入库' || dataList.inOutType == '移库出库'">  {{dataList.moveTaskNo}}</div>
+           <el-form-item label="移库任务编号" v-if="dataList.inOutType == '移库入库' || dataList.inOutType == '移库出库'">
+            <div>  {{dataList.moveTaskNo}}</div>
             <div v-if="dataList.inOutType != '移库入库' || dataList.inOutType != '移库出库'">  {{dataList.contractNo}}</div>
+          </el-form-item>
+           <el-form-item label="合同编号" v-else>
+            <div>  {{dataList.contractNo}}</div>
           </el-form-item>
           <!-- 货名 -->
           <el-form-item label="货名" class="huom">
@@ -377,7 +370,7 @@
             <span v-if='!scope.row.approved'>驳回</span>
           </template>
         </el-table-column>
-        <el-table-column prop="createTime" label="审核时间"></el-table-column>
+        <el-table-column prop="endTime" label="审核时间"></el-table-column>
         <el-table-column prop="auditMind" label="驳回原因"></el-table-column>
      </el-table>
     </div>
@@ -853,7 +846,7 @@ export default {
   line-height: 20px;
   margin-left: 381px;
   margin-top: -21px;
-  width: 100px;
+  width: 116px;
 }
 .winseaview-view {
   padding: 0 0 20px;

src/views/taskManagement/moveWarehouseTask.vue

@@ -66,9 +66,9 @@
         </el-table-column>
         <el-table-column prop="goodsName" label="货名"> </el-table-column>
         <el-table-column prop="weight" label="重量（吨）"> </el-table-column>
-        <el-table-column prop="weight" label="出库量（吨）">
+        <el-table-column prop="deliveryVolume" label="出库量（吨）">
         </el-table-column>
-        <el-table-column prop="weightIn" label="入库量（吨）">
+        <el-table-column prop="storageVolume" label="入库量（吨）">
         </el-table-column>
         <el-table-column prop="stockReturnCount" label="退库量（吨）">
            <template slot-scope="scope">

src/views/tranManagement/tranManagementFireReceivingFeedback.vue

@@ -191,13 +191,13 @@
                 </el-upload>
                 <span
                   v-if="
-                    deptBudgetList.tranCarInfoList[index].unloadPoundImg != null
+                    item.unloadPoundImg != null
                   "
                   >1</span
                 >
                 <span
                   v-if="
-                    deptBudgetList.tranCarInfoList[index].unloadPoundImg == null
+                    item.unloadPoundImg == null
                   "
                   >未上传</span
                 >
@@ -386,7 +386,7 @@ export default {
         {
           boxNo: '',
           unloadNetWeight: '',
-          unloadPoundImg: '',
+          unloadPoundImg: null,
           unloadingDate: '',
         },
         // {loadPoundImg:{}},

src/views/tranManagement/tranManagementShippingFeedback.vue

@@ -121,7 +121,7 @@
           <el-button type="primary">导入</el-button>
         </el-upload>
       </div>
-      <div class="liaison">
+      <div class="liaison" v-if="this.deptBudgetList.tranCarInfoList.length>0">
         <div
           style="width: 100%"
           class="flex position"
@@ -234,7 +234,7 @@
           </ws-info-table>
         </div>
       </div>
-      <div class="yd-bottom">
+      <div v-if="this.deptBudgetList.tranCarInfoList.length>0" class="yd-bottom">
        
         <ws-form-item label="运单：" span="1" prop="loadPoundImg" class="yd-bottom-left" v-if="freightspace[0].status == '已装车'">
           <!-- slot-scope="scope" -->
@@ -266,7 +266,7 @@
           </template>
         </ws-form-item>
 
-        <div style="text-align: right; color: #8890b1; font-size: 16px">
+        <div style="text-align: right; color: #8890b1; font-size: 16px;width:100%;">
           合计(吨)：{{ total }}/{{ deptBudgetList.weight }}
           <!--阶段状态-->
           <span class="noservice" v-show="deptBudgetList.feedbackStatus == '执行中'">未完货</span>
@@ -276,7 +276,9 @@
           >{{ deptBudgetList.feedbackStatus }}</span>
         </div>
       </div>
-
+      <div v-if="this.deptBudgetList.tranCarInfoList.length==0">
+          暂无船次
+      </div>
       <!--运单-->
       <!-- <div
           style="width: 100%"
@@ -756,7 +758,9 @@ export default {
             this.deptBudgetList.shipType = response.tranCarInfoList[0].shipType
             this.deptBudgetList.boxNumber = response.tranCarInfoList[0].boxNumber
             //上传附件计数
-            this.pictureTotal =  this.deptBudgetList.tranCarInfoList[0].loadPoundImg.split(",").length
+            if(this.deptBudgetList.tranCarInfoList[0].loadPoundImg){
+              this.pictureTotal =  this.deptBudgetList.tranCarInfoList[0].loadPoundImg.split(",").length
+            }
             this.freightspace = response.tranCarInfoList
           }