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

public/static/printdry.html

@@ -215,7 +215,7 @@
                       <td v-else class="col">0</td>
                       <td class="col col-bgc">仓位号</td>
                       <td v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'&&print_company_name!='黑龙江稷硕粮食购销有限公司'" class="col"></td>
-                      <td v-else-if="print_company_name=='白城市鹏羽粮食贸易有限公司'" class="col">5</td>
+                      <td v-else-if="print_company_name=='白城市鹏羽粮食贸易有限公司'" class="col">{{printData.binNumber}}</td>
                       <td v-else-if="print_company_name=='黑龙江稷硕粮食购销有限公司'" class="col">7</td>
                   </tr>
                   <tr class="row">
@@ -315,7 +315,7 @@
                     <td class="col col-bgc">扣杂</td>
                     <td class="col"></td>
                     <td class="col col-bgc">仓位号</td>
-                    <td class="col"></td>
+                    <td class="col">{{printData.binNumber}}</td>
                 </tr>
                 <tr class="row">
                     <td class="col col-bgc">毛重（公斤）</td>

src/views/profitable/cashout.vue

@@ -43,11 +43,11 @@
             <ws-select v-model="deptBudgetList.autoAssign" class="typeselect">
               <ws-option label="不自动分配" value="不自动分配" style="color: #8890b1" />
               <ws-option label="仓储费自动分配" value="仓储费自动分配" style="color: #8890b1" />
-              <ws-option label="煤款自动分配" value="煤款自动分配" style="color: #8890b1" />
+              <ws-option label="燃料费自动分配" value="燃料费自动分配" style="color: #8890b1" />
             </ws-select>
           </el-form-item>
-          <el-form-item label-width='100px' label="煤单价(元/吨)" span="1" prop="coalPrice"
-            v-show="deptBudgetList.autoAssign == '煤款自动分配'">
+          <el-form-item label-width='100px' label="单价(元/吨)" span="1" prop="coalPrice"
+            v-show="deptBudgetList.autoAssign == '燃料费自动分配'">
             <el-input class='input50 input_css' placeholder="请输入煤单价" v-model="deptBudgetList.coalPrice"></el-input>
           </el-form-item>
           <el-form-item label-width='100px' v-if='deptBudgetList.purpose == "合同费用"' label="合同编号" span="1"
@@ -889,7 +889,7 @@ export default {
         })
         return
       }
