前端

src/components/WsUpload/index.vue

@@ -785,7 +785,7 @@ $ctrl-margin-left: 10px;
 /*  color: #ffffff;*/
 /*}*/
 
-.el-upload-list__item:hover .operate-bg {
+.operate-bg:hover {
   opacity: 0;
 }
 </style>

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -275,7 +275,7 @@
                       :value="item.fleetName" />
                   </el-select>
                 </ws-form-item>
-                <ws-form-item v-if="serviceManagementType == 1" label="车牌号" span="1" prop="carNo">
+                <ws-form-item v-if="serviceManagementType == 1&&deptBudgetList.outType != '散船'&&deptBudgetList.outType != '火运'" label="车牌号" span="1" prop="carNo">
                   <ws-input :disabled="disabled2"
                     v-if="options2.length == 0 && serviceManagementType == 1 || serviceManagementType == 3 && carNumberList.length == 0"
                     v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7" size="small" />
@@ -310,6 +310,27 @@
                       top: -1px;
                     " src="../../../public/img/edit.png" @click="editClick(3)" alt="" /> -->
                 </ws-form-item>
+                <ws-form-item label="车牌号" span="1" prop="shipName" v-if="deptBudgetList.outType == '散船'">
+                  <ws-input 
+                    v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7" size="small" />
+                </ws-form-item>
+                <ws-form-item label="车厢号-1" span="1" prop="wingNumber" v-if="deptBudgetList.outType == '火运'">
+                  <ws-input v-model="deptBudgetList.wingNumber" placeholder="请输入车厢号" maxlength="20" size="small" />
+                </ws-form-item>
+                <ws-form-item label="车厢号-2" span="1" prop="wingNumberOther" v-if="deptBudgetList.outType == '火运'">
+                  <ws-input v-model="deptBudgetList.wingNumberOther" placeholder="请输入车厢号" maxlength="20"
+                          size="small" />
+                </ws-form-item>
+                <ws-form-item label="船名" span="1" prop="shipName" v-if="deptBudgetList.outType == '散船'">
+                  <el-select filterable clearable v-model="deptBudgetList.shipName"
+                    placeholder="请选择船名" class="typeselect" @change="shipInfoChange($event, 1)">
+                    <el-option v-for="item in shipInfoList" :key="item.constKey" :label="item.carNo"
+                      :value="item.carNo" />
+                  </el-select>
+                </ws-form-item>
+                <ws-form-item label="航次" span="1" prop="shipNumber" v-if="deptBudgetList.outType == '散船'">
+                  <ws-input v-model="deptBudgetList.shipNumber" placeholder="请输入航次" maxlength="20" size="small" />
+                </ws-form-item>
                 <ws-form-item label="箱号-1" span="1" prop="boxNo"
                   v-if="deptBudgetList.outType == '汽运' || deptBudgetList.outType == '集装箱船'">
                   <ws-input :disabled='recheck' v-model="deptBudgetList.boxNo" placeholder="请输入箱号" maxlength="20"
@@ -560,6 +581,7 @@ export default {
       taskflag:2,
       //分页
       currentPage: 1,
+      shipInfoList:[],
       cost: '',
       pageSize: 10,
       isShowPrint: false,
@@ -3332,6 +3354,7 @@ export default {
               break;
             }
           }else{
+            this.shipInfoList=this.outContractNo[i].shipInfoList
             this.deptBudgetList.goodsName = this.outContractNo[i].goodsName
             this.deptBudgetList.goodsNameKey = this.outContractNo[i].goodsNameKey
           }

src/views/outboundManagement/weighingManagementNew.vue

@@ -4,7 +4,7 @@
       <template slot="left">
       </template>
       <template slot="right">
-        <el-select v-model="warehouseName" filterable placeholder="" @change="warehouseNameChange" :value="searchType">
+        <el-select style="width:400px;" v-model="warehouseName" filterable placeholder="" @change="warehouseNameChange" :value="searchType">
           <el-option v-for="item in warehouseList" :key="item.value" :label="item.value" :value="item.value"
             style="color: #8890b1" />
         </el-select>
@@ -141,12 +141,12 @@
                           value-format="yyyy-MM-dd" />
                       </ws-form-item>
                       <ws-form-item label="运输方式" span="1" prop="outType">
-                        <el-select  v-model="weighingList.outType" placeholder="请选择运输方式" :disabled="recheck1">
+                        <el-select @change="outTypechange" v-model="weighingList.outType" placeholder="请选择运输方式" :disabled="recheck1">
                           <el-option v-for="item in multiSelector" :key="item.value" :label="item.name"
                             :value="item.name"  />
                         </el-select>
                       </ws-form-item>
-                      <ws-form-item v-if="fleetNameList.length > 0 && tpyeNo == 1" label="车队" span="1" prop="fleetName">
+                      <ws-form-item v-if="fleetNameList.length > 0 && tpyeNo == 1&&weighingList.outType == '汽运'" label="车队" span="1" prop="fleetName">
                         <el-select @change="fleetNameChange" :disabled="recheck" v-model="weighingList.fleet" placeholder="非车队车辆">
                           <el-option  key="" label="非车队"
                             value="非车队" />
@@ -155,6 +155,7 @@
                         </el-select>
                       </ws-form-item>
                       <ws-form-item label="车牌号" span="1" prop="carNo" v-if="
+                      weighingList.outType == '散船' ||
                       weighingList.outType == '汽运' ||
                       weighingList.outType == '集装箱船'
                     ">
@@ -200,7 +201,12 @@
                           size="small" />
                       </ws-form-item>
                       <ws-form-item label="船名" span="1" prop="shipName" v-if="weighingList.outType == '散船'">
-                        <ws-input v-model="weighingList.shipName" placeholder="请输入船名" maxlength="20" size="small" />
+                        <!-- <ws-input v-model="weighingList.shipName" placeholder="请输入船名" maxlength="20" size="small" /> -->
+                        <el-select filterable clearable v-model="weighingList.shipName"
+                          placeholder="请选择船名" class="typeselect" @change="shipInfoChange($event)">
+                          <el-option v-for="item in shipInfoList" :key="item.id" :label="item.shipName"
+                            :value="item.shipName" />
+                        </el-select>
                       </ws-form-item>
                       <ws-form-item label="航次" span="1" prop="shipNumber" v-if="weighingList.outType == '散船'">
                         <ws-input v-model="weighingList.shipNumber" placeholder="请输入航次" maxlength="20" size="small" />
@@ -422,6 +428,7 @@
         warehouseList1: [],
         currentPage: 1,
         pageSize: 50,
+        shipInfoList:[],
         priceedit:false,
         submitAllow: false,
         deliveryList: [],
@@ -612,6 +619,15 @@
     },
     activated() {},
     methods: {
+      shipInfoChange(e){
+        console.log(e)
+        
+        for (let i = 0; i < this.shipInfoList.length; i++) {
+          if(this.shipInfoList[i].shipName==this.weighingList.shipName){
+            this.weighingList.shipNumber=this.shipInfoList[i].shipNo
+          } 
+        }
+      },
       async typePrintClick(type) {
         getweighing({
             id: this.idPrint
@@ -651,6 +667,24 @@
           })
           .catch((response) => {})
       },
+      outTypechange(e){
+        console.log(e)
+        if(e=='汽运'){
+          if(this.carChange1 == '手动填写'){
+            this.weighingList.selfLoading = '0'
+            this.carjudge=false
+          }else{
+            this.weighingList.selfLoading = '1'
+            this.carjudge=true
+          }
+        }else if(e=='散船'){
+          this.carjudge=true
+          this.weighingList.selfLoading = '0'
+        }else if(e=='集装箱船'){
+          this.carjudge=true
+          this.weighingList.selfLoading = '0'
+        }
+      },
       typePrintCannelClick() {
         this.ddchecked = false,
           this.checked = false,
@@ -2085,7 +2119,7 @@
         // if (!data) return
         for (var i = 0; i < this.outContractNo.length; i++) {
           if (this.outContractNo[i].contractNo == this.weighingList.contractNo) {
-            
+            this.shipInfoList=this.outContractNo[i].shipInfoList
             this.weighingList.goodsName = this.outContractNo[i].goodsName
             if (this.weighingList.goodsName == '玉米（潮粮）') {
               this.weighingList.type = '潮粮'

src/views/profitable/cashoutaduitNQ.vue

@@ -50,8 +50,8 @@
         @onChange="onChange" 
        />
         </el-form-item>
-        <div style='margin:20px -30px;font-weight:bold'>收款账户信息</div>
-        <el-form-item label-width='100px' label="收款方" span="1" prop="payee">
+          <div style='margin:20px -30px;font-weight:bold'>收款账户信息</div>
+          <el-form-item label-width='100px' label="收款方" span="1" prop="payee">
             <el-input disabled class='input50 input_css' placeholder="输入收款方" v-model="deptBudgetList.payee"></el-input>
           </el-form-item>
           <el-form-item label-width='100px' label="账号" span="1" prop="accountNumber">

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -952,6 +952,7 @@
 							that.dataList = {
 								taskTypeKey: 1
 							}
+							this.goods=''
 							that.dataList1 = {}
 							that.$router.push({
 								path: 'tranManagementWarehouseInOuttask'
@@ -1561,7 +1562,6 @@
 					this.requestadd(this.dataList)
 				} else if (this.dataList1.taskTypeKey == 2) {
 					this.dataList1.inOutTaskNo = this.inOutTaskNo1
-					this.dataList1.sourceRelationInfoList=supplygoods
 					this.requestadd(this.dataList1)
 				} else if (
 					this.dataList.taskTypeKey == 3 ||