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

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -14,8 +14,11 @@
           <ws-option v-for="item in taskTypeList" :key="item.value" :label="item.value" :value="item.value"
             style="color: #8890b1" />
         </ws-select>
-        <ws-input @keyup.enter.native="find()" class='findValue' v-model="searchKeyWord" placeholder="可按合同编号或任务编号查找"
-          clearable maxlength="500" type="input"></ws-input>
+        <ws-select v-model="inOutType" placeholder class="typeselect" @change="selectinOutType" :value="inOutType">
+          <ws-option v-for="item in inOutTypeList" :key="item.value" :label="item.value" :value="item.value"
+            style="color: #8890b1" />
+        </ws-select>
+        <ws-input @keyup.enter.native="find()" class='findValue' v-model="searchKeyWord" placeholder="可按合同编号或任务编号查找" clearable maxlength="500" type="input"></ws-input>
         <ws-button class="find" type="primary" @click="lookUp()">
           <img width="16" height="16" style="
               vertical-align: text-top;
@@ -34,8 +37,8 @@
           </template>
         </el-table-column>
         <el-table-column prop="inOutTaskNo" label="任务编号" width="160"></el-table-column>
-        <el-table-column prop="contractNo" label="合同编号" width="160">
-          <!-- <template scope="scope">
+        <el-table-column prop="contractNo" label="合同编号/移库编号" width="160">
+          <template scope="scope">
             <div
               v-if="
                 scope.row.inOutType == '移库入库' ||
@@ -52,7 +55,7 @@
             >
               {{ scope.row.contractNo }}
             </div>
-          </template> -->
+          </template>
         </el-table-column>
         <el-table-column prop="warehouseName" class="table_td" label="仓库名"></el-table-column>
         <el-table-column prop="inOutType" class="table_td" label="出入库类型"></el-table-column>
@@ -171,6 +174,49 @@
         searchType: 1,
         searchTypeText: '待审核',
         searchKeyWord: '',
+        inOutType:'',
+        inOutTypeList:[
+          {
+            value: '销售出库',
+            type: 1
+          },
+          {
+            value: '移库出库',
+            type: 3
+          },
+          {
+            value: '暂存出库',
+            type: 2
+          },
+          {
+            value: '贸易服务出库',
+            type: 4
+          },
+          {
+            value: '采购出库',
+            type: 5
+          },
+          {
+            value: '采购入库',
+            type: 6
+          },
+          {
+            value: '移库入库',
+            type: 7
+          },
+          {
+            value: '暂存入库',
+            type: 8
+          },
+          {
+            value: '贸易服务入库',
+            type: 9
+          },
+          {
+            value: '退库',
+            type: 10
+          },
+        ],
         contractType: 2,
         taskTypeList: [{
             value: '待审核',
@@ -219,6 +265,9 @@
       this.showType = this.isShow
     },
     methods: {
+      selectinOutType(){
+        this.getList()
+      },
       //添加
       handleAdd() {
         this.$router.push({
@@ -269,6 +318,7 @@
             pageSize: this.pageSize,
             searchType: this.searchType,
             searchKeyWord: this.searchKeyWord,
+            inOutType:this.inOutType
           })
           .toPromise()
           .then((response) => {
@@ -503,7 +553,7 @@
 
   .findValue {
     // width: 0%;
-    margin-left: 25%;
+    margin-left: 10px;
   }
 
   .search {

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -216,6 +216,7 @@
                   <el-option v-for="item in options2" :key="item.constKey"
                     :label="item.carNo + '(' + item.tranCarNo + ')'" :value="item.carNo" />
                 </el-select>
+                 <span style='padding-left:10px;'>发货重量（吨）：{{dataList.loadNetWeight}}</span>  
               </ws-form-item>
               <!--船名  -->
               <ws-form-item label="船名" span="1" prop="carNo" v-if="deptBudgetList.outType == '散船'">

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -190,6 +190,7 @@
                   <el-option v-for="item in options2" :key="item.constKey"
                     :label="item.carNo + '(' + item.tranCarNo + ')'" :value="item.carNo" />
                 </el-select>
+                 <span style='padding-left:10px;'>发货重量（吨）：{{dataList.loadNetWeight}}</span>  
               </ws-form-item>
 
               <ws-form-item label="车号" span="1" prop="carNo" v-if="dataList.outType == '火运'">
@@ -590,9 +591,15 @@
       },
       carChange(e) {
         for (let i = 0; i < this.tranCarInfoList.length; i++) {
-          if (this.tranCarInfoList[i].carNo == this.deptBudgetList.carNo) {
-            this.deptBudgetList.tranCarNo = this.tranCarInfoList[i].tranCarNo
-            this.deptBudgetList.carId = this.tranCarInfoList[i].id
+          if (this.tranCarInfoList[i].carNo == this.dataList.carNo) {
+            this.dataList.tranCarNo = this.tranCarInfoList[i].tranCarNo
+            this.dataList.carId = this.tranCarInfoList[i].id
+             if(this.dataList.inOutType=='移库入库'){
+            if(!this.dataList.cost){
+              this.dataList.cost=this.tranCarInfoList[i].cost
+            }
+            this.dataList.loadNetWeight=this.tranCarInfoList[i].loadNetWeight
+          }
           }
         }
       },