-      if (this.deptBudgetList.autoAssign != '煤款自动分配' && this.deptBudgetList.autoAssign != '仓储费自动分配') {//库点费用  仓储费自动分配和煤款自动分配不需要自动请款
+      if (this.deptBudgetList.autoAssign != '燃料费自动分配' && this.deptBudgetList.autoAssign != '仓储费自动分配') {//库点费用  仓储费自动分配和煤款自动分配不需要自动请款
         if (this.deptBudgetList.expensesPurpose == 1 && this.deptBudgetList.costType == 3 && this.mode == '全部分配' || this.deptBudgetList.expensesPurpose == 3 && this.mode == '全部分配' && this.deptBudgetList.storageFeeFlag != 1) {
           this.deptBudgetList.amountMoney = Number(this.deptBudgetList.amountMoney).toFixed(2)
           if (this.amount != this.deptBudgetList.amountMoney) {
@@ -916,10 +916,10 @@ export default {
         } else if (this.deptBudgetList.autoAssign == "仓储费自动分配") {
           this.deptBudgetList.autoAssign = 3
           this.deptBudgetList.expenseAllocationInfoList = []
-        } else if (this.deptBudgetList.autoAssign == "煤款自动分配") {
+        } else if (this.deptBudgetList.autoAssign == "燃料费自动分配") {
           if (!this.deptBudgetList.coalPrice) {
             this.$message({
-              message: '煤单价不能为空!',
+              message: '燃料费单价不能为空!',
               type: 'warning',
             })
             return

src/views/profitable/cashoutaduit.vue

@@ -38,9 +38,9 @@
             prop="contractNo" class="readonly">
             <span v-if='deptBudgetList.autoAssign == 1'>不自动分配</span>
             <span v-if='deptBudgetList.autoAssign == 3'>仓储费自动分配</span>
-            <span v-if='deptBudgetList.autoAssign == 5'>煤款自动分配</span>
+            <span v-if='deptBudgetList.autoAssign == 5'>燃料费自动分配</span>
           </el-form-item>
-          <el-form-item label-width='100px' label="煤单价(元/吨)" span="1" prop="coalPrice"
+          <el-form-item label-width='100px' label="单价(元/吨)" span="1" prop="coalPrice"
             v-show="deptBudgetList.autoAssign == 5">
             <!-- <el-input class='input50 input_css' placeholder="请输入煤单价" v-model="deptBudgetList.coalPrice"></el-input> -->
             <span>{{deptBudgetList.coalPrice}}</span>

src/views/profitable/cashoutaduitNQ.vue

@@ -36,7 +36,7 @@
             prop="contractNo" class="readonly">
             <span v-if='deptBudgetList.autoAssign == 1'>不自动分配</span>
             <span v-if='deptBudgetList.autoAssign == 3'>仓储费自动分配</span>
-            <span v-if='deptBudgetList.autoAssign == 5'>煤款自动分配</span>
+            <span v-if='deptBudgetList.autoAssign == 5'>燃料费自动分配</span>
           </el-form-item>
           <el-form-item label-width='100px' label="煤单价(元/吨)" span="1" prop="coalPrice"
             v-show="deptBudgetList.autoAssign == 5">

src/views/profitable/coalCost.vue

@@ -3,7 +3,7 @@
     <div class="container">
         <el-row class="row_top">
             <el-col :span="12">
-                <h2 class="bg-left title">煤款</h2>
+                <h2 class="bg-left title">燃料费</h2>
             </el-col>
             <el-col :span="12" class="bg-right">
                 <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()"><img width="6"

src/views/profitable/component/routers/route.js

@@ -429,7 +429,7 @@ const profitableRouter = {
         module: 'lirunhesuan.feiyongguanli.view',
         permissicon: [],
         keepAlive: true,
-        _title:'煤款'
+        _title:'燃料费'
         // module: 'procurement.sparepart.applDetail'
       },
       hidden:true,

src/views/profitable/expensemanagementdetails.vue

@@ -90,7 +90,7 @@
           <el-button @click="exportFile" type="primary">导出</el-button>
         </el-col>
         <el-col style="text-align: right" :span="6">
-          <el-button @click="coalCost()">煤款</el-button>
+          <el-button @click="coalCost()">燃料费</el-button>
           <el-badge v-if="approveStatus" is-dot class="item">
             <el-button style="margin-left: 10px" @click="oilcost()">油费</el-button>
           </el-badge>

src/views/profitable/expensemanagentlook.vue

@@ -35,7 +35,7 @@
             prop="contractNo" class="readonly">
             <span v-if='deptBudgetList.autoAssign == 1'>不自动分配</span>
             <span v-if='deptBudgetList.autoAssign == 3'>仓储费自动分配</span>
-            <span v-if='deptBudgetList.autoAssign == 5'>煤款自动分配</span>
+            <span v-if='deptBudgetList.autoAssign == 5'>燃料费自动分配</span>
           </el-form-item>
           <el-form-item label-width='100px' label="煤单价(元/吨)" span="1" prop="coalPrice"
             v-show="deptBudgetList.autoAssign == 5">

src/views/taskManagement/supplyofgoods.vue

@@ -20,7 +20,7 @@
         </el-date-picker>
           </div>
           <div style='width:50%;margin-right:10px;display: flex;'>
-          <el-select v-model="goodsName" filterable placeholder="" @change="goodsNameChange" 
+          <el-select :disabled="status" v-model="goodsName" filterable placeholder="" @change="goodsNameChange" 
             style="margin: 0 10px">
             <el-option key="全部货名" label="全部货名" value="0" style="color: #8890b1" />
             <el-option v-for="(item,index) in goodsList" :key="item.id" :label="item.constValue"
@@ -143,6 +143,7 @@
         primary: '1',
         startDate:'',
         endDate:'',
+        status:false,
         pickerOptions: {
           shortcuts: [{
               text: '本周',
@@ -233,7 +234,10 @@
           })
       this.getNowTime()
       this.baseId=this.$route.query.baseId
-      
+      if(this.$route.query.status){
+        this.status=true
+        this.goodsName='玉米'
+      }
       this.showType = this.isShow
     },
     methods: {

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -672,7 +672,12 @@
 						}
             			localStorage.setItem('taskTypeKey',this.dataList.taskTypeKey);
 						localStorage.setItem('warehouseId',this.baseId);
-						this.$router.push({name:'supplyofgoods',query:{baseId:this.baseId}})
+						if(this.dataList.taskTypeKey==1){
+							this.$router.push({name:'supplyofgoods',query:{baseId:this.baseId,status:1}})
+						}else{
+							this.$router.push({name:'supplyofgoods',query:{baseId:this.baseId}})
+						}
+						
 					}else{
 						this.$message({
 							message: '请先选择仓库',

src/views/warehousenew/warehousingOrder.vue

@@ -152,7 +152,7 @@
               @click="editMoisture(scope.row)" alt="" />
           </template>
         </el-table-column>
-        <el-table-column prop="inWarehouseWeight1" width="110" class="table_td" label="入库重量">
+        <el-table-column prop="inWarehouseWeight1" width="150" class="table_td" label="入库重量">
           <template scope="scope">
             <span
               v-if='scope.row.weightedit == false && scope.row.warehouseType == 2 || scope.row.warehouseType == 1'>{{ scope.row.inWarehouseWeight1 }}</span>
@@ -804,7 +804,7 @@ export default {
       money: 0,
       interest:'',
       storageFee:'',
-      dryingFee:"",
+      dryingFee:'',
       multipleSelection1: {},
       aduitshow: false,
       distributionshow: false,