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

# Conflicts:
#	src/model/houseSelfCollect/index.js
#	src/views/houseSelfCollect/newWeighingManagement.vue

public/static/aduitprint.html

@@ -132,6 +132,7 @@
             <span v-if="item.inOutTypeKey==3">移库</span>
             <span v-if="item.inOutTypeKey==4">退库并出库</span>
           </div>
+          <div v-if="item.printType==10" class="number">长途加油</div>
           <img v-if="item.currectstatus=='已通过'" class="seal" width="144" height="144" src="../img/ytg.png" alt="">
           <img v-if="item.currectstatus=='审核中'" class="seal" width="144" height="144" src="../img/shz.png" alt="">
           <img v-if="item.currectstatus=='已驳回'" class="seal" width="144" height="144" src="../img/wtg.png" alt="">
@@ -178,13 +179,20 @@
                 </tr>
                 <tr class="row">
                     <td class="col col-bgc">附件</td>
-                    <td colspan="2" class="col">{{ item.addressUrlArrayImage.length }}张图片（
+                    <!-- <td colspan="2" class="col">{{ item.addressUrlArrayImage.length }}张图片（
                       <template v-if="item.expensesType==2">
                         <template v-for="(item1,index) in item.aduitInfo">
                           {{item1.fileUrls?item1.fileUrls.length:0}} <span v-if="index!=item.aduitInfo.length-1">+</span>
                         </template>
                       </template>
-                        ），{{item.addressUrlArrayFilelen}}个文档</td>
+                        ），{{item.addressUrlArrayFilelen}}个文档</td> -->
+                        <td colspan="2" class="col">{{ item.addressUrlArrayImage.length }}张图片（
+                          <template v-if="item.expensesType==2">
+                          <template v-for="(item1,index) in item.aduitInfo">
+                            {{index==0?item.addressUrlArray.length:item1.fileUrls&&index!=0?item1.fileUrls.length:0}} <span v-if="index!=item.aduitInfo.length-1">+</span>
+                          </template>
+                        </template>
+                          ），{{item.addressUrlArrayFilelen}}个文档</td>
                 </tr>
             </tbody>
             <thead v-if="item.expensesType==2">
@@ -531,7 +539,7 @@
                 <td colspan="2" class="col">{{ item.contractGoodsInfo.grade }}</td>
               </tr>
               <tr class="row">
-                <td class="col col-bgc">容量（克/升）>=</td>
+                <td class="col col-bgc">容重（克/升）>=</td>
                 <td colspan="2" class="col">{{ item.contractGoodsInfo.bulkDensity }}</td>
               </tr>
               <tr class="row">
@@ -819,7 +827,71 @@
               </tr>
             </tbody>
           </table>
-          <div  v-if="item.printType==1&&item.addressUrlArrayImage.length>0||item.printType==5&&item.addressUrlArrayImage.length>0||item.printType==6&&item.addressUrlArrayImage.length>0||item.printType==7&&item.addressUrlArrayImage.length>0||item.printType==9&&item.addressUrlArrayImage.length>0" class="sfcard" >
+          <table v-if="item.printType==10" class="table">
+            <thead>
+                <tr class="row">
+                    <th colspan="3" class="col">基本信息</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr class="row">
+                    <td class="col col-bgc">车牌号</td>
+                    <td colspan="2" class="col">{{item.carNo}}</td>
+                </tr>
+                <tr class="row">
+                    <td class="col col-bgc">起点</td>
+                    <td colspan="2" class="col">{{ item.originProvince }}{{ item.originCity }}{{ item.originArea }}{{ item.originAddress }}</td>
+                </tr>
+                <tr class="row">
+                    <td class="col col-bgc">终点</td>
+                    <td colspan="2" class="col">{{ item.destinationProvince }}{{ item.destinationCity }}{{ item.destinationArea }}{{ item.destinationAddress }}</td>
+                </tr>
+                <tr class="row">
+                    <td class="col col-bgc">总油耗(升)</td>
+                    <td  colspan="2" class="col">{{ item.tfc }}</td>
+                </tr>
+                <tr class="row">
+                    <td class="col col-bgc">总金额(元)</td>
+                    <td colspan="2" class="col">{{ item.totalCost }}</td>
+                </tr>
+                <tr class="row" v-for="(item1,index1) in item.fillingDetailInfoList">
+                  <td class="col col-bgc">加油-{{index1+1}}</td>
+                  <td colspan="2" class="col">油耗{{ item.oilConsumption }}升&nbsp;&nbsp;油耗{{ item.currentOilPrice }}元/升&nbsp;&nbsp;油耗{{ item.currentConsumption }}元</td>
+              </tr>
+                <tr class="row">
+                    <td class="col col-bgc">备注</td>
+                    <td style="width:65%;" colspan="2" class="col">{{ item.remark }}</td>
+                </tr>
+                <tr class="row">
+                    <td class="col col-bgc">附件</td>
+                    <!-- <td colspan="2" class="col">{{ item.addressUrlArrayImage.length }}张图片（
+                      <template v-if="item.expensesType==2">
+                        <template v-for="(item1,index) in item.aduitInfo">
+                          {{item1.fileUrls?item1.fileUrls.length:0}} <span v-if="index!=item.aduitInfo.length-1">+</span>
+                        </template>
+                      </template>
+                        ），{{item.addressUrlArrayFilelen}}个文档</td> -->
+                        <td colspan="2" class="col">{{ item.addressUrlArrayImage.length }}张图片（
+                          <template v-for="(item1,index) in item.aduitInfo">
+                            {{index==0?item.addressUrlArray.length:item1.fileUrls&&index!=0?item1.fileUrls.length:0}} <span v-if="index!=item.aduitInfo.length-1">+</span>
+                          </template>
+                          ），{{item.addressUrlArrayFilelen}}个文档</td>
+                </tr>
+            </tbody>
+            <thead>
+                <tr class="row">
+                    <th colspan="3" class="col">审核流</th>
+                </tr>
+            </thead>
+              <tr v-for="(item1,index) in item.aduitInfo" class="row">
+                  <td class="col col-bgc">{{item1.operatorName}}</td>
+                  <td style="width:30%;" class="col">{{ item1.updateDate }}</td>
+                  <td style="text-align:left;padding-left:10px;" v-if="item1.status=='question'" class="col">待审核</td>
+                  <td style="text-align:left;padding-left:10px;" v-if="item1.status=='success'" class="col">{{index!=0?item1.auditMind?'通过：'+item1.auditMind:'通过':item1.desc}}</td>
+                  <td style="text-align:left;padding-left:10px;" v-if="item1.status=='error'" class="col">{{item1.auditMind?'驳回：'+item1.auditMind:'驳回'}}</td>
+              </tr>
+          </table>
+          <div  v-if="item.printType==1&&item.addressUrlArrayImage.length>0||item.printType==5&&item.addressUrlArrayImage.length>0||item.printType==6&&item.addressUrlArrayImage.length>0||item.printType==7&&item.addressUrlArrayImage.length>0||item.printType==9&&item.addressUrlArrayImage.length>0||item.printType==10&&item.addressUrlArrayImage.length>0" class="sfcard" >
             <div v-for="item1 in item.addressUrlArrayImage" class="sfcard-content">
                 <div class="sfcard-title">
                     <!-- {{ printData.customerName}}{{ printData.identityAuthenticationInfo.customerNumberCard}} -->

public/static/inspection.html

@@ -168,10 +168,10 @@
             <td class="col">{{tableData.goodsName}}</td>
             <td class="col col-bgc">类型</td>
             <td class="col">{{tableData.type}}</td>
-            <td class="col col-bgc">容量（克/升）</td>
-            <td class="col">{{tableData.bulkDensity}}</td>
-            <td class="col col-bgc">不完善粒（%）</td>
-            <td class="col">{{tableData.imperfectGrain}}</td>
+            <td class="col col-bgc">{{tableData.goodsName == '大豆'?'蛋白':'容重（克/升）'}}</td>
+            <td class="col">{{ tableData.goodsName == '大豆'?tableData.protein:tableData.bulkDensity}}</td>
+            <td class="col col-bgc">{{tableData.goodsName == '大豆'?'完整粒率（%）':'不完善粒（%）'}}</td>
+            <td class="col">{{ tableData.goodsName == '大豆'?tableData.completeGrain:printData.imperfectGrain }}</td>
           </tr>
           <tr class="row">
             <td class="col col-bgc">等级</td>
@@ -276,12 +276,12 @@
           <div>{{tableData.type}}</div>
         </div>
         <div class="small-row">
-          <div>容量（克/升）：</div>
-          <div>{{tableData.bulkDensity}}</div>
+          <div>{{tableData.goodsName=='大豆'?"蛋白：":"容重（克/升）："}}</div>
+          <div>{{tableData.goodsName=='大豆'?tableData.protein:tableData.bulkDensity}}</div>
         </div>
         <div class="small-row">
-          <div>不完善粒（%）：</div>
-          <div>{{tableData.imperfectGrain}}</div>
+          <div>{{tableData.goodsName=='大豆'?"完整粒率（%）":"不完善粒（%）："}}</div>
+          <div>{{tableData.goodsName=='大豆'?tableData.completeGrain:tableData.imperfectGrain}}</div>
         </div>
         <div class="small-row">
           <div>等级：</div>

public/static/inspectionnew.html

@@ -169,7 +169,7 @@
             <td class="col">{{tableData.goodsName}}</td>
             <td class="col col-bgc">类型</td>
             <td class="col">{{tableData.type}}</td>
-            <td class="col col-bgc">容量（克/升）</td>
+            <td class="col col-bgc">容重（克/升）</td>
             <td class="col">{{tableData.bulkDensity}}</td>
             <td class="col col-bgc">不完善粒（%）</td>
             <td class="col">{{tableData.imperfectGrain}}</td>
@@ -273,7 +273,7 @@
           <div>{{tableData.type}}</div>
         </div>
         <div class="small-row">
-          <div>容量（克/升）：</div>
+          <div>容重（克/升）：</div>
           <div>{{tableData.bulkDensity}}</div>
         </div>
         <div class="small-row">

public/static/outInspectionPrint.html

@@ -162,7 +162,7 @@
             <td class="col">{{tableData.goodsName}}</td>
             <td class="col col-bgc">类型</td>
             <td class="col">{{tableData.type}}</td>
-            <td class="col col-bgc">容量（克/升）</td>
+            <td class="col col-bgc">容重（克/升）</td>
             <td class="col">{{tableData.bulkDensity}}</td>
             <td class="col col-bgc">不完善粒（%）</td>
             <td class="col">{{tableData.imperfectGrain}}</td>
@@ -252,7 +252,7 @@
           <div>{{tableData.type}}</div>
         </div>
         <div class="small-row">
-          <div>容量（克/升）：</div>
+          <div>容重（克/升）：</div>
           <div>{{tableData.bulkDensity}}</div>
         </div>
         <div class="small-row">

public/static/outWeightPrint.html

@@ -160,7 +160,7 @@
                     <td class="col">{{tableData.goodsName}}</td>
                     <td class="col col-bgc">类型</td>
                     <td class="col">{{tableData.type}}</td>
-                    <td class="col col-bgc">容量（克/升）</td>
+                    <td class="col col-bgc">容重（克/升）</td>
                     <td class="col">{{tableData.qualityInspectionManagement ?
                         tableData.qualityInspectionManagement.bulkDensity:""}}</td>
                     <!-- <td class="col col-bgc">不完善粒（%）</td>

public/static/payprint.html

@@ -455,7 +455,7 @@
                   <td class="col">{{printData1[index].weighingManagement.goodsName}}</td>
                   <td class="col col-bgc">类型</td>
                   <td class="col">{{printData1[index].weighingManagement.type}}</td>
-                  <td class="col col-bgc">{{printData1[index].weighingManagement.goodsName!='大豆'?'容量（克/升）':'蛋白'}}</td>
+                  <td class="col col-bgc">{{printData1[index].weighingManagement.goodsName!='大豆'?'容重（克/升）':'蛋白'}}</td>
                   <td class="col">
                     {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.bulkDensity:''}}
                   </td>
@@ -788,7 +788,7 @@
               <td class="col">{{tableData.goodsName}}</td>
               <td class="col col-bgc">类型</td>
               <td class="col">{{tableData.type}}</td>
-              <td class="col col-bgc">{{tableData.goodsName!= '大豆'?'容量（克/升）':'蛋白'}}</td>
+              <td class="col col-bgc">{{tableData.goodsName!= '大豆'?'容重（克/升）':'蛋白'}}</td>
               <td class="col">
                 {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.bulkDensity:''}}
               </td>

public/static/payprint1.html

@@ -320,9 +320,9 @@
                                 <td class="col col-bgc">霉变粒</td>
                                 <td class="col col-bgc">热损伤</td>
                                 <td class="col col-bgc">不完善粒</td>
-                                <td class="col col-bgc">扣重比</td>
+                                <td v-if="printData1[index].type=='潮粮'" class="col col-bgc">扣重比</td>
                                 <td class="col col-bgc">扣量%</td>
-                                <td class="col col-bgc"></td>
+                                <td :colspan="printData1[index].type == '潮粮'?1:2" class="col col-bgc">仓位号</td>
                             </tr>
                             <tr class="row">
                                 <td class="col">{{ printData1[index].pureWeight}}</td>
@@ -346,9 +346,9 @@
                                 <td class="col "> {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.jiaorenli:''}}</td>
                                 <td class="col "> {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.imperfectGrain:''}}</td>
                                 <td class="col ">{{compId=='6a713699e08c4cbc97a87f7648a95e3d'?'1.25':printData1[index].buckleWeightRatio}}</td>
-                                <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d'">{{ (printData1[index].qualityInspectionManagement.waterContent-14.5)*1.25}}</td>
-                                <td class="col " v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'"></td>
-                                <td class="col "></td>
+                                <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d'&&printData1[index].type=='潮粮'">{{ (printData1[index].qualityInspectionManagement.waterContent-14.5)*1.25}}</td>
+                                <td class="col " v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'&&printData1[index].type=='潮粮'"></td>
+                                <td :colspan="printData1[index].type == '潮粮'?1:2" class="col ">{{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.binNumber:''}}</td>
                                 <!-- <td class="col ">{{ printData1[index].unloadDeduction}}</td> -->
                             </tr>
                             <tr class="row">
@@ -370,9 +370,12 @@
                                 <!-- <td class="col " v-if="printData1[index].type == '潮粮'">
                                     {{ printData1[index].solidGrainPrice}}
                                 </td> -->
-                                <td class="col " v-if="pengyuPrint">
+                                <td class="col " v-if="pengyuPrint&&printData1[index].type=='潮粮'">
                                     {{Number(printData1[index].unitContractPrice/1000*printData1[index].pureWeight).toFixed(2)}}
                                 </td>
+                                <td class="col " v-if="pengyuPrint&&printData1[index].type!='潮粮'">
+                                    {{Number(printData1[index].unitContractPrice/1000*printData1[index].weighingManagement.netWeight).toFixed(2)}}
+                                </td>
                                 <td class="col " v-if="!pengyuPrint">
                                     {{printData1[index].calculationPayable}}
                                 </td>
@@ -462,13 +465,13 @@
                                 <td class="col">{{printData1[index].weighingManagement.goodsName}}</td>
                                 <td class="col col-bgc">类型</td>
                                 <td class="col">{{printData1[index].weighingManagement.type}}</td>
-                                <td class="col col-bgc">{{printData1[index].weighingManagement.goodsName != '大豆'?'容量（克/升）':'蛋白'}}</td>
+                                <td class="col col-bgc">{{printData1[index].weighingManagement.goodsName == '大豆'?'蛋白':'容量（克/升）'}}</td>
                                 <td class="col">
-                                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.bulkDensity:''}}
+                                    {{printData1[index].weighingManagement.goodsName == '大豆'?printData1[index].qualityInspectionManagement.protein:printData1[index].qualityInspectionManagement.bulkDensity}}
                                 </td>
-                                <td class="col col-bgc">不完善粒（%）</td>
+                                <td class="col col-bgc">{{printData1[index].weighingManagement.goodsName == '大豆'?'完整粒率（%）':'不完善粒（%）'}}</td>
                                 <td class="col">
-                                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.imperfectGrain:''}}
+                                    {{printData1[index].weighingManagement.goodsName == '大豆'?printData1[index].qualityInspectionManagement.completeGrain:printData1[index].qualityInspectionManagement.imperfectGrain}}
                                 </td>
                             </tr>
                             <tr class="row">
@@ -681,7 +684,7 @@
                         <td class="col">
                             {{ printData.qualityInspectionManagement.impurity}}
                         </td>
-                        <td class="col">{{printData.qualityInspectionManagement?printData.qualityInspectionManagement.bulkDensity:''}}</td>
+                        <td class="col">{{printData.goodsName== '大豆'?printData.qualityInspectionManagement.protein:printData.qualityInspectionManagement.bulkDensity}}</td>
                         <td class="col">{{ printData.grossWeight}}</td>
                         <td class="col">{{ printData.tare}}</td>
                         <td class="col" v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d' 
@@ -705,10 +708,10 @@
                         <td class="col col-bgc">粮款</td>
                         <td class="col col-bgc">霉变粒</td>
                         <td class="col col-bgc">热损伤</td>
-                        <td class="col col-bgc">不完善粒</td>
+                        <td class="col col-bgc">{{printData.goodsName== '大豆'?'完整粒率（%）':"不完善粒"}}</td>
                         <td class="col col-bgc">扣重比</td>
-                        <td class="col col-bgc">扣量%</td>
-                        <td class="col col-bgc"></td>
+                        <td v-if="printData.type == '潮粮'" class="col col-bgc">扣量%</td>
+                        <td :colspan="printData.type == '潮粮'?1:2" class="col col-bgc">仓位号</td>
                         <!-- <td class="col col-bgc">1卸车扣款</td> -->
                     </tr>
                     <tr class="row">
@@ -731,11 +734,11 @@
                         </td>
                         <td class="col "> {{printData.qualityInspectionManagement.mildewGrain}}</td>
                         <td class="col "> {{printData.qualityInspectionManagement.jiaorenli}}</td>
-                        <td class="col "> {{printData.qualityInspectionManagement.imperfectGrain}}</td>
+                        <td class="col "> {{printData.goodsName== '大豆'?printData.qualityInspectionManagement.completeGrain:printData.qualityInspectionManagement.imperfectGrain}}</td>
                         <td class="col ">{{compId=='6a713699e08c4cbc97a87f7648a95e3d'?'1.25':printData.buckleWeightRatio}}</td>
-                        <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d'">{{ (printData.qualityInspectionManagement.waterContent-14.5)*1.25}}</td>
-                        <td class="col " v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'"></td>
-                        <td class="col "></td>
+                        <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d'&&printData.type == '潮粮'">{{ (printData.qualityInspectionManagement.waterContent-14.5)*1.25}}</td>
+                        <td class="col " v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'&&printData.type == '潮粮'"></td>
+                        <td :colspan="printData.type == '潮粮'?1:2" class="col ">{{printData.qualityInspectionManagement.binNumber}}</td>
                         <!-- <td class="col ">{{ printData.unloadDeduction}}</td> -->
                     </tr>
                     <tr class="row">
@@ -757,9 +760,13 @@
                         <!-- <td class="col " v-if="printData.type == '潮粮'">
                             {{ printData.solidGrainPrice}}
                         </td> -->
-                        <td class="col " v-if="pengyuPrint">
+                        <td class="col " v-if="pengyuPrint&&printData.type == '潮粮'">
                             {{Number(printData.unitContractPrice/1000*printData.pureWeight).toFixed(2)}}
                         </td>
+                        <td class="col " v-if="pengyuPrint&&printData.type != '潮粮'">
+                            {{Number(printData.unitContractPrice/1000*printData.weighingManagement.netWeight).toFixed(2)}}
+                        </td>
+                        
                         <td class="col " v-if="!pengyuPrint">
                             {{printData.calculationPayable}}
                         </td>
@@ -868,7 +875,7 @@
                         <td class="col col-bgc">等级</td>
                         <td class="col col-bgc">水分%</td>
                         <td class="col col-bgc">杂质%</td>
-                        <td class="col col-bgc">{{printData.goodsName!= '大豆'?'容重':'蛋白'}}</td>
+                        <td class="col col-bgc">{{printData.goodsName== '大豆'?'蛋白':'容重'}}</td>
                         <td class="col col-bgc">毛重</td>
                         <td class="col col-bgc">皮重</td>
                         <td class="col col-bgc">扣重</td>
@@ -888,7 +895,7 @@
                         <td class="col">
                             {{ printData.qualityInspectionManagement.impurity}}
                         </td>
-                        <td class="col">{{printData.qualityInspectionManagement?printData.qualityInspectionManagement.bulkDensity:''}}</td>
+                        <td class="col">{{printData.goodsName== '大豆'?printData.qualityInspectionManagement.protein:printData.qualityInspectionManagement.bulkDensity}}</td>
                         <td class="col">{{ printData.grossWeight}}</td>
                         <td class="col">{{ printData.tare}}</td>
                         <td class="col" v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d' 
@@ -912,10 +919,10 @@
                         <td class="col col-bgc">粮款</td>
                         <td class="col col-bgc">霉变粒</td>
                         <td class="col col-bgc">热损伤</td>
-                        <td class="col col-bgc">不完善粒</td>
+                        <td class="col col-bgc">{{printData.goodsName== '大豆'?'完整粒率（%）':'不完善粒'}}</td>
                         <td class="col col-bgc">扣重比</td>
-                        <td class="col col-bgc">扣量%</td>
-                        <td class="col col-bgc"></td>
+                        <td v-if="printData.type == '潮粮'" class="col col-bgc">扣量%</td>
+                        <td :colspan="printData.type == '潮粮'?1:2" class="col col-bgc">仓位号</td>
                         <!-- <td class="col col-bgc">1卸车扣款</td> -->
                     </tr>
                     <tr class="row">
@@ -938,11 +945,11 @@
                         </td>
                         <td class="col "> {{printData.qualityInspectionManagement.mildewGrain}}</td>
                         <td class="col "> {{printData.qualityInspectionManagement.jiaorenli}}</td>
-                        <td class="col "> {{printData.qualityInspectionManagement.imperfectGrain}}</td>
+                        <td class="col "> {{printData.goodsName== '大豆'?printData.qualityInspectionManagement.completeGrain:printData.qualityInspectionManagement.imperfectGrain}}</td>
                         <td class="col ">{{compId=='6a713699e08c4cbc97a87f7648a95e3d'?'1.25':printData.buckleWeightRatio}}</td>
-                        <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d'">{{ (printData.qualityInspectionManagement.waterContent-14.5)*1.25}}</td>
-                        <td class="col " v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'"></td>
-                        <td class="col "></td>
+                        <td class="col " v-if="compId=='6a713699e08c4cbc97a87f7648a95e3d'&&printData.type != '潮粮'">{{ (printData.qualityInspectionManagement.waterContent-14.5)*1.25}}</td>
+                        <td class="col " v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d'&&printData.type != '潮粮'"></td>
+                        <td :colspan="printData.type == '潮粮'?1:2" class="col ">{{printData.qualityInspectionManagement.binNumber}}</td>
                         <!-- <td class="col ">{{ printData.unloadDeduction}}</td> -->
                     </tr>
                     <tr class="row">
@@ -964,9 +971,12 @@
                         <!-- <td class="col " v-if="printData.type == '潮粮'">
                             {{ printData.solidGrainPrice}}
                         </td> -->
-                        <td class="col " v-if="pengyuPrint">
+                        <td class="col " v-if="pengyuPrint&&printData.type != '潮粮'">
                             {{Number(printData.unitContractPrice/1000*printData.pureWeight).toFixed(2)}}
                         </td>
+                        <td class="col " v-if="pengyuPrint&&printData.type != '潮粮'">
+                            {{Number(printData.unitContractPrice/1000*printData.weighingManagement.netWeight).toFixed(2)}}
+                        </td>
                         <td class="col " v-if="!pengyuPrint">
                             {{printData.calculationPayable}}
                         </td>
@@ -1050,13 +1060,13 @@
                         <td class="col">{{tableData.goodsName}}</td>
                         <td class="col col-bgc">类型</td>
                         <td class="col">{{tableData.type}}</td>
-                        <td class="col col-bgc">{{tableData.goodsName != '大豆'?'容量（克/升）':'蛋白'}}</td>
+                        <td class="col col-bgc">{{tableData.goodsName == '大豆'?'蛋白':'容量（克/升）'}}</td>
                         <td class="col">
-                            {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.bulkDensity:''}}
+                            {{tableData.goodsName == '大豆'?tableData.qualityInspectionManagement.protein:tableData.qualityInspectionManagement.bulkDensity}}
                         </td>
-                        <td class="col col-bgc">不完善粒（%）</td>
+                        <td class="col col-bgc">{{tableData.goodsName == '大豆'?'完整粒率（%）':'不完善粒（%）'}}</td>
                         <td class="col">
-                            {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.imperfectGrain:''}}
+                            {{tableData.goodsName == '大豆'?tableData.qualityInspectionManagement.completeGrain:tableData.qualityInspectionManagement.imperfectGrain}}
                         </td>
                     </tr>
                     <tr class="row">
@@ -1453,7 +1463,6 @@
                     }
                 }
             } else {
-                debugger
                 this.printData = JSON.parse(_data)
                     //地址过长截取
                 if (this.printData.identityAuthenticationInfo && this.printData.identityAuthenticationInfo.compAddress.length > 24) {
@@ -1479,7 +1488,6 @@
                     localStorage.getItem('selectPrint_selectCustomerList')
                 )
             } else {
-                debugger
                 if (cwprint == 'true') {
                     this.customerList = JSON.parse(localStorage.getItem('printData1'))
                 }

public/static/payprint1A5.html

@@ -444,7 +444,7 @@
                                 <td class="col">{{printData1[index].weighingManagement.goodsName}}</td>
                                 <td class="col col-bgc">类型</td>
                                 <td class="col">{{printData1[index].weighingManagement.type}}</td>
-                                <td class="col col-bgc">{{printData1[index].weighingManagement.goodsName != '大豆'?'容量（克/升）' :'蛋白'}}</td>
+                                <td class="col col-bgc">{{printData1[index].weighingManagement.goodsName != '大豆'?'容重（克/升）' :'蛋白'}}</td>
                                 <td class="col">
                                     {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.bulkDensity:''}}
                                 </td>
@@ -781,7 +781,7 @@
                         <td class="col">{{tableData.goodsName}}</td>
                         <td class="col col-bgc">类型</td>
                         <td class="col">{{tableData.type}}</td>
-                        <td class="col col-bgc">{{tableData.goodsName!= '大豆'?'容量（克/升）':'蛋白'}}</td>
+                        <td class="col col-bgc">{{tableData.goodsName!= '大豆'?'容重（克/升）':'蛋白'}}</td>
                         <td class="col">
                             {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.bulkDensity:''}}
                         </td>

public/static/payprint2.html

@@ -444,7 +444,7 @@
                                 <td class="col">{{printData1[index].weighingManagement.goodsName}}</td>
                                 <td class="col col-bgc">类型</td>
                                 <td class="col">{{printData1[index].weighingManagement.type}}</td>
-                                <td class="col col-bgc">{{printData1[index].weighingManagement.goodsName != '大豆' ? '容量（克/升）' : '蛋白'}}</td>
+                                <td class="col col-bgc">{{printData1[index].weighingManagement.goodsName != '大豆' ? '容重（克/升）' : '蛋白'}}</td>
                                 <td class="col">
                                     {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.bulkDensity:''}}
                                 </td>
@@ -781,7 +781,7 @@
                         <td class="col">{{tableData.goodsName}}</td>
                         <td class="col col-bgc">类型</td>
                         <td class="col">{{tableData.type}}</td>
-                        <td class="col col-bgc">{{tableData.goodsName!= '大豆' ? '容量（克/升）' : '蛋白'}}</td>
+                        <td class="col col-bgc">{{tableData.goodsName!= '大豆' ? '容重（克/升）' : '蛋白'}}</td>
                         <td class="col">
                             {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.bulkDensity:''}}
                         </td>

public/static/payprint3.html

@@ -460,7 +460,7 @@
                                 <td class="col">{{printData1[index].weighingManagement.goodsName}}</td>
                                 <td class="col col-bgc">类型</td>
                                 <td class="col">{{printData1[index].weighingManagement.type}}</td>
-                                <td class="col col-bgc">{{printData1[index].weighingManagement.goodsName != '大豆'?'容量（克/升）':'蛋白'}}</td>
+                                <td class="col col-bgc">{{printData1[index].weighingManagement.goodsName != '大豆'?'容重（克/升）':'蛋白'}}</td>
                                 <td class="col">
                                     {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.bulkDensity:''}}
                                 </td>
@@ -830,7 +830,7 @@
                         <td class="col">{{tableData.goodsName}}</td>
                         <td class="col col-bgc">类型</td>
                         <td class="col">{{tableData.type}}</td>
-                        <td class="col col-bgc">{{tableData.goodsName != '大豆'?'容量（克/升）':'蛋白'}}</td>
+                        <td class="col col-bgc">{{tableData.goodsName != '大豆'?'容重（克/升）':'蛋白'}}</td>
                         <td class="col">
                             {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.bulkDensity:''}}
                         </td>

public/static/printdry.html

@@ -164,7 +164,7 @@
                   </tr>
                   <tr class="row">
                       <td colspan="3" class="col col-bgc">收货仓库</td>
-                      <td class="col" colspan="5" v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'">{{print_company_name}}</td>
+                      <td class="col" colspan="5" v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'&&print_company_name!='黑龙江稷硕粮食购销有限公司'">{{print_company_name}}</td>
                       <td class="col" colspan="5" v-else>北京天维康油脂调销中心有限公司</td>
                   </tr>
                   <tr class="row">
@@ -173,13 +173,16 @@
                       <td class="col col-bgc">类型</td>
                       <td class="col">干粮</td>
                       <td class="col col-bgc">{{printData.goodsName != '大豆' ? '容重（克/升）' : '蛋白'}}</td>
-                      <td v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'" class="col">
+                      <td v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'&&print_company_name!='黑龙江稷硕粮食购销有限公司'" class="col">
                       </td>
-                      <td v-else class="col">
+                      <td v-else-if="print_company_name=='白城市鹏羽粮食贸易有限公司'" class="col">
                         685
                       </td>
+                      <td v-else-if="print_company_name=='黑龙江稷硕粮食购销有限公司'" class="col">
+                        676
+                      </td>
                       <td class="col col-bgc">不完善粒（%）</td>
-                      <td v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'" class="col">   
+                      <td v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'&&print_company_name!='黑龙江稷硕粮食购销有限公司'" class="col">   
                       </td>
                       <td v-else class="col">
                         6
@@ -187,13 +190,13 @@
                   </tr>
                   <tr class="row">
                       <td class="col col-bgc">等级</td>
-                      <td v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'" class="col"></td>
+                      <td v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'&&print_company_name!='黑龙江稷硕粮食购销有限公司'" class="col"></td>
                       <td v-else class="col">三等</td>
                       <td class="col col-bgc">水分（%）</td>
-                      <td v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'" class="col"></td>
+                      <td v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'&&print_company_name!='黑龙江稷硕粮食购销有限公司'" class="col"></td>
                       <td v-else class="col">14.5</td>
                       <td class="col col-bgc">热损伤（%）</td>
-                      <td v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'" class="col"></td>
+                      <td v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'&&print_company_name!='黑龙江稷硕粮食购销有限公司'" class="col"></td>
                       <td v-else class="col">0</td>
                       <td class="col col-bgc">检斤时间</td>
                       <td class="col">
@@ -202,17 +205,18 @@
                   </tr>
                   <tr class="row">
                       <td class="col col-bgc">杂质（%）</td>
-                      <td v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'" class="col"></td>
+                      <td v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'&&print_company_name!='黑龙江稷硕粮食购销有限公司'" class="col"></td>
                       <td v-else class="col">1</td>
                       <td class="col col-bgc">霉变粒（%）</td>
-                      <td v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'" class="col"></td>
+                      <td v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'&&print_company_name!='黑龙江稷硕粮食购销有限公司'" class="col"></td>
                       <td v-else class="col">1</td>
                       <td class="col col-bgc">扣杂</td>
-                      <td v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'" class="col"></td>
+                      <td v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'&&print_company_name!='黑龙江稷硕粮食购销有限公司'" class="col"></td>
                       <td v-else class="col">0</td>
                       <td class="col col-bgc">仓位号</td>
-                      <td v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'" class="col"></td>
-                      <td v-else class="col">5</td>
+                      <td v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'&&print_company_name!='黑龙江稷硕粮食购销有限公司'" class="col">{{printData.binNumber}}</td>
+                      <td v-else-if="print_company_name=='白城市鹏羽粮食贸易有限公司'" class="col">{{printData.binNumber}}</td>
+                      <td v-else-if="print_company_name=='黑龙江稷硕粮食购销有限公司'" class="col">{{printData.binNumber}}</td>
                   </tr>
                   <tr class="row">
                       <td class="col col-bgc">毛重（公斤）</td>
@@ -311,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>

public/static/weightCheck.html

@@ -167,7 +167,7 @@
                             <td class="col" colspan="2">{{item.carNumber}}</td>
                         </tr>
                         <tr class="row">
-                            <td class="col col-bgc">收货单位</td>
+                            <td  class="col col-bgc">收货单位</td>
                             <td class="col" colspan="2">{{item.compName}}</td>
                             <td class="col col-bgc">联系人</td>
                             <td class="col">{{item.person}}</td>
@@ -179,13 +179,13 @@
                             <td class="col">{{item.goodsName}}</td>
                             <td class="col col-bgc">类型</td>
                             <td class="col">{{item.type}}</td>
-                            <td class="col col-bgc">{{item.goodsName != '大豆' ? '容量（克/升）' : '蛋白'}}</td>
+                            <td class="col col-bgc">{{item.goodsName == '大豆' ? '蛋白' : '容重（克/升）'}}</td>
                             <td class="col">
-                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.bulkDensity:''}}
+                                {{item.goodsName=='大豆'?item.qualityInspectionManagement.protein:item.qualityInspectionManagement.bulkDensity}}
                             </td>
-                            <td class="col col-bgc">不完善粒（%）</td>
+                            <td class="col col-bgc">{{item.goodsName == '大豆' ? '完善粒率（%）' : '不完善粒（%）'}}</td>
                             <td class="col">
-                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.imperfectGrain:''}}
+                                {{item.goodsName == '大豆'?item.qualityInspectionManagement.completeGrain:item.qualityInspectionManagement.imperfectGrain}}
                             </td>
                         </tr>
                         <tr class="row">
@@ -217,7 +217,7 @@
                                 {{item.qualityInspectionManagement?item.qualityInspectionManagement.buckleMiscellaneous:''}}
                             </td>
                             <td class="col col-bgc">仓位号</td>
-                            <td class="col">{{_item.binNumber.indexOf("托盘") != -1?_item.binNumber.replace("托盘",""):_item.binNumber}}</td>
+                            <td class="col">{{item.binNumber.indexOf("托盘") != -1?item.binNumber.replace("托盘",""):item.binNumber}}</td>
                         </tr>
                         <tr class="row">
                             <td class="col col-bgc">毛重（公斤）</td>
@@ -294,13 +294,13 @@
                             <td class="col">{{item.goodsName}}</td>
                             <td class="col col-bgc">类型</td>
                             <td class="col">{{item.type}}</td>
-                            <td class="col col-bgc">{{item.goodsName != '大豆' ? '容量（克/升）' : '蛋白'}}</td>
+                            <td class="col col-bgc">{{item.goodsName == '大豆' ? '蛋白' : '容重（克/升）'}}</td>
                             <td class="col">
-                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.bulkDensity:''}}
+                                {{item.goodsName=='大豆'?item.qualityInspectionManagement.protein:item.qualityInspectionManagement.bulkDensity}}
                             </td>
-                            <td class="col col-bgc">不完善粒（%）</td>
+                            <td class="col col-bgc">{{item.goodsName == '大豆' ? '完善粒率（%）' : '不完善粒（%）'}}</td>
                             <td class="col">
-                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.imperfectGrain:''}}
+                                {{item.goodsName == '大豆'?item.qualityInspectionManagement.completeGrain:item.qualityInspectionManagement.imperfectGrain}}
                             </td>
                         </tr>
                         <tr class="row">
@@ -332,7 +332,7 @@
                                 {{item.qualityInspectionManagement?item.qualityInspectionManagement.buckleMiscellaneous:''}}
                             </td>
                             <td class="col col-bgc">仓位号</td>
-                            <td class="col">{{_item.binNumber.indexOf("托盘") != -1?_item.binNumber.replace("托盘",""):_item.binNumber}}</td>
+                            <td class="col">{{item.binNumber.indexOf("托盘") != -1?item.binNumber.replace("托盘",""):item.binNumber}}</td>
                         </tr>
                         <tr class="row">
                             <td class="col col-bgc">毛重（公斤）</td>
@@ -343,7 +343,7 @@
                             <td class="col">{{item.buckleMiscellaneous}}</td>
                             <td class="col col-bgc">净重（公斤）</td>
                             <td class="col">{{item.netWeight}}</td>
-                            <!-- <td class="col " colspan="2"></td> -->
+                            <!-- <td class="col " colspan="2"></td> --> 
 
                         </tr>
                         <tr class="row">
@@ -377,12 +377,13 @@
             <div class="content" v-if="bigContent" v-for="(_item,index) in tableData">
                 <!-- //单个打印 -->
                 <!-- <div class="title">{{_item.compName}}</div> -->
-                <div class="title">入库检斤单</div>
+                <div v-if="!_item.printtype" class="title">入库检斤单</div>
+                <div v-if="_item.printtype" class="title">出库检斤单</div>
                 <div class="left">
                     <img :src="_item.codeUrl" alt="">
                 </div>
-                <div class="number">{{_item.number}}</div>
-                <table class="table">
+                <div v-if="!_item.printtype" class="number">{{_item.number}}</div>
+                <table :style="!_item.printtype?'margin-top:20px;':'margin-top:80px;'" class="table">
                     <tr class="row">
                         <td class="col col-bgc" v-if="_item.serviceManagementType == 3">客户姓名</td>
                         <td class="col" colspan="2" v-if="_item.serviceManagementType == 3">{{_item.customer}}</td>
@@ -397,8 +398,11 @@
                         <td class="col" colspan="2">{{_item.carNumber}}</td>
                     </tr>
                     <tr class="row">
-                        <td class="col col-bgc">收货单位</td>
-                        <td class="col" colspan="2">{{_item.compName}}</td>
+                        <!-- <td class="col col-bgc">收货单位</td>
+                        <td class="col" colspan="2">{{_item.compName}}</td> -->
+                        <td v-if='_item.customer!="白城市鹏羽粮食贸易有限公司"' class="col col-bgc">收货单位</td>
+                        <td v-else class="col col-bgc">收货仓库</td>
+                        <td class="col" colspan="2">{{_item.customer!="白城市鹏羽粮食贸易有限公司"?_item.compName:'北京天维康油脂调销中心有限公司'}}</td>
                         <td class="col col-bgc">联系人</td>
                         <td class="col">{{_item.person}}</td>
                         <td class="col col-bgc">联系电话</td>
@@ -409,14 +413,14 @@
                         <td class="col">{{_item.goodsName}}</td>
                         <td class="col col-bgc">类型</td>
                         <td class="col">{{_item.type}}</td>
-                        <td class="col col-bgc">{{_item.goodsName != '大豆' ? '容量（克/升）' :'蛋白'}}</td>
-                        <td class="col">
-                            {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.bulkDensity:''}}
-                        </td>
-                        <td class="col col-bgc">不完善粒（%）</td>
-                        <td class="col">
-                            {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.imperfectGrain:''}}
-                        </td>
+                        <td class="col col-bgc">{{_item.goodsName == '大豆' ? '蛋白' : '容重（克/升）'}}</td>
+                            <td class="col">
+                                {{_item.goodsName=='大豆'?_item.qualityInspectionManagement.protein:_item.qualityInspectionManagement.bulkDensity}}
+                            </td>
+                            <td class="col col-bgc">{{_item.goodsName == '大豆' ? '完善粒率（%）' : '不完善粒（%）'}}</td>
+                            <td class="col">
+                                {{_item.goodsName == '大豆'?_item.qualityInspectionManagement.completeGrain:_item.qualityInspectionManagement.imperfectGrain}}
+                            </td>
                     </tr>
                     <tr class="row">
                         <td class="col col-bgc">等级</td>
@@ -626,7 +630,7 @@
                 } else {
                     that.serverIp = localStorage.getItem("serverIp")
                 }
-                if (that.tableData.length == 1) {//this.tableData  条数为1 认为单个打印
+                if (that.tableData&&that.tableData.length == 1) {//this.tableData  条数为1 认为单个打印
                     html2canvas(document.querySelector("#saveImg"), { foreignObjectRendering: true, allowTaint: true }).then((canvas) => {
                         let dataURL = canvas.toDataURL('image/png')
                         that.imgUrl = dataURL
@@ -689,8 +693,8 @@
         },
         mounted() {
             let _data = {}
-            if (decodeURIComponent(localStorage.getItem('print_in_data'))) {
-                _data = decodeURIComponent(localStorage.getItem('print_in_data'))
+            if (localStorage.getItem('print_in_data')) {
+                _data = localStorage.getItem('print_in_data')
             }
             else {
                 _data = decodeURIComponent(this.getQueryVariable("tableData"))
@@ -708,6 +712,7 @@
                 this.bigContent = false
             }
             if (_data == 'false') {
+                console.log(222222)
                 this.selectPrint = true;
                 this.tableData1 = JSON.parse(localStorage.getItem('selectPrint_jjSelectPrintList'))
                 if (_ew == 'true') {

public/static/weightCheckOutNew.html

@@ -182,7 +182,7 @@
                             <td class="col">{{item.goodsName}}</td>
                             <td class="col col-bgc">类型</td>
                             <td class="col">{{item.type}}</td>
-                            <td class="col col-bgc">容量（克/升）</td>
+                            <td class="col col-bgc">容重（克/升）</td>
                             <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.bulkDensity:''}}
                             </td>
                             <td class="col col-bgc">不完善粒（%）</td>
@@ -310,7 +310,7 @@
                             <td class="col">{{item.goodsName}}</td>
                             <td class="col col-bgc">类型</td>
                             <td class="col">{{item.type}}</td>
-                            <td class="col col-bgc">容量（克/升）</td>
+                            <td class="col col-bgc">容重（克/升）</td>
                             <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.bulkDensity:''}}
                             </td>
                             <td class="col col-bgc">不完善粒（%）</td>
@@ -437,7 +437,7 @@
                         <td class="col">{{_item.goodsName}}</td> 
                         <td class="col col-bgc">类型</td>
                         <td class="col">{{_item.type}}</td>
-                        <td class="col col-bgc">容量（克/升）</td>
+                        <td class="col col-bgc">容重（克/升）</td>
                         <td class="col">
                             {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.bulkDensity:''}}</td>
                         <td class="col col-bgc">不完善粒（%）</td>

public/static/weightChecknew.html

@@ -169,7 +169,7 @@
                 <td class="col">{{item.goodsName}}</td>
                 <td class="col col-bgc">类型</td>
                 <td class="col">{{item.type}}</td>
-                <td class="col col-bgc">容量（克/升）</td>
+                <td class="col col-bgc">容重（克/升）</td>
                 <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.bulkDensity:''}}</td>
                 <td class="col col-bgc">不完善粒（%）</td>
                 <td class="col">{{item.qualityInspectionManagement?item.qualityInspectionManagement.imperfectGrain:''}}</td>
@@ -265,7 +265,7 @@
               <td class="col">{{tableData.goodsName}}</td>
               <td class="col col-bgc">类型</td>
               <td class="col">{{tableData.type}}</td>
-              <td class="col col-bgc">容量（克/升）</td>
+              <td class="col col-bgc">容重（克/升）</td>
               <td class="col">{{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.bulkDensity:''}}</td>
               <td class="col col-bgc">不完善粒（%）</td>
               <td class="col">{{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.imperfectGrain:''}}</td>

src/api/V2/houseSelfCollect/index.js

@@ -135,6 +135,8 @@ export const API_POST_CUSTOMER = `/weighingManagement/api/changeCustomer`
 export const API_POST_DANDONG_ORDER = `/paymentManagement/api/generateOrder`
     // 检查客户送粮量
 export const API_GETQUALITY = '/qualityInspectionManagement/getQualityInspectionManagementMap'
+// 查询仓库接口新
+export const API_GET_WAREHOUSE = '/warehouseBaseInfo/selectWarehouseSelfNew'
 
 export const API_POST_GETOKEN = `/photoFrameController/api/getToken`
 export const API_POST_GEROM = `/photoFrameController/api/getRom`

src/api/V2/profitable/index.js

@@ -112,3 +112,7 @@ export const API_POST_EXPORTFILE = '/expenseInfo/exportPc'
 export const API_GET_CONSTNO = '/expenseInfo/costNoList'
 // 导入
 export const API_IMPORT_FIXED ='/fixedAssetsInfo/api/importFixedAssets'
+//煤款列表
+export const API_GET_COALPARAGRAPH = '/coalPaymentInfo/selectCoalInfo'
+//煤款记录
+export const API_GET_COALPARAGRAPH_RECORD = '/expenseInfo/selectRequestRecordInfo'

src/api/V2/universalityAudit/index.js

@@ -27,4 +27,6 @@ export const API_PRINT_GETFILE ='/appendix/query/getFileList'
 // 审核流打印入库单获取
 export const API_PRINT_DATA ='/warehousingOrder/exportPhoneDataHis'
 // 审核流打印出入库任务
-export const API_GET_PRINT_DATA ='/inOutWarehouseTask/getTask'
+export const API_GET_PRINT_DATA ='/inOutWarehouseTask/getTask'
+// 审核流打印加油
+export const API_GET_PRINT_FILLING_DATA ='/fuelFillingInfo/getFilling'

src/api/V2/warehouse/index.js

@@ -157,3 +157,19 @@ export const API_SPONSOR_WITHDRAW ='/newWorkflow/api/stopInstance'
 export const API_EXPORT_ORDER ='/warehousingOrder/exportWarehousingOrder'
 // 烘干入库获取
 export const API_GET_DRYLIST='/dryWarehouse/getInfo'
+// 计算折干后重量
+export const API_GET_DRYWEIGHT='/warehousingOrder/dryWeight'
+// 货权转出
+export const API_SET_ROLLOUT='/cargoTitleDetails/api/addInfo'
+// 修改货权赎回状态
+export const API_EDIT_ROLLOUT='/cargoTitleDetails/api/editStatus'
+// 待赎回
+export const API_REDEEMEDINFO='/contractManagementInfo/toBeRedeemedInfo'
+// 货权明细
+export const API_GETROLL='/cargoTitleDetails/selectInfo'
+// 客户操作记录
+export const API_GET_CUSACTIONINFO='/cargoTitleDetails/selectCusActionInfo'
+// 客户操作记录-拒收
+export const API_GET_CUSACTIONINFO_REJECT='/cargoTitleDetails/api/rejection'
+// 货权转入
+export const API_SET_ROLLIN='/cargoTitleDetails/api/toChangeInto'

src/components/WsUpload/index.vue

@@ -29,6 +29,15 @@
         格式的文件，单个文件大小不能超过10M
       </div>
     </div>
+    <div>
+      <el-button
+       v-if="batchDown"
+        class="batchdown-btn"
+        size="small"
+        type="default"
+        @click="_handleDownClick"
+        >批量下载</el-button>
+    </div>
     <el-upload
       action="#"
       list-type="picture-card"
@@ -44,7 +53,7 @@
       </template>
       <template v-slot:file="{ file }">
         <div class="thumbnail-group">
-          <el-image  v-if='getFileClass(file)=="ext png"||getFileClass(file)=="ext jpg"||getFileClass(file)=="ext jpeg"||getFileClass(file)=="ext JPG"'
+          <el-image  v-if='getFileClass(file)=="ext png"||getFileClass(file)=="ext jpg"||getFileClass(file)=="ext jpeg"||getFileClass(file)=="ext JPG"||getFileClass(file)=="ext PNG"'
           :src='file.url'
   class="el-upload-list__item-thumbnail"
             :class="getFileClass(file)"
@@ -123,6 +132,8 @@ import downloadNow from '../WsDownload/download'
 import { EventBus } from 'base-core-lib'
 import pdf from '@/components/pdf/pdf'
 import { mapActions } from 'vuex'
+import JSZip from 'jszip';
+import FileSaver from 'file-saver';
 export default {
   name: 'WsUpload',
   components: {
@@ -191,6 +202,11 @@ export default {
       type: String,
       required: false,
     },
+    batchDown: {
+      // 要保存的表的名字
+      type: String,
+      required: false,
+    },
     onlineEdit: false,
     disabled: false,
     buttonName: {
@@ -316,7 +332,55 @@ export default {
         }
       }
     },
-
+    _handleDownClick(){
+      console.log(this.fileList,111)
+      var arr=[]
+      for (let i = 0; i < this.fileList.length; i++) {
+        arr.push(this.fileList[i].url+'?s=' + Math.random().toString())
+      }
+      let urls = arr
+          let promises = [];
+          urls.map((item) => {
+            promises.push(this.getBase64Image(item));
+          });
+
+          Promise.all(promises)
+            .then((result) => {
+              let zip = new JSZip();// 创建压缩包
+              let img = zip.folder("image"); // 创建文件夹
+              let number = 0;
+              result.map((p) => {
+                let i = number++;
+                img.file(`${i}.png`, p, {
+                  base64: true,
+                });
+              });
+              zip.generateAsync({ type: "blob" }).then(function (content) {
+                // see FileSaver.js
+                FileSaver.saveAs(content, "image.zip");
+              });
+            })
+            .catch((err) => {});
+    },
+    getBase64Image(src) {
+      return new Promise(function (resolve, reject) {
+        var canvas = document.createElement("canvas"),
+          ctx = canvas.getContext("2d"),
+          img = new Image();
+        img.crossOrigin = "Access-Control-Allow-Origin";
+        img.onload = function () {
+          canvas.height = img.height;
+          canvas.width = img.width;
+          ctx.drawImage(img, 0, 0);
+          var dataURL = canvas.toDataURL("image/png");
+          let deleDataHeader = dataURL.split(",")[1];
+          resolve(deleDataHeader);
+          canvas = null;
+        };
+        //这个很重要
+        img.src =src;
+      });
+    },
     // 处理上传按钮点击
     _handleUploadClick() {
       this.$refs.triggerDiv.click()
@@ -793,4 +857,7 @@ $ctrl-margin-left: 10px;
 .operate-bg:hover {
   opacity: 0;
 }
+.batchdown-btn{
+  margin-bottom:10px;
+}
 </style>

src/lang/zh.js

@@ -675,9 +675,14 @@ export default {
     purchasDetail: '采购详情',
     billDetail: '备件结算详情',
     warehousingOrder: '入库单',
+    awaitrAnsom:'入库单  /  待赎回',
+    customerrecord:'客户操作记录',
+    goodsrollIn:'货权转入',
+    gooddetail:'货权明细',
     storageCharge:'仓储费',
     earnestmoney:'保证金',
     oilcost:'油费',
+    coalCost:'煤费',
     inventoryCheck:'库存盘点',
     sparepartMa: '物料采购',
     applDetailMa: '物料申请详情',

src/layout/index/index.vue

@@ -22,6 +22,7 @@
           </keep-alive>
           <router-view class="winseaview-view" v-if="!$route.meta.keepAlive" />
         </BaseContainer>
+
       </div>
     </div>
     <div class="winseaview-shade" @click="showCollapse"></div>
@@ -125,3 +126,10 @@
     }
   };
 </script>
+<style>
+.bottom{
+  text-align:center;
+  margin-top:10px;
+}
+
+</style>

src/layout/index/top/index.vue

@@ -608,7 +608,7 @@
       async getQRCodeData(tmp) {
         await getQRCodeData(tmp)
           .toPromise()
-          .then((response) => { debugger
+          .then((response) => {
             this.toPageData = response
             // 处理按钮显示状态
             // this.btnStatus 

src/layout/index/top/top-setting.vue

@@ -122,7 +122,7 @@ export default {
       }])
     },
     clear(){
-       clearCache({
+       clearCache({compId:localStorage.getItem('ws-pf_compId')
         }).toPromise().then(res => {
           this.$message.success('缓存清理成功')
         })

src/model/houseSelfCollect/index.js

@@ -61,14 +61,15 @@ import {
     API_POST_SUBMIT,
     API_POST_CHANE_NO,
     API_POST_TASK_NO,
+    API_POST_CUSTOMER,
     API_POST_DANDONG_ORDER,
     API_POST_DELETE,
     API_GET_CONTRACT,
     API_SPONSOR_WITHDRAW,
     API_GET_BASEID,
+    API_GET_WAREHOUSE,
     API_POST_GETVIDEO,
     API_POST_GETCARNUMBER,
-    API_POST_CUSTOMER,
     API_POST_GETOKEN,
     API_POST_GEROM
 } from '@/api/V2/houseSelfCollect'
@@ -208,7 +209,8 @@ export const getVideo = appRx.post(API_POST_GETVIDEO, errorCatcher, errorHandle,
 export const getCarNumber = appRx.post(API_POST_GETCARNUMBER, errorCatcher, errorHandle, filter)
     // 换客户
 export const changeCustomer = appRx.post(API_POST_CUSTOMER, errorCatcher, errorHandle, filter)
+    // 查询仓库新
+export const getwarehouse = appRx.get(API_GET_WAREHOUSE, errorCatcher, errorHandle, filter)
 
-// 获取token
 export const getToken = appRx.post(API_POST_GETOKEN, errorCatcher, errorHandle, filter)
 export const getRom = appRx.post(API_POST_GEROM, errorCatcher, errorHandle, filter)

src/model/profitable/index.js

@@ -56,7 +56,9 @@ import {
   API_POST_EXPORTFILE,
   API_GET_CONSTNO,
   API_IMPORT_FIXED,
-  API_POST_UPLOADIMAGE
+  API_POST_UPLOADIMAGE,
+  API_GET_COALPARAGRAPH,
+  API_GET_COALPARAGRAPH_RECORD
 } from '@/api/V2/profitable'
 //收支明细列表
 export const getInOutDetailed = appRx.get(API_GET_INOUTDETAILED, errorCatcher, errorHandle, filter)
@@ -167,7 +169,11 @@ export const batchDelFixedInfo = appRx.post(API_BATCH_DEL_FIXEDINFO, errorCatche
 export const getwarehousingorderList = appRx.get(API_GET_WAREHOUSINGORDER_LIST,errorCatcher, errorHandle, filter)
 // 导出费用明细信息
 export const exportFile = appRx.post(API_POST_EXPORTFILE)
-  //费用编号
-  export const getcostNo = appRx.get(API_GET_CONSTNO,errorCatcher, errorHandle, filter)
-	// 导入
-  export const importFixed = appRx.post(API_IMPORT_FIXED, errorCatcher, errorHandle, filter)
+//费用编号
+export const getcostNo = appRx.get(API_GET_CONSTNO,errorCatcher, errorHandle, filter)
+// 导入
+export const importFixed = appRx.post(API_IMPORT_FIXED, errorCatcher, errorHandle, filter)
+// 煤款列表
+export const coalPayment = appRx.get(API_GET_COALPARAGRAPH, errorCatcher, errorHandle, filter)
+// 煤款记录
+export const coalPaymentRecord = appRx.get(API_GET_COALPARAGRAPH_RECORD, errorCatcher, errorHandle, filter)

src/model/universalityAudit/index.js

@@ -16,7 +16,8 @@ import {
     API_PRINT_GETHIS,
     API_PRINT_GETFILE,
     API_PRINT_DATA,
-    API_GET_PRINT_DATA
+    API_GET_PRINT_DATA,
+    API_GET_PRINT_FILLING_DATA
 } from '@/api/V2/universalityAudit'
 // 查看
 export const getaduitinfo = appRx.get(API_GET_AUDITINFO, errorCatcher, errorHandle, filter)
@@ -47,4 +48,6 @@ export const printgetfile = appRx.get(API_PRINT_GETFILE, errorCatcher, errorHand
 // 审核流打印入库单
 export const printgetdata = appRx.post(API_PRINT_DATA, errorCatcher, errorHandle, filter)
 // 审核流打印出入库任务
-export const printgetout = appRx.get(API_GET_PRINT_DATA, errorCatcher, errorHandle, filter)
+export const printgetout = appRx.get(API_GET_PRINT_DATA, errorCatcher, errorHandle, filter)
+// 审核流打印出入库任务
+export const printfilling = appRx.get(API_GET_PRINT_FILLING_DATA, errorCatcher, errorHandle, filter)

src/model/warehouse/index.js

@@ -76,7 +76,15 @@ import {
      API_GET_BINTYPE,
     API_SPONSOR_WITHDRAW,
     API_EXPORT_ORDER,
-    API_GET_DRYLIST
+    API_GET_DRYLIST,
+    API_GET_DRYWEIGHT,
+    API_SET_ROLLOUT,
+    API_EDIT_ROLLOUT,
+    API_REDEEMEDINFO,
+    API_GETROLL,
+    API_GET_CUSACTIONINFO,
+    API_GET_CUSACTIONINFO_REJECT,
+    API_SET_ROLLIN
     // API_GET_EXPENSEINFO
 } from '@/api/V2/warehouse'
 // import { app } from 'electron'
@@ -235,3 +243,19 @@ export const sponsorWithdraw = appRx.post(API_SPONSOR_WITHDRAW, errorCatcher, er
 export const exportOrder = appRx.post(API_EXPORT_ORDER)
 // 烘干记录获取
 export const getdrylist = appRx.get(API_GET_DRYLIST, errorCatcher, errorHandle, filter)
+// 计算折干后重量
+export const getdryweight = appRx.post(API_GET_DRYWEIGHT, errorCatcher, errorHandle, filter)
+// 货权转出
+export const setrollout = appRx.post(API_SET_ROLLOUT, errorCatcher, errorHandle, filter)
+// 修改货权赎回状态
+export const editrollout = appRx.post(API_EDIT_ROLLOUT, errorCatcher, errorHandle, filter)
+// 待赎回
+export const getredeemedinfo = appRx.get(API_REDEEMEDINFO, errorCatcher, errorHandle, filter)
+// 货权明细
+export const getroll = appRx.get(API_GETROLL, errorCatcher, errorHandle, filter)
+// 客户操作记录
+export const getcusationinfo = appRx.get(API_GET_CUSACTIONINFO, errorCatcher, errorHandle, filter)
+// 客户操作记录-拒收
+export const rejectcusationinfo = appRx.post(API_GET_CUSACTIONINFO_REJECT, errorCatcher, errorHandle, filter)
+// 货源转入
+export const setrollin = appRx.post(API_SET_ROLLIN, errorCatcher, errorHandle, filter)

src/utils/request.js

@@ -94,6 +94,7 @@ service.interceptors.response.use(
         if (!msg || msg.indexOf('network.') >= 0) {
           msg = lang.t('network.timeout');
         }
+        var errormsg=msg.message?msg.message:msg
         EventBus.$emit('error', msg)
       }
     } else if (error.request) {

src/views/contractManagement/component/paymentPrint.vue

@@ -47,7 +47,7 @@
         <td class="col col-bgc">等级</td>
         <td class="col col-bgc">水分%</td>
         <td class="col col-bgc">杂质%</td>
-        <td class="col col-bgc">容重（克/升）</td>
+        <td class="col col-bgc">{{printData.goodsName == '大豆'?'蛋白':'容重（克/升）'}}</td>
         <td class="col col-bgc">毛重</td>
         <td class="col col-bgc">皮重</td>
         <td class="col col-bgc">扣杂重</td>
@@ -60,7 +60,7 @@
         <td class="col">{{ printData.qualityInspectionManagement.grade}}</td>
         <td class="col">{{ printData.qualityInspectionManagement.waterContent}}</td>
         <td class="col">{{ printData.qualityInspectionManagement.impurity}}</td>
-        <td class="col">{{ printData.qualityInspectionManagement.bulkDensity}}</td>
+        <td class="col">{{ printData.goodsName == '大豆'?printData.qualityInspectionManagement.protein:printData.qualityInspectionManagement.bulkDensity}}</td>
         <td class="col">{{ printData.grossWeight}}</td>
         <td class="col">{{ printData.tare}}</td>
         <td class="col">{{ printData.weighingManagement.buckleMiscellaneous}}</td>

src/views/contractManagement/purchaseContract.vue

@@ -617,9 +617,15 @@ export default {
           if (e == '发运结束') {
             data = { id: row.id, endFlag: 1 }
           } else if (e == '已完成') {
-            var response=await getsettlementprice({ contractNo: row.contractNo }).toPromise()
-            data = { id: row.id, settlementPrice: response}
-            text = `合同单价${response}元/吨，确定合同已完成?`
+            var response=await getsettlementprice({ contractNo: row.contractNo }).toPromise().catch(()=>{
+              row.status = row.currectstatus
+              return
+            })
+            if(row.status=='执行中'){
+              return
+            }
+              data = { id: row.id, settlementPrice: response}
+              text = `合同单价${response}元/吨，确定合同已完成?`   
           } else {
             data = { id: row.id }
           }

src/views/contractManagement/purchaseContractAdd.vue

@@ -628,6 +628,7 @@ import { isUndefined } from 'xe-utils/methods'
         }
       },
       copySelect(e){
+
         for (let i = 0; i < this.outContractNo.length; i++) {
           if(this.outContractNo[i].contractNo==e){
             examineList({
@@ -675,6 +676,8 @@ import { isUndefined } from 'xe-utils/methods'
       },
       selectpriceType(e) {
         if (e == '随行就市') {
+          this.deptBudgetList.unitContractPrice=''
+          this.deptBudgetList.totalContractPrice=''
           // this.deptBudgetList.deliverType = '1'
         }
       },
@@ -845,7 +848,7 @@ import { isUndefined } from 'xe-utils/methods'
         this.deptBudgetList.finalTradingVolume = e
       },
       pricechange(e) {
-        this.deptBudgetList.totalContractPrice = e * this.deptBudgetList.weight
+        this.deptBudgetList.totalContractPrice = (e * this.deptBudgetList.weight).toFixed(2)
       },
       returnsales() {
         this.deptBudgetList =  {

src/views/contractManagement/salesContractAdd.vue

@@ -688,14 +688,14 @@
           this.deptBudgetList.sourceProvince = data[0]
           this.deptBudgetList.sourceCity = data[1]
           this.deptBudgetList.sourceArea = data[2]
-          this.deptBudgetList.sourceGoods = data[3]
+          // this.deptBudgetList.sourceGoods = data[3]
           this.deptBudgetList.sourceLocation=data[5].lat+','+data[5].lng
         } else {
           this.newSelectedOptions1 = data[0] + '/' + data[1] + '/' + data[2]
           this.deptBudgetList.deliveryProvince = data[0]
           this.deptBudgetList.deliveryCity = data[1]
           this.deptBudgetList.deliveryArea = data[2]
-          this.deptBudgetList.placeDelivery = data[3]
+          // this.deptBudgetList.placeDelivery = data[3]
           this.deptBudgetList.deliveryLocation=data[5].lat+','+data[5].lng
         }
       },
@@ -1702,7 +1702,7 @@
         this.deptBudgetList.finalTradingVolume = e
       },
       pricechange(e) {
-        this.deptBudgetList.totalContractPrice = e * this.deptBudgetList.weight
+        this.deptBudgetList.totalContractPrice = (e * this.deptBudgetList.weight).toFixed(2)
       },
       // 编辑
       editClick(item, index) {

src/views/home/index.vue

@@ -57,19 +57,23 @@
           <div class="center_bottom_content">
             <div class="item">
               <div class="title">头寸</div>
-              <div class="number">{{centerBottomDataList[0]}}吨</div>
+              <div class="number">*****吨</div>
+              <!-- <div class="number">{{centerBottomDataList[0]}}吨</div> -->
             </div>
             <div class="item">
               <div class="title">实际库存</div>
-              <div class="number">{{centerBottomDataList[1]}}吨</div>
+              <div class="number">*****吨</div>
+              <!-- <div class="number">{{centerBottomDataList[1]}}吨</div> -->
             </div>
             <div class="item">
               <div class="title">采购待执行</div>
-              <div class="number">{{centerBottomDataList[2]}}吨</div>
+              <div class="number">*****吨</div>
+              <!-- <div class="number">{{centerBottomDataList[2]}}吨</div> -->
             </div>
             <div class="item">
               <div class="title">销售待执行</div>
-              <div class="number">{{centerBottomDataList[3]}}吨</div>
+              <div class="number">*****吨</div>
+              <!-- <div class="number">{{centerBottomDataList[3]}}吨</div> -->
             </div>
             <!-- <div class="row1">
               <div class="item_title">

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -45,8 +45,11 @@
       <el-table-column prop="deductWeight" label="扣重比"></el-table-column>
       <el-table-column prop="saleLimit" label="销量上限(吨/年)"></el-table-column>
       <el-table-column prop="dryGrainPrice" label="干粮收购价"></el-table-column>
-      <el-table-column prop="approveStatus" label="状态">
-        
+      <el-table-column label="状态">
+        <template scope="scope">
+          <span v-if="scope.row.approveStatus">{{ scope.row.approveStatus }}</span>
+          <span v-else>{{ scope.row.status }}</span>
+        </template>
       </el-table-column>
       <el-table-column prop="updateDate" label="通过时间"></el-table-column>
       <el-table-column label="操作" width="500">
@@ -77,7 +80,8 @@
     purchasePriceAllowEdit,
     purchasePriceLook,
     purchasePriceDel,
-    sponsorWithdraw
+    sponsorWithdraw,
+    getwarehouse
   } from '@/model/houseSelfCollect/index'
   import {
     getHp
@@ -207,7 +211,7 @@
       },
       //获取仓库
       getWarehouseSelf() {
-        selectWarehouseSelf({
+        getwarehouse({
             compId: this.compId
           })
           .toPromise()

src/views/houseSelfCollect/component/inspectInfoPrint.vue

@@ -40,10 +40,10 @@
         <td class="col">{{ printData.goodsName }}</td>
         <td class="col col-bgc">类型</td>
         <td class="col">{{ printData.type }}</td>
-        <td class="col col-bgc">容量（克/升）</td>
-        <td class="col">{{ printData.bulkDensity }}</td>
-        <td class="col col-bgc">不完善粒（%）</td>
-        <td class="col">{{ printData.imperfectGrain }}</td>
+        <td class="col col-bgc">{{printData.goodsName == '大豆'?'蛋白':'容重（克/升）'}}</td>
+        <td class="col">{{ printData.goodsName == '大豆'?printData.protein:printData.bulkDensity}}</td>
+        <td class="col col-bgc">{{printData.goodsName == '大豆'?'完整粒率（%）':'不完善粒（%）'}}</td>
+        <td class="col">{{ printData.goodsName == '大豆'?printData.completeGrain:printData.imperfectGrain }}</td>
       </tr>
       <tr class="row">
         <td class="col col-bgc">等级</td>

src/views/houseSelfCollect/component/paymentPrint.vue

@@ -47,7 +47,8 @@
         <td class="col col-bgc">等级</td>
         <td class="col col-bgc">水分%</td>
         <td class="col col-bgc">杂质%</td>
-        <td class="col col-bgc">容重（克/升）</td>
+        <td class="col col-bgc" v-if="printData.goodsName == '大豆'">蛋白</td>
+        <td class="col col-bgc" v-else>容重（克/升）</td>
         <td class="col col-bgc">毛重</td>
         <td class="col col-bgc">皮重</td>
         <td class="col col-bgc">扣杂重</td>
@@ -59,7 +60,8 @@
         <td class="col">{{ printData.qualityInspectionManagement.grade}}</td>
         <td class="col">{{ printData.qualityInspectionManagement.waterContent}}</td>
         <td class="col">{{ printData.qualityInspectionManagement.impurity}}</td>
-        <td class="col">{{ printData.qualityInspectionManagement.bulkDensity}}</td>
+        <td class="col" v-if="printData.goodsName == '大豆'">{{ printData.qualityInspectionManagement.protein}}</td>
+        <td class="col" v-else>{{ printData.qualityInspectionManagement.bulkDensity}}</td>
         <td class="col">{{ printData.grossWeight}}</td>
         <td class="col">{{ printData.tare}}</td>
         <td class="col">{{ printData.weighingManagement.buckleMiscellaneous}}</td>

src/views/houseSelfCollect/component/weightCheckPrint.vue

@@ -28,7 +28,7 @@
             <td class="col">{{tableData.goodsName}}</td>
             <td class="col col-bgc">类型</td>
             <td class="col">{{tableData.type}}</td>
-            <td class="col col-bgc">容量（克/升）</td>
+            <td class="col col-bgc">容重（克/升）</td>
             <td class="col">{{tableData.qualityInspectionManagement.bulkDensity}}</td>
             <td class="col col-bgc">不完善粒（%）</td>
             <td class="col">{{tableData.qualityInspectionManagement.imperfectGrain}}</td>

src/views/houseSelfCollect/inspectInfoLook.vue

@@ -179,24 +179,48 @@
                 <ws-input type="number" @mousewheel.native.prevent v-model="inspect.reMildewGrain" placeholder="请输入复检霉变粒占比"
                 maxlength="100" size="small" :disabled="disabled" />
             </ws-form-item>
-            <ws-form-item label="容重(克/升)" span="1" prop="bulkDensity">
+            <ws-form-item label="容重(克/升)" span="1" prop="bulkDensity" v-if="inspect.goodsName != '大豆'">
               <ws-input type="number" @mousewheel.native.prevent v-model="inspect.bulkDensity" placeholder="请输入容重"
                 maxlength="100" size="small" :disabled="disabled" />
                 <ws-input type="number" @mousewheel.native.prevent v-model="inspect.reBulkDensity" placeholder="请输入复检容重"
                 maxlength="100" size="small" :disabled="disabled" />
             </ws-form-item>
+            <ws-form-item label="蛋白" span="1" prop="bulkDensity" v-else>
+              <ws-input type="number" @mousewheel.native.prevent v-model="inspect.protein" placeholder="请输入蛋白"
+                maxlength="100" size="small" :disabled="disabled" />
+                <ws-input type="number" @mousewheel.native.prevent v-model="inspect.reProtein" placeholder="请输入复检蛋白"
+                maxlength="100" size="small" :disabled="disabled" />
+            </ws-form-item>
             <ws-form-item label="热损伤（%）" span="1" prop="jiaorenli">
               <ws-input type="number" @mousewheel.native.prevent v-model="inspect.jiaorenli" placeholder="请输入热损伤占比"
                 maxlength="100" size="small" :disabled="disabled" />
                 <ws-input type="number" @mousewheel.native.prevent v-model="inspect.reJiaorenli" placeholder="请输入复检热损伤占比"
                 maxlength="100" size="small" :disabled="disabled" />
             </ws-form-item>
-            <ws-form-item label="不完善粒（%）" span="1" prop="imperfectGrain">
+            <ws-form-item label="不完善粒（%）" span="1" prop="imperfectGrain" v-if="inspect.goodsName !='大豆'">
               <ws-input type="number" @mousewheel.native.prevent v-model="inspect.imperfectGrain"
                 placeholder="请输入不完善粒占比" maxlength="100" size="small" :disabled="disabled" />
               <ws-input type="number" @mousewheel.native.prevent v-model="inspect.reImperfectGrain"
                 placeholder="请输入复检不完善粒占比" maxlength="100" size="small" :disabled="disabled" />
             </ws-form-item>
+            <ws-form-item label="完整粒率（%）" span="1" prop="completeGrain" v-else>
+              <ws-input type="number" @mousewheel.native.prevent v-model="inspect.completeGrain"
+                placeholder="请输入完整粒率占比" maxlength="100" size="small" :disabled="disabled" />
+              <ws-input type="number" @mousewheel.native.prevent v-model="inspect.reCompleteGrain"
+                placeholder="请输入复检完整粒率占比" maxlength="100" size="small" :disabled="disabled" />
+            </ws-form-item>
+            <ws-form-item label="转基因" span="1" prop="transgene" v-if="inspect.goodsName =='大豆'">
+              <ws-input @mousewheel.native.prevent v-model="inspect.transgene"
+                placeholder="请输入是否转基因" maxlength="100" size="small" :disabled="disabled" />
+              <ws-input @mousewheel.native.prevent v-model="inspect.reTransgene"
+                placeholder="请输入复检是否转基因" maxlength="100" size="small" :disabled="disabled" />
+            </ws-form-item>
+            <ws-form-item label="色泽/气味" span="1" prop="colorLustre" v-if="inspect.goodsName =='大豆'">
+              <ws-input @mousewheel.native.prevent v-model="inspect.colorLustre"
+                placeholder="请输入色泽/气味是否正常" maxlength="100" size="small" :disabled="disabled" />
+              <ws-input @mousewheel.native.prevent v-model="inspect.reColorLustre"
+                placeholder="请输入复检色泽/气味是否正常" maxlength="100" size="small" :disabled="disabled" />
+            </ws-form-item>
             <ws-form-item label="复检备注" span="2" prop="reMemo" v-if="information == '编辑复检' || statusShow == '已复检'">
               <ws-input type="textarea" v-model="inspect.reMemo" placeholder="请输入复检备注" maxlength="300" v-if="statusShow != '已复检'" />
               <ws-input type="textarea" v-model="inspect.reMemo" placeholder="请输入复检备注" maxlength="300" v-else disabled />

src/views/houseSelfCollect/paymentManagement.vue

@@ -36,17 +36,18 @@
         <ws-button :type="invoicing === 0 ? 'primary' : ''" @click="screen(0)">未开票</ws-button>
       </template>
       <template slot="right">
+        
+        <el-select class="warehouse_select" v-model="warehouseNameKey" placeholder="请选择仓库" @change="warehouseChange"
+          filterable clearable style="margin: 0 10px">
+          <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName" :value="item.id">
+          </el-option>
+        </el-select>
         <el-select class="warehouse_select" v-model="goodNames" placeholder="请选择货名" @change="goodsNameChange" filterable
           clearable  multiple :multiple-limit="multipleLimit" style="margin: 0 10px">
           <el-option label="全部货名" value="全部货名"></el-option>
           <el-option v-for="item in goodnameList" :key="item.id" :label="item.goodsName" :value="item.goodsName">
           </el-option>
         </el-select>
-        <el-select class="warehouse_select" v-model="warehouseNameKey" placeholder="请选择仓库" @change="warehouseChange"
-          filterable clearable style="margin: 0 10px">
-          <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName" :value="item.id">
-          </el-option>
-        </el-select>
         <el-date-picker style="margin: 0 10px 0 0" value-format="yyyy-MM-dd" v-model="value2" @change="datechange"
           type="daterange" align="right" unlink-panels range-separator="至" start-placeholder="结算时间起"
           end-placeholder="结算时间止">
@@ -454,6 +455,7 @@
     suspendinstance,
     importWord,
     getPrint,
+    getwarehouse
   } from '@/model/houseSelfCollect/index'
   import {
     posthandle,
@@ -1732,11 +1734,14 @@
       getList() {
         for (let _temp = 0; _temp < this.warehouseList.length; _temp++) {
           if (this.warehouseName == this.warehouseList[_temp].warehouseName) {
-            for (let _num = 0; _num < this.warehouseList[_temp].goodsNameInfos.length; _num++) {
-              const res = new Map()
-              this.goodnameList = this.warehouseList[_temp].goodsNameInfos.filter((arr) => !res.has(arr.goodsName) &&
-                res.set(arr.goodsName, 1))
+            if(this.warehouseList[_temp].goodsNameInfos){
+              for (let _num = 0; _num < this.warehouseList[_temp].goodsNameInfos.length; _num++) {
+                const res = new Map()
+                this.goodnameList = this.warehouseList[_temp].goodsNameInfos.filter((arr) => !res.has(arr.goodsName) &&
+                  res.set(arr.goodsName, 1))
+              }
             }
+            
           }
         }
         this.payments = {

src/views/houseSelfCollect/settlement.vue

@@ -82,21 +82,37 @@
                 v-model="paymentList.qualityInspectionManagement.mildewGrain" placeholder="请输入霉变粒占比" maxlength="100"
                 size="small" disabled />
             </ws-form-item>
-            <ws-form-item label="容重(克/升)" span="1" prop="waterContent">
+            <ws-form-item label="容重(克/升)" span="1" prop="waterContent" v-if="paymentList.goodsName != '大豆'">
               <ws-input type="number" @mousewheel.native.prevent
                 v-model="paymentList.qualityInspectionManagement.bulkDensity" placeholder="请输入容重" maxlength="100"
                 size="small" disabled />
             </ws-form-item>
+            <ws-form-item label="蛋白" span="1" prop="waterContent" v-else>
+              <ws-input type="number" @mousewheel.native.prevent
+                v-model="paymentList.qualityInspectionManagement.protein" placeholder="请输入蛋白" maxlength="100"
+                size="small" disabled />
+            </ws-form-item>
             <ws-form-item label="热损伤（%）" span="1" prop="waterContent">
               <ws-input type="number" @mousewheel.native.prevent
                 v-model="paymentList.qualityInspectionManagement.jiaorenli" placeholder="请输入热损伤占比" maxlength="100"
                 size="small" disabled />
             </ws-form-item>
-            <ws-form-item label="不完善粒（%）" span="1" prop="waterContent">
+            <ws-form-item label="不完善粒（%）" span="1" prop="waterContent" v-if="paymentList.goodsName != '大豆'">
               <ws-input type="number" @mousewheel.native.prevent
                 v-model="paymentList.qualityInspectionManagement.imperfectGrain" placeholder="请输入不完善粒占比" maxlength="100"
                 size="small" disabled />
             </ws-form-item>
+            <ws-form-item label="完整粒率（%）" span="1" prop="waterContent" v-else>
+              <ws-input type="number" @mousewheel.native.prevent
+                v-model="paymentList.qualityInspectionManagement.completeGrain" placeholder="请输入不完善粒占比" maxlength="100"
+                size="small" disabled />
+            </ws-form-item>
+            <ws-form-item label="转基因" span="1" prop="transgene" v-if="paymentList.goodsName == '大豆' && paymentList.qualityInspectionManagement.transgene">
+              <ws-input v-model="paymentList.qualityInspectionManagement.transgene" placeholder="暂无" maxlength="100" size="small" disabled />
+            </ws-form-item>
+            <ws-form-item label="色泽/气味" span="1" prop="colorLustre" v-show="paymentList.goodsName == '大豆' && paymentList.qualityInspectionManagement.colorLustre">
+              <ws-input v-model="paymentList.qualityInspectionManagement.colorLustre" placeholder="暂无" maxlength="100" size="small" disabled />
+            </ws-form-item>
           </ws-info-table>
 
           <div v-if='paymentList.type=="潮粮"' class="titles">单价核算</div>
@@ -260,6 +276,43 @@
               <ws-input v-model="paymentList.remarks" placeholder="备注信息，不超过20个字" maxlength="20" :disabled="disabled"
                 size="small" />
             </ws-form-item>
+            <ws-form-item label="记事（选填）" span="1" prop="waterContent">
+              <ws-input v-model="paymentList.remarks" placeholder="备注信息，不超过20个字" maxlength="20" :disabled="disabled"
+                size="small" />
+            </ws-form-item>
+          </ws-info-table>
+          <ws-info-table v-if="!this.disabled">
+            <div class="avatar-uploader-wrap">
+            <ws-form-item label="自产证明" span="1" prop="waterContent">
+                <el-image 
+                v-if="paymentList.selfCertificate"
+                  style="width: 178px; height: 178px;"
+                  :src="paymentList.selfCertificate" 
+                  :preview-src-list="[paymentList.selfCertificate]">
+                </el-image>
+                <el-upload  v-else
+                  class="avatar-uploader"
+                  :action="global.uploadPath"
+                  :show-file-list="false"
+                  :on-success="uploadSuccess"
+                  accept=".jpg, .jpeg, .png, .gif"
+                >
+                <i  class="el-icon-plus avatar-uploader-icon"></i>
+                </el-upload>
+              </ws-form-item> 
+            </div>
+          </ws-info-table>
+          <ws-info-table v-else>
+            <div class="avatar-uploader-wrap">
+            <ws-form-item label="自产证明" span="1" prop="waterContent">
+                <el-image 
+                v-if="paymentList.selfCertificate"
+                  style="width: 178px; height: 178px;border-radius:6px;"
+                  :src="paymentList.selfCertificate" 
+                  :preview-src-list="[paymentList.selfCertificate]">
+                </el-image>
+              </ws-form-item> 
+            </div>
           </ws-info-table>
           <div class="but">
             <el-button @click="cancel" v-if="this.types == 1" type="primary">取消</el-button>
@@ -586,6 +639,9 @@
       }
     },
     methods: {
+      uploadSuccess(e) {
+      this.$set(this.paymentList, 'selfCertificate', e.data.url)
+    },
       changeEw(e) {
         this.ddchecked = false
         if (e) {
@@ -971,6 +1027,7 @@
             return
           }
         }
+        
         if (this.paymentList.weighingSubsidy < 0 || this.paymentList.weighingSubsidy > 100000) {
           this.$message({
             message: '称重补助范围应在0-100000内',
@@ -1056,6 +1113,13 @@
           })
           return
         }
+        // if (!this.paymentList.selfCertificate&&localStorage.getItem('ws-pf_compName')=='黑龙江中天昊元贸易有限公司'||!this.paymentList.selfCertificate&&localStorage.getItem('ws-pf_compName')=='吉林昊友城元粮食贸易有限公司') {
+        //   this.$message({
+        //     message: '请上传自产证明!',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
         this.paymentList.id = this.$route.query.id
         this.paymentList.amountIngPayable = this.paymentList.actualPayment
         this.paymentList.settlementClerk = localStorage.getItem('ws-pf_staffName')
@@ -1334,5 +1398,46 @@
     margin: 20px 0;
     text-align: center;
   }
-
+  /deep/.avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+    width: 178px;
+    height: 178px;
+  }
+  /deep/.avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+  }
+  .avatar {
+    width: 178px;
+    height: 178px;
+    display: block;
+  }
+  .avatar-uploader-wrap{
+    display: inline-block;
+    width:100%;
+  }
+  /deep/.ws-info-table{
+    width:100%;
+  }
+  /deep/.ws-info-table .avatar-uploader-wrap .el-form-item{
+    width:100%;
+  }
+  /deep/.ws-info-table .avatar-uploader-wrap .el-form-item .el-form-item__label{
+    width:21%;
+  }
+  /deep/.ws-info-table .avatar-uploader-wrap .el-form-item .el-form-item__content{
+    height:210px;
+    width:79%;
+  }
 </style>

src/views/houseSelfCollect/weightCheck.vue

@@ -225,6 +225,7 @@
             </div>
           </div>
         </div>
+        
       </div>
       <div class="bottom-btn">
         <el-button @click="typePrintClick">确定</el-button>
@@ -307,6 +308,10 @@
           netWeight: 0,
           receivableWeighingFee: '',
         },
+        outchecked:false,
+        inshipments:'',
+        outshipments:'',
+        printout:false,
         deptBudgetList: {},
         tpyeNo: 1,
         disabled: true,
@@ -430,6 +435,13 @@
       // this.closePort()
     },
     methods: {
+      changeOut(e) {
+        if (e) {
+          this.printout = true
+        } else {
+          this.printout = false
+        }
+      },
       changeEwDD(e) {
         this.checked = false
         if (e) {
@@ -479,6 +491,22 @@
               dialogData.companyName = this.companyName
               this.dialogDataList.push(dialogData)
             }
+            if(this.outchecked){
+                if(!this.checked&&!this.ddchecked){
+                  this.dialogDataList=[]
+                  var _data = JSON.parse(JSON.stringify(dialogData))
+                  this.$set(_data,'printtype','out')
+                  _data.compName = this.outshipments;
+                  _data.customer = this.inshipments
+                  this.dialogDataList.push(_data)
+                }else{
+                  var _data = JSON.parse(JSON.stringify(dialogData))
+                  this.$set(_data,'printtype','out')
+                  _data.compName = this.outshipments;
+                  _data.customer = this.inshipments
+                  this.dialogDataList.push(_data)
+                }  
+              }
             console.log('保存打印', this.dialogDataList)
             
           localStorage.setItem('print_in_data',JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))

src/views/houseSelfCollect/weightCheckRecord.vue

@@ -77,7 +77,7 @@
         <el-table-column key="14" label="操作" min-width="400">
           <template scope="scope">
             <!-- <el-button size="small" @click="print(scope.row)">打印</el-button> -->
-            <el-button @click="print(scope.row)" v-if="scope.row.status == '已称皮重' || scope.row.status == '已称毛重'" v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button>
+            <el-button @click="print(scope.row,2)" v-if="scope.row.status == '已称皮重' || scope.row.status == '已称毛重'" v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button>
             <el-button @click="backInfo(scope.row)" v-if="scope.row.status == '已称皮重'">退回</el-button>
             <el-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.huan`" class="putstorage" @click="exchange(scope.row)" v-if="scope.row.status == '已称毛重'|| scope.row.status == '已质检'">换仓</el-button>
             <el-button v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.huan`" class="putstorage" @click="exchangeNo(scope.row)" v-if="scope.row.status == '已称毛重'|| scope.row.status == '已质检'">换任务号</el-button>
@@ -112,7 +112,13 @@
             </el-option>
           </el-select>
         </div>
-        <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'||warehouseName=='杜尔伯特家禾库'||warehouseName=='洮南新友谊兴旺库'||warehouseName=='甘南宏旗库'||warehouseName=='哈尔滨依兰库'||warehouseName=='山东园丰库'">
+        <div v-if="warehouseName=='鲅鱼圈金信库'&&printType==2||
+        warehouseName=='白城内陆港'&&printType==2||
+        warehouseName=='杜尔伯特家禾库'&&printType==2||
+        warehouseName=='洮南新友谊兴旺库'&&printType==2||
+        warehouseName=='甘南宏旗库'&&printType==2||
+        warehouseName=='哈尔滨依兰库'&&printType==2||
+        warehouseName=='山东园丰库'&&printType==2">
           <div class="print-type-ew">
             <el-checkbox v-model="checked" @change="changeEw">打印额外票据</el-checkbox>
             <el-checkbox v-model="ddchecked" @change="changeEwDD">单独打印额外票据</el-checkbox>
@@ -137,6 +143,39 @@
             </div>
           </div>
         </div>
+        <div v-if="warehouseName=='鲅鱼圈金信库'&&printType==2">
+          <div class="print-type-ew">
+            <el-checkbox v-model="outchecked" @change="changeOut">是否打印出库</el-checkbox>
+          </div>
+          <div class="ew-print" v-if="printout">
+            <div class="row">
+              <div>出库发货单位：</div>
+              <!-- <div>{{companyName}}</div> -->
+              <el-select v-model="inshipments" placeholder="请选择" style="width: 75%;">
+                <el-option v-for="item in ewCustomerOptions" :key="item.value" :label="item.label" :value="item.value">
+                </el-option>
+              </el-select>
+            </div>
+            <div class="row">
+              <div>出库收货单位：</div>
+              <!-- <div>{{companyNameEW}}</div> -->
+              <el-select v-model="outshipments" placeholder="请选择" style="width: 75%;">
+                <el-option v-for="item in companyNameEWOptions" :key="item.value" :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </div>
+            <div class="row">
+              <div>出库仓位号：</div>
+              <!-- <div>{{companyNameEW}}</div> -->
+              <el-select v-model="outbinNumber" placeholder="请选择仓位号" style="width: 75%;">
+                <el-option v-for="item in binNumberList1" :key="item.id" :label="item.binNumber"
+                  :value="item.binNumber">
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+        </div>
       </div>
       <div class="bottom-btn">
         <el-button @click="typePrintClick">确定</el-button>
@@ -235,7 +274,8 @@
     changeCustomer,
     getcustomer,
     importWordYk,
-    getweighingDelete
+    getweighingDelete,
+    getbinNumber
   } from '@/model/houseSelfCollect/index'
    import {
     getReceiptTaskNo,
@@ -259,6 +299,9 @@
         // binNumberId: '', //仓位Id
         // warehouseType: '',
         compId: '',
+        outbinNumber:'',
+        printType:0,
+        binNumberList1:[],
         UserInfo:JSON.parse(localStorage.getItem('ws_login_getTenantInfoByUser')),
         pickerOptions: {
           shortcuts: [{
@@ -391,13 +434,18 @@
         companyName: '黑龙江中天昊元贸易有限公司',
         companyNameEW: '厦门建发物产有限公司',
         ewCustomer: '黑龙江利润元粮食贸易有限公司',
+        inshipments:'黑龙江中天昊元贸易有限公司',
+        outshipments:'黑龙江中天昊元贸易有限公司',
         ewradio: '',
         ddchecked: false,
         checked: false,
+        outchecked:false,
         isShowPrintType: false,
         dialogDataList: [],
         jjSelectPrintList: [],
+        outPrintList: [],
         printSeparately: false,
+        printout:false,
         onePrint: false,
         startDate:'',
         endDate:'',
@@ -422,8 +470,10 @@
     activated() {
       //仓库
       console.log(localStorage.getItem('compNameoptions'))
-      if(localStorage.getItem('compNameoptions')){
-        var company=JSON.parse(localStorage.getItem('compNameoptions'))
+      getcomp({userMobilePhone:JSON.parse(localStorage.getItem('ws_login_getTenantInfoByUser')).loginInfo.userMobilePhone}).toPromise().then((res)=>{
+        this.compNameoptions=res
+    if (this.compNameoptions.length>0) {
+        var company=this.compNameoptions
         
         var extra=company.filter((item)=>{
           return item!='黑龙江中天昊元贸易有限公司'
@@ -552,6 +602,7 @@
           }
         }
       }
+    })
       selectWarehouseSelf({
           compId: localStorage.getItem('ws-pf_compId'),
         })
@@ -918,6 +969,13 @@
         } else {
           this.printSeparately = false
         }
+      },
+      changeOut(e) {
+        if (e) {
+          this.printout = true
+        } else {
+          this.printout = false
+        }
       },
        dateFormat(fmt, date) {
         let ret
@@ -967,12 +1025,14 @@
         localStorage.setItem('print_company_name',this.companyName)
         localStorage.setItem('print_company_name_ew',this.companyNameEW)
         localStorage.setItem('print_customer_name_ew',this.ewCustomer)
+        localStorage.setItem('print_out',this.outchecked)
         if (this.onePrint) { //判断是否是单个打印
           getPrint({
               id: this.idPrint
             })
             .toPromise()
             .then((response) => {
+              // 判断是否打印出库
               this.dialogDataList = [] //点击确认时先清空要打印的数组
               this.dialogData = response
               if (response.compName == '黑龙江秋收有限公司') {
@@ -995,12 +1055,32 @@
                 _datas.compName = this.companyNameEW;
                 _datas.customer = this.ewCustomer
                 this.dialogDataList.push(_datas)
-              } else {
+              }else {
                 this.dialogData.compName = this.companyName
                 if(this.dialogData&&this.dialogData.contractManagement&& this.warehousingType != 3){
                   this.dialogData.customer = this.dialogData.contractManagement.seller
                 }
+                
                 this.dialogDataList.push(this.dialogData)
+               
+              }
+              if(this.outchecked){
+                if(!this.checked&&!this.ddchecked){
+                  this.dialogDataList=[]
+                  var _data = JSON.parse(JSON.stringify(this.dialogData))
+                  this.$set(_data,'printtype','out')
+                  _data.compName = this.outshipments;
+                  _data.customer = this.inshipments
+                  _data.binNumber = this.outbinNumber
+                  this.dialogDataList.push(_data)
+                }else{
+                  var _data = JSON.parse(JSON.stringify(this.dialogData))
+                  this.$set(_data,'printtype','out')
+                  _data.compName = this.outshipments;
+                  _data.customer = this.inshipments
+                  _data.binNumber = this.outbinNumber
+                  this.dialogDataList.push(_data)
+                }  
               }
               this.printBig('', this.radio)
             })
@@ -1063,7 +1143,8 @@
         }
 
       },
-      print(row, type, pageType) {
+      async print(row, type, pageType) {
+       this.printType=type
         //打印
         if (type == 1) { //
           if (this.modification.length == 0) {
@@ -1088,7 +1169,9 @@
               }
             }
           }
+          
           this.isShowPrintType = true
+          
         } else {
           if (row.serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '杜尔伯特家禾库'||this.warehouseName=='洮南新友谊兴旺库'||this.warehouseName=='甘南宏旗库' || this.warehouseName == '白城内陆港' || this.warehouseName == '哈尔滨依兰库'||this.warehouseName=='山东园丰库')) {
             if (row.seller && row.buyer) {
@@ -1107,6 +1190,10 @@
             }
           }
           this.idPrint = row.id
+          if(type==2&&this.warehouseName=='鲅鱼圈金信库'){
+            var data=await getbinNumber({id:row.warehouseId}).toPromise()
+            this.binNumberList1=data.warehousePositionInfoList
+          }
           this.isShowPrintType = true
           this.onePrint = true //单个打印标识
         }
@@ -1122,6 +1209,11 @@
           this.makeEWjjSelectPrintList()
           //  this.selectEW = true;
         }
+        // if(this.outchecked){
+        //   var _data = JSON.parse(JSON.stringify(this.dialogData))
+        //   this.$set(_data,'printtype','out')
+        //   localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.jjSelectPrintList))
+        // }
         if (type == 1) {
           localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.jjSelectPrintList))
           window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType + '&selectEW=' + this
@@ -1131,7 +1223,6 @@
           window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType)
         } else {
           console.log(this.dialogDataList)
-          
           localStorage.setItem('print_in_data',JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
           // window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
           window.open('../../../../static/weightCheck.html?type=2&tableData=' )
@@ -1316,7 +1407,7 @@
     right: 0;
     margin: auto;
     width: 440px;
-    height: 320px;
+    height: 446px;
     background: white;
     border-radius: 10px;
     z-index: 999;

src/views/login/index.vue

@@ -273,6 +273,13 @@
       :before-close="serviceClose" :closeOnClickModal="true" :appendToBody="true">
       <serviceDialog @close="serviceClose"></serviceDialog>
     </el-dialog>
+    <div class="bottom">
+          <div class="row1">
+          Copyright www.eliangeyun.com All Right Reserved @淘粮（海南）科技发展有限公司  </div>
+          <div class="">
+          <a href="https://beian.miit.gov.cn">琼ICP备2021004821号-2</a>
+          </div>
+    </div>
   </div>
 </template>
 

src/views/outboundManagement/component/inspectInfoPrint.vue

@@ -34,7 +34,7 @@
         <td class="col">{{ printData.goodsName }}</td>
         <td class="col col-bgc">类型</td>
         <td class="col">{{ printData.type }}</td>
-        <td class="col col-bgc">容量（克/升）</td>
+        <td class="col col-bgc">容重（克/升）</td>
         <td class="col">{{ printData.bulkDensity }}</td>
         <td class="col col-bgc">不完善粒（%）</td>
         <td class="col">{{ printData.imperfectGrain }}</td>

src/views/outboundManagement/component/outInspectPrint.vue

@@ -24,7 +24,7 @@
         <td class="col">{{ printData.goodsName }}</td>
         <td class="col col-bgc">类型</td>
         <td class="col">{{ printData.weighingManagement.type }}</td>
-        <td class="col col-bgc">容量（克/升）</td>
+        <td class="col col-bgc">容重（克/升）</td>
         <td class="col">{{ printData.bulkDensity }}</td>
         <td class="col col-bgc">不完善粒（%）</td>
         <td class="col">{{ printData.imperfectGrain }}</td>

src/views/outboundManagement/component/weightCheckPrint.vue

@@ -25,7 +25,7 @@
             <td class="col">{{tableData.goodsName}}</td>
             <td class="col col-bgc">类型</td>
             <td class="col">{{tableData.type}}</td>
-            <td class="col col-bgc">容量（克/升）</td>
+            <td class="col col-bgc">容重（克/升）</td>
             <td class="col">{{tableData.qualityInspectionManagement.bulkDensity}}</td>
             <!-- <td class="col col-bgc">不完善粒（%）</td>
             <td class="col">{{tableData.qualityInspectionManagement.imperfectGrain}}</td> -->

src/views/outboundManagement/newQualityInspectionManagement.vue

@@ -197,6 +197,7 @@
   import {
     packList
   } from '@/model/contarct/index'
+  
   import html2canvas from 'html2canvas'
   import axios from 'axios'
   import outInspectPrint from './component/outInspectPrint.vue'

src/views/outboundManagement/weighingManagementNew.vue

@@ -77,7 +77,7 @@
                         <el-select v-if="tpyeNo == 1" :disabled="recheck" filterable clearable
                           v-model="weighingList.inOutTaskNo" placeholder="请选择任务编号" class="typeselect"
                           @change="contractNoChange">
-                          <el-option v-for="item in taskNolist" :key="item.id" :label="item.inOutTaskNo"
+                          <el-option v-for="item in taskNolist" :key="item.id" :label="item.inOutTaskNo+(item.taskFlag?'（'+item.taskFlag+'）':'')"
                             :value="item.inOutTaskNo" />
                         </el-select>
                         <ws-input v-else v-model="weighingList.inOutTaskNo" placeholder="自动获取，不可编辑" maxlength="100"
@@ -414,7 +414,9 @@
     getstaff,
     getReceiptTaskNo,
   } from '@/model/warehouse/index'
-  
+  import {
+    getcomp
+  } from '@/model/indexRx'
   import axios from 'axios'
   import weightCheckPrint from './component/weightCheckPrint.vue'
   import inspectInfoPrint from './component/inspectInfoPrint.vue'
@@ -643,8 +645,10 @@
       }
     },
     mounted() {
-      if(localStorage.getItem('compNameoptions')){
-        var company=JSON.parse(localStorage.getItem('compNameoptions'))
+      getcomp({userMobilePhone:JSON.parse(localStorage.getItem('ws_login_getTenantInfoByUser')).loginInfo.userMobilePhone}).toPromise().then((res)=>{
+        this.compNameoptions=res
+    if (this.compNameoptions.length>0) {
+      var company=this.compNameoptions
         var extra=company.filter((item)=>{
           return item!='黑龙江中天昊元贸易有限公司'
           &&item!='黑龙江利润元粮食贸易有限公司'
@@ -755,6 +759,7 @@
           }
         }
       }
+    })
       this.getNowTime()
       this.selectWarehouse()
       this.showType = this.isShow

src/views/outboundManagement/weighingManagementrecord.vue

@@ -235,6 +235,9 @@
   import {
     EventBus
   } from 'base-core-lib'
+  import {
+    getcomp
+  } from '@/model/indexRx'
   import WsUpload from '@/components/WsUpload'
   import weightCheckPrint from './component/weightCheckPrint.vue'
   import inspectInfoPrint from './component/inspectInfoPrint.vue'
@@ -377,8 +380,10 @@
       }
     },
     activated() {
-      if(localStorage.getItem('compNameoptions')){
-        var company=JSON.parse(localStorage.getItem('compNameoptions'))
+      getcomp({userMobilePhone:JSON.parse(localStorage.getItem('ws_login_getTenantInfoByUser')).loginInfo.userMobilePhone}).toPromise().then((res)=>{
+        this.compNameoptions=res
+    if (this.compNameoptions.length>0) {
+      var company=this.compNameoptions
         var extra=company.filter((item)=>{
           return item!='黑龙江中天昊元贸易有限公司'
           &&item!='黑龙江利润元粮食贸易有限公司'
@@ -489,6 +494,7 @@
           }
         }
       }
+    })
       this.selectWarehouse()
       this.showType = this.isShow
     },

src/views/personnelManagement/checkWorkList.vue

@@ -49,18 +49,24 @@
       label="上班打卡时间"
       width="180">
       <template slot-scope="scope">
-        <span v-if="scope.row.toClockDate" style="margin-left: 10px">{{ scope.row.toClockDate.split(" ")[1] }}</span>
+        <span v-if="scope.row.toClockDate" style="margin-left: 10px">
+          {{ scope.row.toClockDate.split(" ")[1] }}
+          <span v-if="scope.row.lateFlag == 1" style="color: brown;font-size: 14px;">迟</span>
+        </span>
         <span v-else-if="scope.row.status=='补卡成功'&&scope.row.supplementClockType=='1'" style="margin-left: 10px;">已补卡</span>
-        <span v-else-if="scope.row.leaveType" style="margin-left: 10px;">{{scope.row.leaveType}}</span>
+        <span v-else-if="!scope.row.toClockDate && scope.row.leaveType" style="margin-left: 10px;">{{scope.row.leaveType}}</span>
       </template>
     </el-table-column>
     <el-table-column
       prop="offClockDate"
       label="下班打卡时间">
       <template slot-scope="scope">
-        <span v-if="scope.row.offClockDate" style="margin-left: 10px">{{ scope.row.offClockDate.split(" ")[1] }}</span>
+        <span v-if="scope.row.offClockDate" style="margin-left: 10px">
+          {{ scope.row.offClockDate.split(" ")[1] }}
+          <span v-if="scope.row.leaveEarlyFlag == 1" style="color: brown;font-size: 14px;">早</span>
+        </span>
         <span v-else-if="scope.row.status=='补卡成功'&&scope.row.supplementClockType=='3'" style="margin-left: 10px;">已补卡</span>
-        <span v-else-if="scope.row.leaveType" style="margin-left: 10px;">{{scope.row.leaveType}}</span>
+        <span v-else-if="!scope.row.offClockDate && scope.row.leaveType" style="margin-left: 10px;">{{scope.row.leaveType}}</span>
       </template>
     </el-table-column>
   </el-table>
@@ -171,15 +177,30 @@
     },
     mounted() {
       let date = new Date()
-            // 通过时间戳计算
-            let defalutStartTime = date.getTime() - 7 * 24 * 3600 * 1000 // 转化为时间戳
-            let defalutEndTime = date.getTime()
-            let startDateNs = new Date(defalutStartTime) 
-            let endDateNs = new Date(defalutEndTime)
-            // 月，日 不够10补0
-            defalutStartTime = startDateNs.getFullYear() + '-' + ((startDateNs.getMonth() + 1) >= 10 ? (startDateNs.getMonth() + 1) : '0' + (startDateNs.getMonth() + 1)) + '-' + (startDateNs.getDate() >= 10 ? startDateNs.getDate() : '0' + startDateNs.getDate())
-            defalutEndTime = endDateNs.getFullYear() + '-' + ((endDateNs.getMonth() + 1) >= 10 ? (endDateNs.getMonth() + 1) : '0' + (endDateNs.getMonth() + 1)) + '-' + (endDateNs.getDate() >= 10 ? endDateNs.getDate() : '0' + endDateNs.getDate())
-            this.value2= [defalutStartTime, defalutEndTime]
+			let new_year = date.getFullYear(); // 取当前的年份
+			let month = date.getMonth();
+			let new_month = month + 1; // 取当前的月份
+			let mon = '';
+			let day = '';
+			if (month > 12) {
+				new_month -= 12; // 月份减
+				new_year++; // 年份增
+			}
+			let firstDay = new Date(new_year, new_month, 1); // 取当年当月中的第一天
+			let lastDay = new Date(firstDay.getTime() - 1000 * 60 * 60 * 24).getDate(); // 获取当月最后一天日期
+			if (firstDay.getMonth() < 10) {
+				mon = '0' + firstDay.getMonth();
+			} else {
+				mon = firstDay.getMonth();
+			}
+			if (lastDay < 10) {
+				day = '0' + lastDay;
+			} else {
+				day = lastDay;
+			}
+			let startDate = firstDay.getFullYear() + '-' + mon + '-' + '0' + firstDay.getDate();
+			let endDate = firstDay.getFullYear() + '-' + mon + '-' + day;
+      this.value2 = [startDate,endDate]
     },
      
     methods: {
@@ -201,7 +222,15 @@
         }, 1000)
       },
       datechange() {
-        this.getList()
+        if (this.value2[0].split('-')[1] != this.value2[1].split('-')[1]) {
+          this.$message({
+            message: '请选择相同月份的起始日期',
+            type: 'warning',
+          })
+          return
+        } else {
+          this.getList()
+        }
       },
       deptChange(){
         this.getList()
@@ -215,28 +244,28 @@
           },
         })
       },
-      dateFormat(fmt, date) {
-        let ret
-        const opt = {
-          'Y+': date.getFullYear().toString(), // 年
-          'm+': (date.getMonth() + 1).toString(), // 月
-          'd+': date.getDate().toString(), // 日
-          'H+': date.getHours().toString(), // 时
-          // "M+": date.getMinutes().toString(),         // 分
-          // "S+": date.getSeconds().toString()          // 秒
-          // 有其他格式化字符需求可以继续添加，必须转化成字符串
-        }
-        for (let k in opt) {
-          ret = new RegExp('(' + k + ')').exec(fmt)
-          if (ret) {
-            fmt = fmt.replace(
-              ret[1],
-              ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
-            )
-          }
-        }
-        return fmt
-      },
+      // dateFormat(fmt, date) {
+      //   let ret
+      //   const opt = {
+      //     'Y+': date.getFullYear().toString(), // 年
+      //     'm+': (date.getMonth() + 1).toString(), // 月
+      //     'd+': date.getDate().toString(), // 日
+      //     'H+': date.getHours().toString(), // 时
+      //     // "M+": date.getMinutes().toString(),         // 分
+      //     // "S+": date.getSeconds().toString()          // 秒
+      //     // 有其他格式化字符需求可以继续添加，必须转化成字符串
+      //   }
+      //   for (let k in opt) {
+      //     ret = new RegExp('(' + k + ')').exec(fmt)
+      //     if (ret) {
+      //       fmt = fmt.replace(
+      //         ret[1],
+      //         ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
+      //       )
+      //     }
+      //   }
+      //   return fmt
+      // },
 
       handleClose() {
         this.accessoryTFs = false
@@ -266,27 +295,27 @@
           startDate = this.value2[0] ? this.value2[0] : ''
           endDate = this.value2[1] ? this.value2[1] : ''
         }
-        getList({
-          currentPage: this.currentPage,
+          getList({
+            currentPage: this.currentPage,
             pageSize: this.pageSize,
             startDate: startDate,
             endDate: endDate,
             searchKeyWord: this.searchKeyWord,
             compId: localStorage.getItem('ws-pf_compId'),
-            dept:this.deptId
-          })
-          .toPromise()
-          .then((response) => {
-            console.log(response.data)
-            this.tableData = response.records
-            // for (var i = 0; i < response.records.length; i++) {
-            //   response.records[i].identification = 'false'
-            // }
-            // this.customerList = response
-            // this.deptCircularPage.currentPage = response.current
-            // this.deptCircularPage.pageSize = response.size
-            // this.deptBudgetTotal = response.total
+            dept: this.deptId
           })
+            .toPromise()
+            .then((response) => {
+              console.log(response.data)
+              this.tableData = response.records
+              // for (var i = 0; i < response.records.length; i++) {
+              //   response.records[i].identification = 'false'
+              // }
+              // this.customerList = response
+              // this.deptCircularPage.currentPage = response.current
+              // this.deptCircularPage.pageSize = response.size
+              // this.deptBudgetTotal = response.total
+            })
       },
       //部门列表查询
       getDeptList() {

src/views/platformAudit/purchaseContractAdd.vue

@@ -397,8 +397,8 @@
           />
         </ws-form-item>
 
-        <!--容量（克/升）>=-->
-        <ws-form-item label="容量（克/升）" span="1" prop="bulkDensity">
+        <!--容重（克/升）>=-->
+        <ws-form-item label="容重（克/升）" span="1" prop="bulkDensity">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.bulkDensity"
             placeholder="请输入容重"

src/views/platformAudit/salesContractAdd.vue

@@ -401,8 +401,8 @@
             />
           </ws-form-item>
 
-          <!--容量（克/升）>=-->
-          <ws-form-item label="容量（克/升）" span="1" prop="bulkDensity">
+          <!--容重（克/升）>=-->
+          <ws-form-item label="容重（克/升）" span="1" prop="bulkDensity">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.bulkDensity"
               placeholder="请输入容重"

src/views/platformAudit/salesContractEdit.vue

@@ -393,11 +393,11 @@
             />
           </ws-form-item>
 
-          <!--容量（克/升）>=-->
-          <ws-form-item label="容量（克/升）" span="1" prop="contractNo">
+          <!--容重（克/升）>=-->
+          <ws-form-item label="容重（克/升）" span="1" prop="contractNo">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.bulkDensity"
-              placeholder="请输入容量（克/升）"
+              placeholder="请输入容重（克/升）"
               maxlength="100"
               size="small"
             />

src/views/platformaudit/purchaseContractAdd.vue

@@ -397,8 +397,8 @@
           />
         </ws-form-item>
 
-        <!--容量（克/升）>=-->
-        <ws-form-item label="容量（克/升）" span="1" prop="bulkDensity">
+        <!--容重（克/升）>=-->
+        <ws-form-item label="容重（克/升）" span="1" prop="bulkDensity">
           <ws-input
             v-model="deptBudgetList.contractGoodsInfo.bulkDensity"
             placeholder="请输入容重"

src/views/platformaudit/salesContractAdd.vue

@@ -401,8 +401,8 @@
             />
           </ws-form-item>
 
-          <!--容量（克/升）>=-->
-          <ws-form-item label="容量（克/升）" span="1" prop="bulkDensity">
+          <!--容重（克/升）>=-->
+          <ws-form-item label="容重（克/升）" span="1" prop="bulkDensity">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.bulkDensity"
               placeholder="请输入容重"

src/views/platformaudit/salesContractEdit.vue

@@ -393,11 +393,11 @@
             />
           </ws-form-item>
 
-          <!--容量（克/升）>=-->
-          <ws-form-item label="容量（克/升）" span="1" prop="contractNo">
+          <!--容重（克/升）>=-->
+          <ws-form-item label="容重（克/升）" span="1" prop="contractNo">
             <ws-input
               v-model="deptBudgetList.contractGoodsInfo.bulkDensity"
-              placeholder="请输入容量（克/升）"
+              placeholder="请输入容重（克/升）"
               maxlength="100"
               size="small"
             />

src/views/profitable/cashoutaduit.vue

@@ -5,82 +5,92 @@
       <el-col :span="12">
         <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" height="10"
-            style="vertion-align: bottom; margin-right: 3px" src="../../../public/img/lujing.png" alt="" />返回
+      <el-col :span="12" class="bg-right"><el-button class="bg-bottom" type="primary" size="small"
+          @click="returnsales()"><img width="6" height="10" style="vertion-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png" alt="" />返回
         </el-button></el-col>
     </el-row>
     <div class="center">
-      <div >
+      <div>
         <el-form label-position="left">
-          <el-form-item  label-width='100px' label="用途" span="1" prop="purpose" class="readonly">
-            <ws-select disabled v-model="deptBudgetList.expensesPurpose" placeholder="" class="typeselect" >
-              <ws-option label="合同费用" value="1"
-                style="color: #8890b1" />
-                <ws-option label="运费" value="2"
-                style="color: #8890b1" />
-                <ws-option label="库点费用" value="3"
-                style="color: #8890b1" />
-                <ws-option label="经营性费用" value="5"
-                style="color: #8890b1" />
+          <el-form-item label-width='100px' label="用途" span="1" prop="purpose" class="readonly">
+            <ws-select disabled v-model="deptBudgetList.expensesPurpose" placeholder="" class="typeselect">
+              <ws-option label="合同费用" value="1" style="color: #8890b1" />
+              <ws-option label="运费" value="2" style="color: #8890b1" />
+              <ws-option label="库点费用" value="3" style="color: #8890b1" />
+              <ws-option label="经营性费用" value="5" style="color: #8890b1" />
             </ws-select>
           </el-form-item>
-          <el-form-item label-width='100px' v-if='deptBudgetList.expensesPurpose==1' label="类型" span="1" prop="contractNo" class="readonly">
-            <ws-select disabled v-model="deptBudgetList.costType" placeholder="" class="typeselect" >
-                <ws-option label="粮款" value="1" style="color: #8890b1" />
-                <ws-option label="非粮款" value="3" style="color: #8890b1" />
-                <ws-option label="保证金" value="5" style="color: #8890b1" />
+          <el-form-item label-width='100px' v-if='deptBudgetList.expensesPurpose == 1' label="类型" span="1"
+            prop="contractNo" class="readonly">
+            <ws-select disabled v-model="deptBudgetList.costType" placeholder="" class="typeselect">
+              <ws-option label="粮款" value="1" style="color: #8890b1" />
+              <ws-option label="非粮款" value="3" style="color: #8890b1" />
+              <ws-option label="保证金" value="5" style="color: #8890b1" />
             </ws-select>
           </el-form-item>
-          <el-form-item label-width='100px' v-if='deptBudgetList.purpose=="库点费用"' label="仓储费" span="1" prop="contractNo" class="readonly">
-            <span v-if='(deptBudgetList.storageFeeFlag==1)'>是</span>
-              <span v-if='(deptBudgetList.storageFeeFlag==0)'>否</span>
+          <!-- <el-form-item label-width='100px' v-if='deptBudgetList.purpose == "库点费用"' label="仓储费" span="1"
+            prop="contractNo" class="readonly">
+            <span v-if='(deptBudgetList.storageFeeFlag == 1)'>是</span>
+            <span v-if='(deptBudgetList.storageFeeFlag == 0)'>否</span>
+          </el-form-item> -->
+          <el-form-item label-width='100px' v-if='deptBudgetList.purpose == "库点费用"' label="是否自动分配" span="1"
+            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>
           </el-form-item>
-          <el-form-item v-if='deptBudgetList.expensesPurpose==3' label-width='100px' label="仓库名称" span="1" prop="warehouse" class="readonly">
-          {{deptBudgetList.warehouseName}}
+          <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>
           </el-form-item>
-          <el-form-item v-if='deptBudgetList.expensesPurpose==3' label-width='100px' label="类型" span="1" prop="warehouse" class="readonly">
-          {{deptBudgetList.wareExpenseType}}
+          <el-form-item v-if='deptBudgetList.expensesPurpose == 3' label-width='100px' label="仓库名称" span="1"
+            prop="warehouse" class="readonly">
+            {{ deptBudgetList.warehouseName }}
           </el-form-item>
-          <el-form-item v-if='deptBudgetList.expensesPurpose==1' label-width='100px' label="合同编号" span="1" prop="contractNo" class="readonly">
-          {{deptBudgetList.contractNo}}
+          <el-form-item v-if='deptBudgetList.expensesPurpose == 3' label-width='100px' label="类型" span="1"
+            prop="warehouse" class="readonly">
+            {{ deptBudgetList.wareExpenseType }}
+          </el-form-item>
+          <el-form-item v-if='deptBudgetList.expensesPurpose == 1' label-width='100px' label="合同编号" span="1"
+            prop="contractNo" class="readonly">
+            {{ deptBudgetList.contractNo }}
           </el-form-item>
           <el-form-item label-width='100px' label="费用名称" span="1" prop="settlementMethod">
-            {{deptBudgetList.expenseName}}
+            {{ deptBudgetList.expenseName }}
           </el-form-item>
           <el-form-item label-width='100px' label="付款方名头" span="1" prop="payerHeader" class="readonly">
-            {{deptBudgetList.payerHeader}}
+            {{ deptBudgetList.payerHeader }}
           </el-form-item>
           <el-form-item label-width='100px' label="金额（元）" span="1" prop="contractNo" class="readonly">
-            {{deptBudgetList.amountMoney}}
+            {{ deptBudgetList.amountMoney }}
           </el-form-item>
           <el-form-item label-width='100px' label="备注" span="1" prop="settlementMethod">
-            <el-input
-            disabled
-            type="textarea"
-            :rows="5"
-            placeholder="选填，不超过50个字"
-            v-model="deptBudgetList.remark">
+            <el-input disabled type="textarea" :rows="5" placeholder="选填，不超过50个字" v-model="deptBudgetList.remark">
             </el-input>
           </el-form-item>
           <el-form-item label-width='100px' label="附件">
-          <div v-if='srcList.length>0'>
-            <ws-upload :editable='false' ref="upload" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
-       />
-          </div>
-          <div v-else>暂无附件</div>
-        </el-form-item>
-        <div style='margin:20px -30px;font-weight:bold'>收款账户信息</div>
-        <el-form-item label-width='100px' label="收款方" span="1" prop="payee">
+            <div v-if='srcList.length > 0'>
+              <ws-upload :editable='false' ref="upload" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx"
+                :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size" />
+            </div>
+            <div v-else>暂无附件</div>
+          </el-form-item>
+          <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">
-            <el-input disabled class='input50 input_css' placeholder="输入账号" v-model="deptBudgetList.accountNumber"></el-input>
+            <el-input disabled class='input50 input_css' placeholder="输入账号"
+              v-model="deptBudgetList.accountNumber"></el-input>
           </el-form-item>
           <el-form-item label-width='100px' label="开户行" span="1" prop="bank">
             <el-input disabled class='input50 input_css' placeholder="输入开户行" v-model="deptBudgetList.bank"></el-input>
           </el-form-item>
           <el-form-item label-width='100px' label="开户支行" span="1" prop="bankBranch">
-            <el-input disabled class='input50 input_css' placeholder="输入开户支行" v-model="deptBudgetList.bankBranch"></el-input>
+            <el-input disabled class='input50 input_css' placeholder="输入开户支行"
+              v-model="deptBudgetList.bankBranch"></el-input>
           </el-form-item>
         </el-form>
         <!-- <div v-if='deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==3||deptBudgetList.expensesPurpose==2' style='width:90%;margin:10px auto;'>
@@ -135,59 +145,59 @@
           </el-table>
 
       </div> -->
-      <div v-if='deptBudgetList.expensesPurpose==2'>
+        <div v-if='deptBudgetList.expensesPurpose == 2'>
           <div v-for="item in deptBudgetList.tranTaskInfoList">
             <el-form label-position="left">
               <el-form-item label-width='100px' label="运输编号" span="1" prop="payee">
-                {{item.taskNo}}
+                {{ item.taskNo }}
               </el-form-item>
               <el-form-item label-width='100px' label="发货地" span="1" prop="accountNumber">
-              {{item.startPrivate}}{{item.startCity}}{{item.startArea}}{{item.startDetailedAddress}}
+                {{ item.startPrivate }}{{ item.startCity }}{{ item.startArea }}{{ item.startDetailedAddress }}
               </el-form-item>
               <el-form-item label-width='100px' label="收货地" span="1" prop="bank">
-                {{item.endPrivate}}{{item.endCity}}{{item.endArea}}{{item.endDetailedAddress}}
+                {{ item.endPrivate }}{{ item.endCity }}{{ item.endArea }}{{ item.endDetailedAddress }}
               </el-form-item>
             </el-form>
-            <el-table :data="item.tranSettlementReportList" style="width: 90%; margin: 20px auto; " ref="warehouseList" v-if='deptBudgetList.expensesPurpose==2' >
-          <el-table-column type="index" label="序号" width="50"></el-table-column>
-          <el-table-column class="table_td" prop="contractNo" width="120" label="合同编号"></el-table-column>
-          <el-table-column class="table_td" prop="startAddress" width="120" label="发货库"></el-table-column>
-          <el-table-column class="table_td" prop="createDate" width="120" label="发货时间"></el-table-column>
-          <el-table-column class="table_td" prop="carNo" label="车牌号" width="140"></el-table-column>
-          <el-table-column width="100" class="table_td" prop="loadingWeight" label="装车净重(吨)">
-          </el-table-column>
-          <el-table-column width="100" class="table_td" prop="unloadingWeight" label="卸车净重(吨)">
-          </el-table-column>
-          <el-table-column width="120" class="table_td" prop="transportDamage" label="公司承担运损">
-          </el-table-column>
-          <el-table-column width="100" class="table_td" prop="lossWeight" label="损耗(吨)">
-          </el-table-column>
-          <el-table-column width="120" class="table_td" prop="actualLoss" label="实际损耗">
-          </el-table-column>
-          <el-table-column width="120" class="table_td" prop="transportPrice" label="预计单价(元/吨)"></el-table-column>
-          <el-table-column width="120" class="table_td" prop="settlementPrice" label="结算单价(元/吨)">
-          </el-table-column>
-          <el-table-column width="120" class="table_td" prop="settlementWeight" label="结算重量(吨)"></el-table-column>
-          <el-table-column width="120" class="table_td" prop="cargoDamage" label="货损">
-          </el-table-column>
-          <el-table-column width="120" class="table_td" prop="deductionAmount" label="扣款(元)"></el-table-column>
-          <el-table-column width="100" class="table_td" label="服务费(元)" prop="serviceCharge">
-          </el-table-column>
-          <el-table-column width="100" class="table_td" label="实付金额(元)" prop="amountActuallyPaid"></el-table-column>
-          <el-table-column width="100" class="table_td" label="税点(元)" prop="taxPoint"></el-table-column>
-          <el-table-column width="100" class="table_td" label="合计应付(元)" prop="totalPayable"></el-table-column>
-          <el-table-column width="100" class="table_td" label="已付金额(元)" prop="amountEdPayable">
-          </el-table-column>
-          <el-table-column width="100" class="table_td" label="未付金额(元)" prop="amountNotPayable"></el-table-column>
-          <el-table-column width="100" class="table_td" label="已开发票(元)" prop="alreadyInvoice">
-          </el-table-column>
-          <el-table-column width="150" class="table_td" label="付款日期" prop="paymentDate"></el-table-column>
-            <el-table-column width="150" class="table_td" label="司机/车队" prop="name">
-              <template
-                slot-scope="scope">
-                {{ scope.row.name }}
-                <span v-if="scope.row.fleetFlag==1">(队)</span>
-              </template>
+            <el-table :data="item.tranSettlementReportList" style="width: 90%; margin: 20px auto; " ref="warehouseList"
+              v-if='deptBudgetList.expensesPurpose == 2'>
+              <el-table-column type="index" label="序号" width="50"></el-table-column>
+              <el-table-column class="table_td" prop="contractNo" width="120" label="合同编号"></el-table-column>
+              <el-table-column class="table_td" prop="startAddress" width="120" label="发货库"></el-table-column>
+              <el-table-column class="table_td" prop="createDate" width="120" label="发货时间"></el-table-column>
+              <el-table-column class="table_td" prop="carNo" label="车牌号" width="140"></el-table-column>
+              <el-table-column width="100" class="table_td" prop="loadingWeight" label="装车净重(吨)">
+              </el-table-column>
+              <el-table-column width="100" class="table_td" prop="unloadingWeight" label="卸车净重(吨)">
+              </el-table-column>
+              <el-table-column width="120" class="table_td" prop="transportDamage" label="公司承担运损">
+              </el-table-column>
+              <el-table-column width="100" class="table_td" prop="lossWeight" label="损耗(吨)">
+              </el-table-column>
+              <el-table-column width="120" class="table_td" prop="actualLoss" label="实际损耗">
+              </el-table-column>
+              <el-table-column width="120" class="table_td" prop="transportPrice" label="预计单价(元/吨)"></el-table-column>
+              <el-table-column width="120" class="table_td" prop="settlementPrice" label="结算单价(元/吨)">
+              </el-table-column>
+              <el-table-column width="120" class="table_td" prop="settlementWeight" label="结算重量(吨)"></el-table-column>
+              <el-table-column width="120" class="table_td" prop="cargoDamage" label="货损">
+              </el-table-column>
+              <el-table-column width="120" class="table_td" prop="deductionAmount" label="扣款(元)"></el-table-column>
+              <el-table-column width="100" class="table_td" label="服务费(元)" prop="serviceCharge">
+              </el-table-column>
+              <el-table-column width="100" class="table_td" label="实付金额(元)" prop="amountActuallyPaid"></el-table-column>
+              <el-table-column width="100" class="table_td" label="税点(元)" prop="taxPoint"></el-table-column>
+              <el-table-column width="100" class="table_td" label="合计应付(元)" prop="totalPayable"></el-table-column>
+              <el-table-column width="100" class="table_td" label="已付金额(元)" prop="amountEdPayable">
+              </el-table-column>
+              <el-table-column width="100" class="table_td" label="未付金额(元)" prop="amountNotPayable"></el-table-column>
+              <el-table-column width="100" class="table_td" label="已开发票(元)" prop="alreadyInvoice">
+              </el-table-column>
+              <el-table-column width="150" class="table_td" label="付款日期" prop="paymentDate"></el-table-column>
+              <el-table-column width="150" class="table_td" label="司机/车队" prop="name">
+                <template slot-scope="scope">
+                  {{ scope.row.name }}
+                  <span v-if="scope.row.fleetFlag == 1">(队)</span>
+                </template>
               </el-table-column>
             </el-table>
           </div>
@@ -196,283 +206,314 @@
           <el-button class="bg-bottom" type="primary" size="small" @click="reject()">驳回
           </el-button>
           <el-button class="bg-bottom" type="primary" size="small" @click="pass()">通过
-        </el-button>
+          </el-button>
         </div>
-    <el-dialog
-      :title="title"
-      :visible.sync="rejectshow"
-      width="30%"
-      :before-close="handleClose">
-      <span>{{title=='驳回'?'驳回审核':'通过审核'}}</span>
-      <div><el-input
-  type="textarea"
-  :rows="2"
-  placeholder="请输入审核意见"
-  v-model="textarea">
-</el-input>
-</div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="rejectshow = false">取 消</el-button>
-        <el-button type="primary" @click="rejectclick">确 定</el-button>
-      </span>
-    </el-dialog>
-    </div>
+        <el-dialog :title="title" :visible.sync="rejectshow" width="30%" :before-close="handleClose">
+          <span>{{ title== '驳回' ? '驳回审核' : '通过审核'}}</span>
+          <div><el-input type="textarea" :rows="2" placeholder="请输入审核意见" v-model="textarea">
+            </el-input>
+          </div>
+          <div>
+            <!-- .pdf, .doc, .docx, .xls, .xlsx -->
+            <ws-upload ref="upload" accept=".jpg, .jpeg, .png," :comp-id="compId" :appendix-ids="auditList" :limit="99"
+              :size-limit="size" @onChange="auditUrlChange" @uploadSuccess="uploadSuccess" />
+          </div>
+          <span slot="footer" class="dialog-footer">
+            <el-button @click="cancelShow">取 消</el-button>
+            <el-button type="primary" @click="rejectclick">确 定</el-button>
+          </span>
+        </el-dialog>
+      </div>
     </div>
   </div>
 </template>
 <script>
 import WsUpload from '@/components/WsUpload'
-  import {
-    woekflowhandle
-  } from '@/model/tasksport/index'
-  import {getcontract,getwarehouse,lookexenseinfo,editexenseinfo} from '@/model/profitable/index'
-  export default {
-    components: {
-      WsUpload,
-    },
-    data() {
-      return {
-        value: [],
-        profitList: [{
-          name: '玉米',
-          count: 2000,
-        }],
-        mode:'全部分配',
-        ware:'指定仓库',
-        dates:'固定日期',
-        moneys:'按重量自动分配',
-        goods:'全部货品',
-        goodsList:[],
-        compId:localStorage.getItem('ws-pf_compId'),
-        warecontractList:[],
-        textarea:'',
-        size:100,
-        title:'驳回',
-        feeDetailsDistributions:[{proDate:'',weight:'',money:'',warehouse:'',belonging:'',index:0}],
-        deptBudgetList:{},
-        makeWordData: {},
-        warehouseList:[],
-        rejectshow:false,
-        srcList:[],
-        // modeList:[{key:1,value:'全部分配'},{key:2,value:'部分分配'},{key:3,value:'暂不分配'}],
-        // wareList:[{key:1,value:'指定仓库'},{key:2,value:'全部仓库'}],
-        // datesList:[{key:1,value:'固定日期'},{key:2,value:'指定日期'}],
-        // moneysList:[{key:1,value:'按重量自动分配'},{key:2,value:'指定分配金额'}],
-        // goodsList:[{key:1,value:'全部货品'},{key:2,value:'指定货品'}],
-        valueData: [{
-            date: 10
-          },
-          {
-            date: 20
-          }
-        ], //货值
+import {
+  woekflowhandle
+} from '@/model/tasksport/index'
+import { getcontract, getwarehouse, lookexenseinfo, editexenseinfo } from '@/model/profitable/index'
+export default {
+  components: {
+    WsUpload,
+  },
+  data() {
+    return {
+      value: [],
+      profitList: [{
+        name: '玉米',
+        count: 2000,
+      }],
+      mode: '全部分配',
+      ware: '指定仓库',
+      dates: '固定日期',
+      moneys: '按重量自动分配',
+      goods: '全部货品',
+      goodsList: [],
+      compId: localStorage.getItem('ws-pf_compId'),
+      warecontractList: [],
+      textarea: '',
+      size: 100,
+      title: '驳回',
+      feeDetailsDistributions: [{ proDate: '', weight: '', money: '', warehouse: '', belonging: '', index: 0 }],
+      deptBudgetList: {},
+      makeWordData: {},
+      warehouseList: [],
+      rejectshow: false,
+      srcList: [],
+      // modeList:[{key:1,value:'全部分配'},{key:2,value:'部分分配'},{key:3,value:'暂不分配'}],
+      // wareList:[{key:1,value:'指定仓库'},{key:2,value:'全部仓库'}],
+      // datesList:[{key:1,value:'固定日期'},{key:2,value:'指定日期'}],
+      // moneysList:[{key:1,value:'按重量自动分配'},{key:2,value:'指定分配金额'}],
+      // goodsList:[{key:1,value:'全部货品'},{key:2,value:'指定货品'}],
+      valueData: [{
+        date: 10
+      },
+      {
+        date: 20
+      }
+      ], //货值
+      auditList: "",//审核附件
+      auditUrl: ""
 
+    }
+  },
+  activated() {
+    this.getList()
+  },
+  methods: {
+    cancelShow() {
+      this.rejectshow = false
+      this.auditList = [],//审核附件
+        this.auditUrl = ""
+    },
+    auditUrlChange() {//审核附件
+      this.$refs.upload
+        .handleSaveBill()
+        .then(async response => {
+          this.auditList = response
+          // this.deptBudgetList.addressUrl = response
+        })
+        .catch(res => {
+          EventBus.$emit('error', (JSON.parse(res) || {}).message)
+          this.$refs.upload.clearFiles()
+        })
+    },
+    // 上传附件
+    uploadSuccess(data, files) {
+      if (!this.auditUrl) {
+        this.auditUrl = data.appendixPath
+      } else {
+        this.auditUrl = this.auditUrl + "," + data.appendixPath
       }
     },
-    activated() {
-      this.getList()
+    handleClose() {
+      this.rejectshow = false
     },
-    methods: {
-      handleClose(){
-        this.rejectshow=false
-      },
-      pass(){
-         this.$confirm('确认通过请款信息？', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning'
-          })
-          .then(() => {
-            this.title='通过'
-            this.rejectshow=true
-            
-          })
-      },
-      returnsales(){
-        this.$router.go(-1)
-      },
-      reject(){
-        this.title='驳回'
-        this.rejectshow=true
-      },
-      rejectclick(){
-        if(this.title=='驳回'){
-          woekflowhandle({
-            taskId: this.deptBudgetList.taskId,
-            approved:false,
-            auditMind: this.textarea,
-            needReapply: true,
-          }).toPromise()
-          .then((response) => {
-            this.$message({
-              message: '驳回成功!',
-              type: 'success',
-            })
-            this.rejectshow=false
-            this.$router.go(-1)
-          }).catch((response) => {
-            this.$message({
-              message: '驳回失败!',
-              type: 'error',
-            })
-          })
-        }else{
-          woekflowhandle({
+    pass() {
+
+      this.title = '通过'
+      this.rejectshow = true
+    },
+    returnsales() {
+      this.$router.go(-1)
+    },
+    reject() {
+      this.title = '驳回'
+      this.rejectshow = true
+    },
+    rejectclick() {
+      this.$confirm('确认' + this.title + '请款信息？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+        .then(() => {
+          if (this.title == '驳回') {
+            woekflowhandle({
               taskId: this.deptBudgetList.taskId,
-              approved:true,
-              auditMind: this.textarea,
+              approved: false,
+              auditMind: this.textarea + "##" + this.auditUrl,
               needReapply: true,
             }).toPromise()
-            .then((response) => {
-              this.$message({
-                message: '通过成功!',
-                type: 'success',
+              .then((response) => {
+                this.$message({
+                  message: '驳回成功!',
+                  type: 'success',
+                })
+                this.rejectshow = false
+                this.$router.go(-1)
+              }).catch((response) => {
+                this.$message({
+                  message: '驳回失败!',
+                  type: 'error',
+                })
               })
-              this.$router.go(-1)
-            }).catch((response) => {
-              this.$message({
-                message: '通过失败!',
-                type: 'error',
+          } else {
+            woekflowhandle({
+              taskId: this.deptBudgetList.taskId,
+              approved: true,
+              auditMind: this.textarea + "##" + this.auditUrl,
+              needReapply: true,
+            }).toPromise()
+              .then((response) => {
+                this.$message({
+                  message: '通过成功!',
+                  type: 'success',
+                })
+                this.$router.go(-1)
+              }).catch((response) => {
+                this.$message({
+                  message: '通过失败!',
+                  type: 'error',
+                })
               })
-            })
-        }
-        
-      },
-      getList() {
-       getcontract({
-        compId:localStorage.getItem('ws-pf_compId'),
-        flag:11
-        }).toPromise()
+          }
+
+        })
+
+
+    },
+    getList() {
+      getcontract({
+        compId: localStorage.getItem('ws-pf_compId'),
+        flag: 11
+      }).toPromise()
         .then((response) => {
-          this.contractList=response
+          this.contractList = response
         })
-        getwarehouse({
-          compId:localStorage.getItem('ws-pf_compId'),
-          warehouseType:1
-        }).toPromise()
+      getwarehouse({
+        compId: localStorage.getItem('ws-pf_compId'),
+        warehouseType: 1
+      }).toPromise()
         .then((response) => {
-          this.warehouseList=response
+          this.warehouseList = response
         })
-        lookexenseinfo({
-         id:this.$route.query.id
-        }).toPromise()
+      lookexenseinfo({
+        id: this.$route.query.id
+      }).toPromise()
         .then((response) => {
-          if(response.costType==1){
-            response.type='粮款'
-          }else if(response.costType==3){
-            response.type='非粮款'
-          }else if(response.costType==5){
-            response.type='保证金'
+          if (response.costType == 1) {
+            response.type = '粮款'
+          } else if (response.costType == 3) {
+            response.type = '非粮款'
+          } else if (response.costType == 5) {
+            response.type = '保证金'
           }
-          this.deptBudgetList=response
-          this.deptBudgetList.taskId=this.$route.query.taskId 
-          if(response.addressUrl){
-            this.srcList=[]
+          this.deptBudgetList = response
+          this.deptBudgetList.taskId = this.$route.query.taskId
+          if (response.addressUrl) {
+            this.srcList = []
             // var srcs=response.addressUrl.split(',')
-          var arr=response.addressUrl.split(',')
-          for (let i = 0; i < arr.length; i++) {
-            if(arr[i]!=''){
-              this.srcList.push(arr[i])
+            var arr = response.addressUrl.split(',')
+            for (let i = 0; i < arr.length; i++) {
+              if (arr[i] != '') {
+                this.srcList.push(arr[i])
+              }
             }
           }
-          }
         })
 
-      },
     },
-  }
+  },
+}
 </script>
 <style lang="scss" scoped>
-  .container {
-    background: #E8ECF6;
-  }
+.container {
+  background: #E8ECF6;
+}
 
-  .center {
-    margin: 0 auto;
-    background: #ffffff;
-    height: calc(100vh - 13vh);
-    border-radius: 4px;
-    margin-top: 10px;
-    overflow:scroll;
-  }
+.center {
+  margin: 0 auto;
+  background: #ffffff;
+  height: calc(100vh - 13vh);
+  border-radius: 4px;
+  margin-top: 10px;
+  overflow: scroll;
+}
 
-  .row_top {
-    // background: #F6F7FC;
-    border-radius: 4px;
+.row_top {
+  // background: #F6F7FC;
+  border-radius: 4px;
 
-    .bg-left {
-      padding-left: 30px;
-    }
+  .bg-left {
+    padding-left: 30px;
+  }
 
   .bg-right {
-      padding-right: 10px;
-      text-align: right;
-      height:60px;
-      padding-top:15px;
-    }
+    padding-right: 10px;
+    text-align: right;
+    height: 60px;
+    padding-top: 15px;
+  }
 
-    .title {
-      position: relative;
-    }
+  .title {
+    position: relative;
+  }
 
-    .title::before {
-      content: '';
-      display: inline-block;
-      width: 5px;
-      height: 30px;
-      background: #5473e8;
-      position: absolute;
-      left: 0;
-    }
+  .title::before {
+    content: '';
+    display: inline-block;
+    width: 5px;
+    height: 30px;
+    background: #5473e8;
+    position: absolute;
+    left: 0;
   }
+}
 
-  .datascreen {
-    // margin-top: 10px;
-    width: 500px;
-    height: 60px;
-    line-height: 60px;
-    margin-left: 30px;
+.datascreen {
+  // margin-top: 10px;
+  width: 500px;
+  height: 60px;
+  line-height: 60px;
+  margin-left: 30px;
+
+}
 
+.chart_css {
+  display: flex;
+  height: 410px;
+
+  .table {
+    width: 70%;
+    height: 410px;
   }
 
-  .chart_css {
-    display: flex;
+  .makeWord_css {
+    width: 30%;
     height: 410px;
+    margin-left: 30px;
+  }
+}
 
-    .table {
-      width: 70%;
-      height: 410px;
-    }
+.table_css {
 
-    .makeWord_css {
-      width: 30%;
-      height: 410px;
-      margin-left: 30px;
-    }
-  }
+  text-align: center;
 
-  .table_css {
+}
 
-    text-align:center;
+/deep/.el-form {
+  width: 90%;
+  margin: 0 auto;
 
+  .el-form-item__label {
+    color: #8890B1;
   }
-  /deep/.el-form{
-    width:90%;
-    margin:0 auto;
-    .el-form-item__label{
-      color:#8890B1;
-    }
-  }
-  /deep/.el-form-item {
-    width: 50%;
 }
-/deep/.el-upload--picture-card{
+
+/deep/.el-form-item {
+  width: 50%;
+}
+
+/deep/.el-upload--picture-card {
   width: 100px;
-  height:100px;
-  line-height:100px;
+  height: 100px;
+  line-height: 100px;
 }
-/deep/.el-upload-list--picture-card .el-upload-list__item{
+
+/deep/.el-upload-list--picture-card .el-upload-list__item {
   width: 110px;
-  height:140px;
+  height: 140px;
 }
 </style>

src/views/profitable/coalCost.vue

@@ -0,0 +1,216 @@
+//煤款
+<template>
+    <div class="container">
+        <el-row class="row_top">
+            <el-col :span="12">
+                <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"
+                        height="10" style="vertion-align: bottom; margin-right: 3px"
+                        src="../../../public/img/lujing.png" alt="" />返回
+                </el-button>
+            </el-col>
+        </el-row>
+        <div class="center">
+            <!-- <el-input placeholder="可按费用名称、流向、经办人查找" class="input_css" v-model="searchKeyWord" clearable></el-input> -->
+            <el-select v-model="searchKeyWord" filterable placeholder="按仓库筛选" clearable @change="getList"
+                class="options_css">
+                <el-option label="全部仓库" value=""></el-option>
+                <el-option v-for="item in warehousNameList" :key="item.id" :label="item.warehouseName"
+                    :value="item.warehouseName"></el-option>
+            </el-select>
+            <el-table :data="tableData" stripe class="table_css" align="center">
+                <el-table-column type="index" label="序号" align="center">
+                    <template scope="scope">
+                        <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+                        <span v-else>{{ scope.$index + 1 }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="warehouseName" label="仓库名称"></el-table-column>
+                <el-table-column prop="distributableAmount" label="可分配金额（元）"></el-table-column>
+                <el-table-column prop="currentAverageAllocatedCost" label="当前平均分配成本（元/吨）"></el-table-column>
+                <el-table-column prop="costNo" label="请款记录">
+                    <template scope="scope">
+                        <el-link @click="lookCost(scope.row)" type="primary" :underline="false">查看</el-link>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </div>
+        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+            style="text-align: center" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
+            :total="deptBudgetTotal">
+        </el-pagination>
+        <el-dialog title="请款记录" :visible.sync="dialogVisible" width="550px" :before-close="handleClose">
+            <div>
+                <el-table :data="recordData" stripe class="table_css">
+                    <el-table-column prop="amountMoney" label="金额（元）" align="center"></el-table-column>
+                    <el-table-column prop="coalPrice" label="分配成本（元/吨）" align="center"></el-table-column>
+                    <el-table-column prop="paymentDate" label="付款日期" align="center"></el-table-column>
+                </el-table>
+                <el-pagination @size-change="handleSizeChange1" @current-change="handleCurrentChange1"
+                    :current-page="currentPage" style="text-align: center" :page-size="pageSize"
+                    layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal"></el-pagination>
+                <span slot="footer" class="dialog-footer">
+                    <el-button @click="handleClose">取 消</el-button>
+                    <!-- <el-button type="primary" @click="querenbazheng">确 定</el-button> -->
+                </span>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+<script>
+
+import { coalPayment, coalPaymentRecord } from '@/model/profitable/index'
+import { getwarehousName } from '@/model/warehouse/index'
+export default {
+    data() {
+        return {
+            tableData: [],
+            warehousNameList: [],
+            searchKeyWord: '',
+            dialogVisible: false,
+            deptBudgetTotal: 0,
+            currentPage: 1,
+            pageSize: 10,
+            recordData: [],
+            record: {
+                currentPage: 1,
+                pageSize: 10,
+            }
+        }
+    },
+    activated() {
+        this.getList()
+        this.xiala()
+    },
+    methods: {
+        getList() {
+            coalPayment({
+                searchKeyWord: this.searchKeyWord,
+                currentPage: this.currentPage,
+                pageSize: this.pageSize
+            }).toPromise().then((response) => {
+                this.tableData = response.records
+                this.deptBudgetTotal = response.total
+            })
+        },
+        lookCost(row) {
+            this.record.warehouseId = row.warehouseId
+            coalPaymentRecord(this.record).toPromise().then((response) => {
+                this.recordData = response.records
+                this.deptBudgetTotal1 = response.total
+            })
+            this.dialogVisible = true
+        },
+        handleClose() {
+            this.dialogVisible = false
+            this.recordData = []
+        },
+        xiala() {
+            //仓库筛选
+            getwarehousName({
+                compId: localStorage.getItem('ws-pf_compId'),
+            }).toPromise().then((response) => {
+                    this.warehousNameList = response
+            })
+        },
+        returnsales() {
+            this.$router.go(-1)
+        },
+        handleSizeChange(val) {
+            console.log(`每页 ${val} 条`)
+            this.pageSize = val
+            this.getList()
+        },
+        handleCurrentChange(val) {
+            this.currentPage = val
+            console.log(`当前页: ${val}`)
+            this.getList()
+        },
+        handleSizeChange1(val) {
+            console.log(`每页 ${val} 条`)
+            this.record.pageSize = val
+            this.lookCost(this.record)
+        },
+        handleCurrentChange1(val) {
+            this.record.currentPage = val
+            console.log(`当前页: ${val}`)
+            this.lookCost(this.record)
+        },
+    }
+}
+</script>
+<style lang="scss" scoped>
+.container {
+    background: #E8ECF6;
+}
+
+.center {
+    margin: 0 auto;
+    background: #ffffff;
+    // height: calc(100vh - 13vh);
+    border-radius: 4px;
+    padding: 20px 0;
+
+    /deep/.el-table td,
+    /deep/.el-table th {
+        text-align: center;
+    }
+}
+
+.options_css {
+    margin: 0 5px;
+}
+
+.row_top {
+    background: #f6f7fc;
+    border-radius: 4px;
+    margin-bottom: 10px;
+
+    .bg-left {
+        padding-left: 30px;
+    }
+
+    .bg-right {
+        padding-top: 15px;
+        padding-right: 10px;
+        text-align: right;
+    }
+
+    .title {
+        position: relative;
+    }
+
+    .title::before {
+        content: '';
+        display: inline-block;
+        width: 5px;
+        height: 30px;
+        background: #5473e8;
+        position: absolute;
+        left: 0;
+    }
+}
+
+.datascreen {
+    display: flex;
+
+    .data_css {
+        width: 40%;
+    }
+
+    .input_css {
+        width: 50%;
+        margin: 0 10px;
+    }
+
+    .find {
+        margin-right: 10px;
+    }
+}
+
+.table_css {
+    margin-top: 20px;
+}
+</style>

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

@@ -418,6 +418,23 @@ const profitableRouter = {
       },
     // 油费
     },
+    {
+      path: 'coalCost',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/coalCost'),
+      name: 'coalCost',
+      meta: {
+        title: 'coalCost',
+        shortcutEntrance: 'profitable',
+        module: 'lirunhesuan.feiyongguanli.view',
+        permissicon: [],
+        keepAlive: true,
+        _title:'燃料费'
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden:true,
+    // 煤费
+    },
     {
       path: 'oilcost',
       component: () =>

src/views/profitable/expensemanagementdetails.vue

@@ -23,36 +23,57 @@
         <el-col :span="18">
           <div class="datascreen">
             <!-- <el-input placeholder="可按费用名称、流向、经办人查找" class="input_css" v-model="searchKeyWord" clearable></el-input> -->
-            <el-select v-model="warehouseName"  filterable placeholder="按仓库筛选" clearable @change="getList1" class="options_css">
+            <el-select v-model="warehouseName" filterable placeholder="按仓库筛选" clearable @change="getList1"
+              class="options_css">
               <el-option label="全部仓库" value=""></el-option>
-              <el-option v-for="item in warehousNameList" :key="item.id" :label="item.warehouseName" :value="item.warehouseName"></el-option>
+              <el-option v-for="item in warehousNameList" :key="item.id" :label="item.warehouseName"
+                :value="item.warehouseName"></el-option>
             </el-select>
-            <el-select v-model="costNo" multiple filterable allow-create default-first-option placeholder="按编号筛选" clearable @change="getList1" class="options_css">
+            <!-- <el-select v-model="costNo" multiple filterable allow-create default-first-option placeholder="按编号筛选"
+              clearable @change="getList1" class="options_css">
               <el-option v-for="item in choiceObj" :key="item.id" :label="item.costNo" :value="item.costNo">
               </el-option>
-            </el-select>
-            <el-select v-model="purpose" multiple filterable allow-create default-first-option placeholder="按用途筛选" clearable  @change="getList1" class="options_css">
+            </el-select> -->
+            <el-input style="width: 255px;" class="options_css" v-model="searchKeyWord" placeholder="可按编号进行查找" clearable maxlength="500" type="input"
+           @keyup.enter.native="find()"></el-input>
+            <el-select v-model="purpose" multiple filterable allow-create default-first-option placeholder="按用途筛选"
+              clearable @change="getList1" class="options_css">
               <el-option v-for="item in costChoice" :key="item.id" :label="item.name" :value="item.name">
               </el-option>
             </el-select>
-            <el-select v-model="flowTo" multiple filterable allow-create default-first-option placeholder="按流向筛选" clearable  @change="getList1" class="options_css">
+            <!-- <el-select v-model="flowTo" multiple filterable allow-create default-first-option placeholder="按流向筛选"
+              clearable @change="getList1" class="options_css">
               <el-option v-for="item in flowToList" :key="item.id" :label="item.flowTo" :value="item.flowTo">
               </el-option>
-            </el-select>
-            
-            <el-select v-model="expenseName" multiple filterable allow-create default-first-option placeholder="按费用名称筛选" clearable  @change="getList1" class="options_css">
-              <el-option v-for="item in costNameList" :key="item.id" :label="item.expenseName" :value="item.expenseName">
+            </el-select> -->
+            <el-input style="width: 255px;" class="options_css" v-model="flowTo" placeholder="可按流向进行查找" clearable maxlength="500" type="input"
+           @keyup.enter.native="find()"></el-input>
+
+            <!-- <el-select v-model="expenseName" multiple filterable allow-create default-first-option placeholder="按费用名称筛选"
+              clearable @change="getList1" class="options_css">
+              <el-option v-for="item in costNameList" :key="item.id" :label="item.expenseName"
+                :value="item.expenseName">
               </el-option>
-            </el-select>
-            <el-select v-model="unallocatedAmount" multiple filterable allow-create default-first-option placeholder="按未分配金额筛选" clearable  @change="getList1" class="options_css">
-              <el-option v-for="item in moneyList" :key="item.id" :label="item.unallocatedAmount" :value="item.unallocatedAmount">
+            </el-select> -->
+            <el-input style="width: 280px;" class="options_css" v-model="expenseName" placeholder="可按费用名称进行查找" clearable maxlength="500" type="input"
+           @keyup.enter.native="find()"></el-input>
+            <!-- <el-select v-model="unallocatedAmount" multiple filterable allow-create default-first-option
+              placeholder="按未分配金额筛选" clearable @change="getList1" class="options_css">
+              <el-option v-for="item in moneyList" :key="item.id" :label="item.unallocatedAmount"
+                :value="item.unallocatedAmount">
               </el-option>
-            </el-select> 
-            <el-select v-model="agent" multiple filterable allow-create default-first-option placeholder="按经办人筛选" clearable  @change="getList1" class="options_css">
+            </el-select> -->
+          <el-select v-model="unallocatedAmount" filterable placeholder="" @change="unallocatedAmountChange" 
+            style="margin: 0 10px;width:200px">
+            <el-option key="全部金额" label="全部金额" value="" style="color: #8890b1" />
+            <el-option key="未分配金额大于0" label="未分配金额大于0" value="1" style="color: #8890b1" />
+          </el-select>
+            <el-select v-model="agent" multiple filterable allow-create default-first-option placeholder="按经办人筛选"
+              clearable @change="getList1" class="options_css">
               <el-option v-for="item in personList" :key="item.id" :label="item.agent" :value="item.agent">
               </el-option>
             </el-select>
-            <el-select v-model="toExamineType"  filterable  clearable @change="getList1" class="options_css">
+            <el-select v-model="toExamineType" filterable clearable @change="getList1" class="options_css">
               <el-option label="全部状态" value=""></el-option>
               <el-option label="待审核" value="1"></el-option>
               <el-option label="待付款" value="2"></el-option>
@@ -60,7 +81,8 @@
             <!-- <el-select v-model="deptBudgetList.otherPersonPhone" placeholder="请选择其他驻库人员，可选多人"  allow-create default-first-option @change="selectstaffOther" multiple filterable clearable>
             <el-option v-for="item in optionsOther" :key="item.staffMobilePhone" :label="item.staffName" :value="item.staffMobilePhone" />
           </el-select> -->
-            <el-button class="find" type="primary" @click="find()"><img width="16" height="16" style="left: -8px" src="../../../public/img/sousuo.png" alt="" /></el-button>
+            <el-button class="find" type="primary" @click="find()"><img width="16" height="16" style="left: -8px"
+                src="../../../public/img/sousuo.png" alt="" /></el-button>
           </div>
         </el-col>
       </el-row>
@@ -78,7 +100,8 @@
           <el-button @click="costChange(2)" :type="expensesPurpose == 2 ? 'primary' : ''">运费</el-button>
           <el-button @click="exportFile" type="primary">导出</el-button>
         </el-col>
-        <el-col style="text-align: right" :span="6">
+        <el-col style="text-align: right;display: flex;" :span="6">
+          <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>
@@ -120,6 +143,8 @@
                 <span v-else>-非粮款</span>
               </div>
               <div v-else-if="scope.row.expensesPurpose == 5">经营性费用</div>
+              <div v-else-if="scope.row.expensesPurpose == 7">备用金</div>
+              
               <div v-else>{{ scope.row.costType }}</div>
             </template>
           </el-table-column>
@@ -131,7 +156,7 @@
               <div v-else-if="scope.row.expensesPurpose == 3">
                 <span>{{ scope.row.warehouseName }}</span>
               </div>
-              <div v-else-if="scope.row.expensesPurpose == 5">中天昊元</div>
+              <div v-else-if="scope.row.expensesPurpose == 5 || scope.row.expensesPurpose == 7 ">中天昊元</div>
               <div v-else-if="scope.row.expensesPurpose == 2">
                 {{ scope.row.contractNo }}
               </div>
@@ -152,9 +177,9 @@
                 src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
               <span v-if="scope.row.addressUrlArray != null">
                 {{
-                    scope.row.addressUrlArray.length == 0
-                      ? ''
-                      : scope.row.addressUrlArray.length
+                  scope.row.addressUrlArray.length == 0
+                    ? ''
+                    : scope.row.addressUrlArray.length
                 }}
               </span>
             </template>
@@ -164,20 +189,20 @@
           <el-table-column prop="status" label="费用状态" width="100">
             <template slot-scope="scope">
               <span v-if="scope.row.approveStatus">{{
-                  scope.row.approveStatus
+                scope.row.approveStatus
               }}</span><span v-else>{{ scope.row.status }}</span>
               <i @click="handlerecord(scope.row)" class="el-icon-s-claim"></i>
             </template>
           </el-table-column>
           <el-table-column prop="address" label="操作" width="300">
             <template slot-scope="scope">
-              <el-button v-if="scope.row.expenseName!='保证金抵粮款'" @click="look(scope.row)" type="primary">查看</el-button>
+              <el-button v-if="scope.row.expenseName != '保证金抵粮款'" @click="look(scope.row)" type="primary">查看</el-button>
               <div v-hasPermission="`lirunhesuan.feiyongguanli.queshou`" style="display: inline-block">
                 <el-button v-if="
-                  scope.row.status == '待确认' &&scope.row.expenseName!='保证金抵粮款'
+                  scope.row.status == '待确认' && scope.row.expenseName != '保证金抵粮款'
                 " @click="shoukuanqueren(scope.row)" type="primary">确认</el-button>
                 <el-button v-if="
-                  scope.row.status == '待确认'&&scope.row.expenseName=='保证金抵粮款'
+                  scope.row.status == '待确认' && scope.row.expenseName == '保证金抵粮款'
                 " @click="shoukuanqueren1(scope.row)" type="primary">确认</el-button>
               </div>
               <!-- <el-button v-if='scope.row.approveStatus=="待确认"' @click="accomplish(scope.row)" type="primary">完成</el-button> -->
@@ -192,8 +217,10 @@
                   scope.row.status == '已付款' &&
                   !scope.row.approveStatus)
               " @click="accomplish(scope.row)" type="primary">完成</el-button>
-              <el-button v-if="scope.row.approveStatus && scope.row.approveStatus !='发起人撤回' " v-show="scope.row.showFlag"  @click="withdraw(scope.row)" type="primary">撤回</el-button>
-              <el-button v-if="scope.row.status == '已驳回' || scope.row.approveStatus == '发起人撤回'" @click="edit(scope.row)" type="primary">编辑</el-button>
+              <el-button v-if="scope.row.approveStatus && scope.row.approveStatus != '发起人撤回'"
+                v-show="scope.row.showFlag" @click="withdraw(scope.row)" type="primary">撤回</el-button>
+              <el-button v-if="scope.row.status == '已驳回' || scope.row.approveStatus == '发起人撤回'" @click="edit(scope.row)"
+                type="primary">编辑</el-button>
               <el-button v-if="
                 (!scope.row.distributionStatus &&
                   scope.row.expensesPurpose == 1 &&
@@ -213,9 +240,13 @@
                   scope.row.unallocatedAmount > 0)
               " @click="allot(scope.row)" type="primary">分配</el-button>
               <!-- <el-button v-if='scope.row.approveStatus=="已驳回"' @click="del(0,scope.row)" type="primary">删除</el-button> -->
-              <el-button v-if='scope.row.status=="已驳回" ||scope.row.approveStatus =="发起人撤回" ' @click="del(0,scope.row)" type="danger">删除</el-button>
-              <el-button v-if='scope.row.approveStatus=="待财务审核"||scope.row.approveStatus=="待杜大光审核"||scope.row.approveStatus=="待决策人审核"||scope.row.approveStatus=="待内勤审核"||scope.row.approveStatus=="待单证中心审核"' @click="aduit(scope.row)" type="primary">审核</el-button>
-              <el-button v-if='!scope.row.approveStatus&&scope.row.expensesType==2&&scope.row.status=="待付款"' @click="payment(scope.row)" type="primary">付款</el-button>
+              <el-button v-if='scope.row.status == "已驳回" || scope.row.approveStatus == "发起人撤回"' @click="del(0, scope.row)"
+                type="danger">删除</el-button>
+              <el-button
+                v-if='scope.row.approveStatus == "待财务审核" || scope.row.approveStatus == "待杜大光审核" || scope.row.approveStatus == "待决策人审核" || scope.row.approveStatus == "待内勤审核" || scope.row.approveStatus == "待单证中心审核"'
+                @click="aduit(scope.row)" type="primary">审核</el-button>
+              <el-button v-if='!scope.row.approveStatus && scope.row.expensesType == 2 && scope.row.status == "待付款"'
+                @click="payment(scope.row)" type="primary">付款</el-button>
             </template>
           </el-table-column>
           <el-table-column prop="expenseRemarks" label="分配状态">
@@ -265,11 +296,11 @@
           </div>
           <div style="width: 33.333%; text-align: center">
             {{
-                statusdata.expensesType != 1
-                  ? item.approveResult == 1
-                    ? '通过'
-                    : item.approveResult == 0?'驳回':item.dealMsg
-                  : item.dealMsg
+              statusdata.expensesType != 1
+                ? item.approveResult == 1
+                  ? '通过'
+                  : item.approveResult == 0 ? '驳回' : item.dealMsg
+                : item.dealMsg
             }}
           </div>
           <div style="width: 33.333%; text-align: right">
@@ -277,10 +308,10 @@
           </div>
         </div>
         <div v-if="index < recordList.length - 1" style="width: 100%; text-align: left">
-          审核意见：{{ item.verifyRemark }}
+          审核意见：{{item.verifyRemark?item.verifyRemark.split('##')[0]:""}}
         </div>
         <div v-else style="width: 100%; text-align: left">
-          审核意见：{{ item.verifyRemark }}
+          审核意见：{{item.verifyRemark?item.verifyRemark.split('##')[0]:""}}
         </div>
       </div>
     </el-dialog>
@@ -288,21 +319,16 @@
       <ws-upload ref="upload" @onChange="onChange1" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx"
         :comp-id="compId" :appendix-ids="appendixIdss" :size-limit="size" />
     </WinseaContentModal>
-    <el-dialog
-  title="确认保证金抵粮款信息"
-  :visible.sync="dialogVisible"
-  width="30%"
-  :before-close="handleClose">
-  <div>
-    <ws-upload ref="upload1" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx"
-    @onChange="onChange" :comp-id="compId" :appendix-ids="appendixIdss1" :size-limit="size" />
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="dialogVisible = false">取 消</el-button>
-      <el-button type="primary" @click="querenbazheng">确 定</el-button>
-    </span> 
-  </div>
- 
-</el-dialog>
+    <el-dialog title="确认保证金抵粮款信息" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
+      <div>
+        <ws-upload ref="upload1" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx" @onChange="onChange"
+          :comp-id="compId" :appendix-ids="appendixIdss1" :size-limit="size" />
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="dialogVisible = false">取 消</el-button>
+          <el-button type="primary" @click="querenbazheng">确 定</el-button>
+        </span>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -319,13 +345,17 @@ import {
   getXialaList,
   sponsorWithdraw,
   exportFile,
-  getcostNo,
+  // getcostNo,
   editfujian
 } from '@/model/profitable/index'
-import { getwarehousName} from '@/model/warehouse/index'
 import {
-    downloadFile
-  } from '@/utils/batchDown'
+    getwarehouse
+  } from '@/model/houseSelfCollect/index'
+import { getwarehousName } from '@/model/warehouse/index'
+import {
+  downloadFile
+} from '@/utils/batchDown'
+import { split } from 'lodash'
 export default {
   components: {
     WsUpload,
@@ -338,23 +368,27 @@ export default {
       deptBudgetTotal: 0,
       currentPage: 1,
       pageSize: 10,
-      showFlag:false,
+      showFlag: false,
       size: 100,
       expensesPurpose: '',
       recordList: [],
-      dialogVisible:false,
-      toExamineType:'',
+      dialogVisible: false,
+      toExamineType: '',
       compId: localStorage.getItem('ws-pf_compId'),
       dialogVisible1: false,
       deptCircularPage: {},
       searchType: '',
       searchKeyWord: '',
+      expenseName: '',//费用名称
       costNo: [],//编号
-      purpose:[],//用途
-      flowTo:[],//流向
-      expenseName:[],//费用名称
-      unallocatedAmount:[],//未分配金额(元)
-      agent:[],//经办人
+      purpose: [],//用途
+      // flowTo: [],//流向
+      flowTo: '',//流向
+      flowFlag:'',
+      // expenseName: [],//费用名称
+      // unallocatedAmount: [],//未分配金额(元)
+      unallocatedAmount:'',//未分配金额(元)
+      agent: [],//经办人
       startDate: '',
       endDate: '',
       title: '附件',
@@ -362,11 +396,11 @@ export default {
       outtotal: 0,
       intotal: 0,
       fujianshow: false,
-      statusdata:{},
+      statusdata: {},
       appendixIdss: [],
-      appendixIdss1:'',
+      appendixIdss1: '',
       approveStatus: false,
-      currectdata:{},
+      currectdata: {},
       choiceObj: [],
       costChoice: [
         {
@@ -376,7 +410,7 @@ export default {
         {
           name: '库点费用',
           id: 2
-        }, 
+        },
         {
           name: '经营性费用',
           id: 3
@@ -390,13 +424,13 @@ export default {
           id: 5
         }
       ],
-      addressUrl:'',
-      flowToList:[],
-      costNameList:[],
-      moneyList:[],
-      personList:[],
-      warehousNameList:[],
-      warehouseName:''
+      addressUrl: '',
+      flowToList: [],
+      costNameList: [],
+      moneyList: [],
+      personList: [],
+      warehousNameList: [],
+      warehouseName: ''
     }
   },
   activated() {
@@ -405,38 +439,38 @@ export default {
     this.xiala()
   },
   methods: {
-    async exportFile(){
-        let _data = {
-          // expenseInfoExportList:this.choiceObj,
-          compId: localStorage.getItem('ws-pf_compId'),
-          startDate: this.startDate,
-          endDate: this.endDate,
-          searchKeyWord: this.searchKeyWord,
-          currentPage: this.currentPage,
-          pageSize: 9999,
-          searchType: this.searchType,
-          expensesPurpose: this.expensesPurpose,
-          costNo:this.costNo.length>0?this.costNo.toString():'',
-          purpose:this.purpose.length>0?this.purpose.toString():'',
-          expenseName:this.expenseName.length>0?this.expenseName.toString():'',
-          unallocatedNumber:this.unallocatedAmount.length>0?this.unallocatedAmount.toString():'',
-          agent:this.agent.length>0?this.agent.toString():'',
-          flowTo:this.flowTo.length>0?this.flowTo.toString():'',
-          warehouseName:this.warehouseName,
-          toExamineType:this.toExamineType
-        }
-        const {
-          data
-        } = await exportFile(
-          _data, {}, {
-            responseType: 'blob',
-          }
-        ).toPromise()
-        downloadFile({
-          res: data,
-          fileName: `费用明细`,
-          type: 'xls',
-        })
+    async exportFile() {
+      let _data = {
+        // expenseInfoExportList:this.choiceObj,
+        compId: localStorage.getItem('ws-pf_compId'),
+        startDate: this.startDate,
+        endDate: this.endDate,
+        searchKeyWord: this.searchKeyWord,
+        currentPage: this.currentPage,
+        pageSize: 9999,
+        searchType: this.searchType,
+        expensesPurpose: this.expensesPurpose,
+        costNo: this.costNo.length > 0 ? this.costNo.toString() : '',
+        purpose: this.purpose.length > 0 ? this.purpose.toString() : '',
+        expenseName: this.expenseName.length > 0 ? this.expenseName.toString() : '',
+        unallocatedNumber: this.unallocatedAmount.length > 0 ? this.unallocatedAmount.toString() : '',
+        agent: this.agent.length > 0 ? this.agent.toString() : '',
+        flowTo: this.flowTo.length > 0 ? this.flowTo.toString() : '',
+        warehouseName: this.warehouseName,
+        toExamineType: this.toExamineType
+      }
+      const {
+        data
+      } = await exportFile(
+        _data, {}, {
+        responseType: 'blob',
+      }
+      ).toPromise()
+      downloadFile({
+        res: data,
+        fileName: `费用明细`,
+        type: 'xls',
+      })
     },
     withdraw(row) {
       this.$confirm(`撤回成功后，可再次提交，确定撤回吗？`, {
@@ -454,62 +488,65 @@ export default {
           })
       })
     },
-    xiala(){
+    unallocatedAmountChange(e){
+      this.getList()
+    },
+    xiala() {
       //仓库筛选
-      getwarehousName({
+    getwarehouse({
         compId: localStorage.getItem('ws-pf_compId'),
       })
         .toPromise()
         .then((response) => {
           this.warehousNameList = response
         })
-       //搜索框下拉数据
-       getcostNo({
-        compId: localStorage.getItem('ws-pf_compId'),
-        // currentPage: 1,
-        // pageSize: 9999,
-      })
-        .toPromise()
-        .then((response) => {
-          this.choiceObj = response
-        })
-         //流向
-         getXialaList({
-        removeRepeatFlag: 1,
-      })
-        .toPromise()
-        .then((response) => {
-          this.flowToList = response
-          for(let i = 0 ;i<this.flowToList.length;i++){
-            if(this.flowToList[i].expensesPurpose == 3){
-              this.flowToList[i].flowTo = this.flowToList[i].warehouseName
-            }else if(this.flowToList[i].expensesPurpose == 1){
-              this.flowToList[i].flowTo = this.flowToList[i].contractNo
-            }else if(this.flowToList[i].expensesPurpose == 5){
-              this.flowToList[i].flowTo = '中天昊元'
-            }else if(this.flowToList[i].expensesPurpose == 2){
-              this.flowToList[i].flowTo = this.flowToList[i].contractNo
-            }
-          }
-        })
+      // //搜索框下拉数据
+      // getcostNo({
+      //   compId: localStorage.getItem('ws-pf_compId'),
+      //   // currentPage: 1,
+      //   // pageSize: 9999,
+      // })
+      //   .toPromise()
+      //   .then((response) => {
+      //     this.choiceObj = response
+      //   })
+      //流向
+      // getXialaList({
+      //   removeRepeatFlag: 1,
+      // })
+      //   .toPromise()
+      //   .then((response) => {
+      //     this.flowToList = response
+      //     for (let i = 0; i < this.flowToList.length; i++) {
+      //       if (this.flowToList[i].expensesPurpose == 3) {
+      //         this.flowToList[i].flowTo = this.flowToList[i].warehouseName
+      //       } else if (this.flowToList[i].expensesPurpose == 1) {
+      //         this.flowToList[i].flowTo = this.flowToList[i].contractNo
+      //       } else if (this.flowToList[i].expensesPurpose == 5) {
+      //         this.flowToList[i].flowTo = '中天昊元'
+      //       } else if (this.flowToList[i].expensesPurpose == 2) {
+      //         this.flowToList[i].flowTo = this.flowToList[i].contractNo
+      //       }
+      //     }
+      //   })
       //费用名称
+      // getXialaList({
+      //   removeRepeatFlag: 2,
+      // })
+      //   .toPromise()
+      //   .then((response) => {
+      //     this.costNameList = response
+      //   })
+      // //未分配金额
+      // getXialaList({
+      //   removeRepeatFlag: 3,
+      // })
+      //   .toPromise()
+      //   .then((response) => {
+      //     this.moneyList = response
+      //   })
+      //经办人
       getXialaList({
-        removeRepeatFlag: 2,
-      })
-        .toPromise()
-        .then((response) => {
-          this.costNameList = response
-        })
-          //未分配金额
-          getXialaList({
-        removeRepeatFlag: 3,
-      })
-        .toPromise()
-        .then((response) => {
-          this.moneyList = response
-        })
-           //经办人
-           getXialaList({
         removeRepeatFlag: 4,
       })
         .toPromise()
@@ -518,64 +555,64 @@ export default {
         })
 
     },
-    querenbazheng(){
-    if(this.addressUrl){
-      this.currectdata.addressUrl=this.currectdata.addressUrl+','+this.addressUrl
-    }
-    this.currectdata.flag=7
-  console.log(this.addressUrl,this.currectdata)
-    editexenseinfo(this.currectdata)
-      .toPromise()
-      .then((response) => {
-        this.$message({
-          message: '提交成功!',
-          type: 'success',
+    querenbazheng() {
+      if (this.addressUrl) {
+        this.currectdata.addressUrl = this.currectdata.addressUrl + ',' + this.addressUrl
+      }
+      this.currectdata.flag = 7
+      console.log(this.addressUrl, this.currectdata)
+      editexenseinfo(this.currectdata)
+        .toPromise()
+        .then((response) => {
+          this.$message({
+            message: '提交成功!',
+            type: 'success',
+          })
+          this.dialogVisible = false
+          this.getList()
+          // this.$router.go(-1)
         })
-        this.dialogVisible=false
-        this.getList()
-        // this.$router.go(-1)
-      })
     },
-    getList1(){
+    getList1() {
       console.log(this.toExamineType)
-      this.currentPage=1
+      this.currentPage = 1
       this.getList()
     },
     onChange() {
-        this.$refs.upload1
-          .handleSaveBill()
-          .then(async response => {
-            this.addressUrl = response
-          })
-          .catch(res => {
-            EventBus.$emit('error', (JSON.parse(res) || {}).message)
-            this.$refs.upload1.clearFiles()
-          })
-      },
-      onChange1() {
-        this.$refs.upload
-          .handleSaveBill()
-          .then(async (response) => {
-            editfujian({addressUrl:response,id:this.id})
-              .toPromise()
-              .then((response) => {
-                this.fujianshow = false
-                this.$message.success('上传成功')
-                this.getList()
-              })
-          })
-          .catch((res) => {
-            EventBus.$emit('error', (JSON.parse(res) || {}).message)
-            this.$refs.upload.clearFiles()
-          })
-      },
+      this.$refs.upload1
+        .handleSaveBill()
+        .then(async response => {
+          this.addressUrl = response
+        })
+        .catch(res => {
+          EventBus.$emit('error', (JSON.parse(res) || {}).message)
+          this.$refs.upload1.clearFiles()
+        })
+    },
+    onChange1() {
+      this.$refs.upload
+        .handleSaveBill()
+        .then(async (response) => {
+          editfujian({ addressUrl: response, id: this.id })
+            .toPromise()
+            .then((response) => {
+              this.fujianshow = false
+              this.$message.success('上传成功')
+              this.getList()
+            })
+        })
+        .catch((res) => {
+          EventBus.$emit('error', (JSON.parse(res) || {}).message)
+          this.$refs.upload.clearFiles()
+        })
+    },
     handlerecord(row) {
       if (row.expensesType == 1) {
         this.title1 = '收款审核记录'
       } else {
         this.title1 = '请款审核记录'
       }
-      this.statusdata=row
+      this.statusdata = row
       getAuditRecord({ id: row.id, workflowId: row.workflowId })
         .toPromise()
         .then((response) => {
@@ -594,8 +631,8 @@ export default {
       this.id = row.id
 
       // if (row.addressUrl) {
-        this.appendixIdss = row.addressUrl
-        this.fujianshow = true
+      this.appendixIdss = row.addressUrl
+      this.fujianshow = true
       // } else {
       //   this.$message({
       //     message: '暂无附件查看!',
@@ -730,6 +767,9 @@ export default {
     oilcost() {
       this.$router.push({ name: 'oilcost' })
     },
+    coalCost(){
+      this.$router.push({ name: 'coalCost' })
+    },
     expenseedit(row) {
       if (
         localStorage.getItem('ws-pf_roleName') == '销售内勤' ||
@@ -760,9 +800,9 @@ export default {
         })
       }
     },
-    shoukuanqueren1(row){
-      this.currectdata=row
-      this.dialogVisible=true
+    shoukuanqueren1(row) {
+      this.currectdata = row
+      this.dialogVisible = true
     },
     aduit(row) {
       if (row.taskId) {
@@ -785,7 +825,7 @@ export default {
       }
     },
     allotaduit(row) {
-      var role=allRoles()
+      var role = allRoles()
       if (role.roleName.indexOf('单证中心主任') != -1) {
         localStorage.setItem(
           'expenseqr',
@@ -810,9 +850,9 @@ export default {
       }
     },
     allot(row) {
+      var role = allRoles()
       if (
-        localStorage.getItem('ws-pf_roleName') == '销售内勤' ||
-        localStorage.getItem('ws-pf_roleName') == '采购内勤'
+        role.roleName.indexOf('销售内勤') != -1||role.roleName.indexOf('采购内勤') != -1
       ) {
         this.$router.push({ name: 'expenseallot', query: { id: row.id } })
       } else {
@@ -860,14 +900,20 @@ export default {
         }
         this.startDate = year + '-' + month + '-' + strDate
         this.endDate = year1 + '-' + month1 + '-' + strDate1
-      }else{
+      } else {
         this.startDate = localStorage.getItem('startDate')
         this.endDate = localStorage.getItem('endDate')
       }
       this.value = [this.startDate, this.endDate]
     },
     getList() {
-      this.getfielfillingList()
+      if(this.flowTo == '中天昊元'){
+        this.flowFlag = 1
+        this.flowTo = ''
+      }else{
+        this.flowFlag = ''
+      }
+      // this.getfielfillingList()
       getexenseinfo({
         // warehouseType: 1,
         compId: localStorage.getItem('ws-pf_compId'),
@@ -876,18 +922,21 @@ export default {
         startDate: localStorage.getItem('startDate'),
         endDate: localStorage.getItem('endDate'),
         searchKeyWord: this.searchKeyWord,
+        expenseName:this.expenseName,
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         searchType: this.searchType,
         expensesPurpose: this.expensesPurpose,
-        costNo:this.costNo.length>0?this.costNo.toString():'',
-        purpose:this.purpose.length>0?this.purpose.toString():'',
-        expenseName:this.expenseName.length>0?this.expenseName.toString():'',
-        unallocatedNumber:this.unallocatedAmount.length>0?this.unallocatedAmount.toString():'',
-        agent:this.agent.length>0?this.agent.toString():'',
-        flowTo:this.flowTo.length>0?this.flowTo.toString():'',
-        warehouseName:this.warehouseName,
-        toExamineType:this.toExamineType,
+        costNo: this.costNo.length > 0 ? this.costNo.toString() : '',
+        purpose: this.purpose.length > 0 ? this.purpose.toString() : '',
+        // expenseName: this.expenseName.length > 0 ? this.expenseName.toString() : '',
+        unallocatedNumber: this.unallocatedAmount.length > 0 ? this.unallocatedAmount.toString() : '',
+        agent: this.agent.length > 0 ? this.agent.toString() : '',
+        flowTo: this.flowTo,
+        flowFlag:this.flowFlag,
+        unallocatedAmount:this.unallocatedAmount,
+        warehouseName: this.warehouseName,
+        toExamineType: this.toExamineType,
       })
         .toPromise()
         .then((response) => {
@@ -928,7 +977,7 @@ export default {
     },
     pickerOptions() { },
     find() {
-      this.currentPage=1
+      this.currentPage = 1
       this.getList()
     },
     handleSizeChange(val) {
@@ -1026,7 +1075,8 @@ export default {
 .bg-right {
   padding-top: 15px;
 }
-.options_css{
-  margin:0 5px;
+
+.options_css {
+  margin: 0 5px;
 }
 </style>

src/views/profitable/expensemanagentlook.vue

@@ -27,9 +27,20 @@
               <span v-if='deptBudgetList.costType==3'>非粮款</span>
               <span v-if='deptBudgetList.costType==5'>保证金</span>
           </el-form-item>
-          <el-form-item label-width='100px' v-if='deptBudgetList.purpose=="库点费用"' label="仓储费" span="1" prop="contractNo" class="readonly">
+          <!-- <el-form-item label-width='100px' v-if='deptBudgetList.purpose=="库点费用"' label="仓储费" span="1" prop="contractNo" class="readonly">
             <span v-if='(deptBudgetList.storageFeeFlag==1)'>是</span>
               <span v-if='(deptBudgetList.storageFeeFlag==0)'>否</span>
+          </el-form-item> -->
+          <el-form-item label-width='100px' v-if='deptBudgetList.purpose == "库点费用"' label="是否自动分配" span="1"
+            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>
+          </el-form-item>
+          <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>
           </el-form-item>
           <el-form-item v-if='deptBudgetList.expensesPurpose==3' label-width='100px' label="仓库名称" span="1" prop="warehouseName" class="readonly">
           {{deptBudgetList.warehouseName}}

src/views/profitable/oilcost.vue

@@ -20,7 +20,8 @@
           <div style="flex-direction: row-reverse;" class="datascreen">
              <el-button class="find" type="primary" @click="find()"><img width="16" height="16" style="left: -8px;"
                 src="../../../public/img/sousuo.png" alt="" /></el-button>
-            <el-input placeholder="可按司机名、车牌号查找" class="input_css" v-model="searchKeyWord" clearable></el-input>
+            <el-input placeholder="可按司机名、车牌号查找" v-if="strokeType == 1" class="input_css" v-model="searchKeyWord" clearable></el-input>
+            <el-input placeholder="可按仓库名查找" v-if="strokeType == 3" class="input_css" v-model="searchKeyWord" clearable></el-input>
           </div>
         </el-col>
       </el-row>
@@ -28,9 +29,9 @@
         <el-col :span="18">
           <el-button style="margin-left:10px" @click="typeChange('')" :type="searchType == ''?'primary':''">全部</el-button>
           <el-button @click="typeChange(1)" :type="searchType == 1?'primary':''">待审核</el-button>
-          <el-button @click="typeChange(1)" :type="searchType == 1?'primary':''">已通过</el-button>
-          <el-button @click="typeChange(1)" :type="searchType == 1?'primary':''">已驳回</el-button>
-          <el-button @click="typeChange(2)" :type="searchType == 2?'primary':''">已付款</el-button>
+          <el-button @click="typeChange(2)" :type="searchType == 2?'primary':''">已通过</el-button>
+          <el-button @click="typeChange(3)" :type="searchType == 3?'primary':''">已驳回</el-button>
+          <!-- <el-button @click="typeChange(2)" :type="searchType == 4?'primary':''">已付款</el-button> -->
         </el-col>
         <el-col style='text-align:right;' :span="6">
         </el-col>
@@ -74,7 +75,9 @@
             </template></el-table-column>
           <el-table-column prop="approveStatus" width="100" label="状态">
             <template slot-scope="scope">
-              <span v-if="scope.row.approveStatus">{{scope.row.approveStatus}}</span><span v-else>{{scope.row.travelStatus}}</span>
+              <span v-if="scope.row.approveStatus">{{scope.row.approveStatus}}</span>
+              <span v-else-if="scope.row.status=='待付款'||scope.row.status=='已通过'">{{scope.row.status}}</span>
+              <span v-else>{{scope.row.travelStatus}}</span>
             </template>
           </el-table-column>
           <el-table-column prop="expenseRemarks" label="附件">
@@ -100,7 +103,7 @@
               <el-button v-if='scope.row.approveStatus&&scope.row.strokeType == 1' @click="pass(scope.row)" type="primary">通过</el-button>
               <el-button v-if='scope.row.approveStatus&&scope.row.strokeType == 1' @click="reject(scope.row)" type="primary">驳回</el-button>
               <!-- <el-button v-if='scope.row.status=="已驳回"' @click="expenseedit(scope.row)" type="primary">编辑</el-button> -->
-              <el-button v-if='!scope.row.approveStatus&&scope.row.expensesType==2&&scope.row.status=="待付款"' @click="payment(scope.row)" type="primary">付款</el-button>
+              <el-button v-if='!scope.row.approveStatus&&scope.row.status=="待付款"' @click="payment(scope.row)" type="primary">付款</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -353,7 +356,7 @@
       },
       payment(row){
         if(localStorage.getItem('ws-pf_roleName')=='出纳'){
-          this.$router.push({name:'payment',query:{id:row.id}})
+          this.$router.push({name:'payment',query:{id:row.expenseId}})
         }else{
           this.$message({
             message: '暂无此权限!',
@@ -391,8 +394,8 @@
             searchKeyWord:this.searchKeyWord,
             currentPage: this.currentPage,
             pageSize:this.pageSize ,
-            strokeType:this.strokeType
-            // searchType:this.searchType
+            strokeType:this.strokeType,
+            searchType:this.searchType
           })
           .toPromise()
           .then(response => {

src/views/profitable/payment.vue

@@ -34,7 +34,7 @@
             </ws-select>
           </el-form-item>
           <el-form-item v-if='deptBudgetList.expensesPurpose==3' label-width='100px' label="仓库名称" span="1" prop="warehouse" class="readonly">
-          {{deptBudgetList.warehouse}}
+          {{deptBudgetList.warehouseName}}
           </el-form-item>
           <el-form-item v-if='deptBudgetList.expensesPurpose==3' label-width='100px' label="类型" span="1" prop="warehouse" class="readonly">
           {{deptBudgetList.wareExpenseType}}

src/views/statisticalReport/autoSettlementList.vue

@@ -484,7 +484,7 @@ import {
     selectWarehouseSelf,
   } from '@/model/outboundManagement/index'
 import {
-  workflowcontent
+  workflowcontent,getwarehouse
 } from '@/model/houseSelfCollect/index'
 import {
   posthandle
@@ -492,6 +492,7 @@ import {
 import {
   downloadFile
 } from '@/utils/batchDown'
+
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
 import {
@@ -676,7 +677,7 @@ export default {
   },
   activated() {
     console.log(11111111)
-      selectWarehouseSelf({
+    getwarehouse({
             compId: localStorage.getItem('ws-pf_compId'),
           })
           .toPromise()

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: '本周',
@@ -231,9 +232,15 @@
           .then((response) => {
             this.goodsList = response
           })
-      this.getNowTime()
       this.baseId=this.$route.query.baseId
-      
+      if(this.$route.query.status){
+        this.status=true
+        this.goodsName='玉米'
+      }else{
+        this.status=false
+        this.goodsName=''
+      }
+      this.getNowTime()
       this.showType = this.isShow
     },
     methods: {

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -146,7 +146,7 @@
 
             <span class="corles" v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.delete`
-              " v-if="!scope.row.approveStatus" @click="deleteclick(scope.row)">删除</span>
+              " v-if="!scope.row.approveStatus&&scope.row.completedQuantity== '0'" @click="deleteclick(scope.row)">删除</span>
           </template>
         </el-table-column>
       </el-table>
@@ -162,8 +162,10 @@
     setcorrect,
     sponsorWithdraw
   } from '@/model/tasksport/index'
+
   import {
-  selectWarehouseSelf,
+  // selectWarehouseSelf,
+  getwarehouse
 } from '@/model/houseSelfCollect/index'
   import {
     getstafffind,
@@ -311,7 +313,7 @@
       this.showType = this.isShow
     },
     mounted() {
-      selectWarehouseSelf({
+      getwarehouse({
         compId: localStorage.getItem('ws-pf_compId'),
       })
         .toPromise()

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -124,11 +124,15 @@
 					</el-form-item> -->
 					<!--经办人-->
 					<el-form-item label="发货人">
-            <el-select v-model="dataList.agent" placeholder="请选择发货人" filterable clearable
-              @change="selectstaff">
-              <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
-            </el-select>
-          </el-form-item>
+						<el-select v-model="dataList.agent" placeholder="请选择发货人" filterable clearable
+						@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 label="任务标识">
+						<el-input  @input="taskFlaginput" v-model="dataList.taskFlag"
+							placeholder="请输入任务标识" maxlength="6" size="small" class="huom" />
+					</el-form-item> -->
 					<!--业务描述=-->
 					<el-form-item v-if="dataList.taskTypeKey != 3" label="业务描述" span="20">
 						<el-input v-model="dataList.businessDescribe" placeholder="请输入业务描述（运输方式），不超过500字"
@@ -248,11 +252,15 @@
 					</el-form-item> -->
 					<!-- 经办人-->
 					<el-form-item label="收货负责人">
-            <el-select v-model="dataList1.agent" placeholder="请选择收货负责人" filterable clearable :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-select v-model="dataList1.agent" placeholder="请选择收货负责人" filterable clearable :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 label="任务标识">
+						<el-input :disabled="dataList.taskTypeKey == 3" @input="taskFlaginput" v-model="dataList.taskFlag"
+							placeholder="请输入任务标识" maxlength="6" size="small" class="huom" />
+					</el-form-item> -->
 					<!--业务描述=-->
 					<el-form-item v-if="dataList.taskTypeKey != 4" label="业务描述">
 						<el-input v-model="dataList1.businessDescribe" placeholder="请输入业务描述（运输方式），不超过500字"
@@ -354,11 +362,15 @@
 					</el-form-item> -->
 					<!--发货人-->
 					<el-form-item label="发货负责人">
-            <el-select v-model="dataList.agent" placeholder="请选择发货负责人" filterable clearable
-              @change="selectstaff">
-              <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
-            </el-select>
-          </el-form-item>
+						<el-select v-model="dataList.agent" placeholder="请选择发货负责人" filterable clearable
+						@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 label="任务标识">
+						<el-input :disabled="dataList.taskTypeKey == 4" v-model="dataList.taskFlag"
+							placeholder="请输入任务标识" maxlength="6" size="small" class="huom" />
+					</el-form-item> -->
 					<!--业务描述=-->
 					<el-form-item label="业务描述">
 						<el-input v-model="dataList.businessDescribe" placeholder="请输入业务描述（运输方式），不超过500字"
@@ -632,6 +644,14 @@
 			
 		},
 		methods: {
+			taskFlaginput(e){
+				if(this.dataList.taskTypeKey==3){
+					this.dataList1.taskFlag=e
+				}
+				if(this.dataList.taskTypeKey==4){
+					this.dataList.taskFlag=e
+				}
+			},
 			//返回按钮
 			revert() {
 				this.$router.go(-1)
@@ -652,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/universalityAudit/audit.vue

@@ -151,7 +151,7 @@
     </el-dialog>
     <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
       @on-cancel="handleClose">
-      <ws-upload ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
+      <ws-upload ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :batch-down="true" :editable="false"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
     </WinseaContentModal>
     <el-dialog width="50%" :visible.sync="dialogVisible1" title="审核记录">

src/views/universalityAudit/auditprint.vue

@@ -40,6 +40,12 @@
           </el-table-column>
           <el-table-column prop="type" label="类型">
           </el-table-column>
+          <el-table-column prop="warehouseName" label="仓库名">
+          </el-table-column>
+          <el-table-column prop="payerHeader" label="付款方名头">
+          </el-table-column>
+          <el-table-column prop="amountMoney" label="金额">
+          </el-table-column>
           <el-table-column prop="status" label="状态">
             <template slot-scope="scope">{{ scope.row.approveStatus ? scope.row.approveStatus : scope.row.status }}</template>
           </el-table-column>
@@ -75,7 +81,8 @@ import {
   printgethis,
   printgetfile,
   printgetdata,
-  printgetout
+  printgetout,
+  printfilling
 } from '@/model/universalityAudit/index'
 import {lookexenseinfo, getAuditRecord,} from '@/model/profitable/index'
 import { seeCat } from '@/model/transport/index'
@@ -127,7 +134,9 @@ export default {
         {label:'合同审核',value:'合同审核'},
         {label:'运费结算',value:'运费结算'},
         {label:'仓库设置',value:'仓库设置'},
-        {label:'出入库任务',value:'出入库任务'}
+        {label:'出入库任务',value:'出入库任务'},
+        // {label:'长途加油',value:'长途加油'},
+        // {label:'短途加油',value:'短途加油'},
         ],
       intotal: 0,
       form: {},
@@ -176,7 +185,7 @@ export default {
                         var data = this.deptBudgetList[m].tranTaskInfoList[i].tranSettlementReportList
                         for (var q = 0; q < data.length; q++) {
                           if (data[q].totalPayable) {
-                            this.num += data[q].totalPayable
+                            num += data[q].totalPayable
                           }
                         }
                       }
@@ -364,7 +373,7 @@ export default {
                         var data = this.deptBudgetList[0].tranTaskInfoList[i].tranSettlementReportList
                         for (var q = 0; q < data.length; q++) {
                           if (data[q].totalPayable) {
-                            this.num += data[q].totalPayable
+                            num += data[q].totalPayable
                           }
                         }
                       }
@@ -414,7 +423,7 @@ export default {
                 this.deptBudgetList[0].printType=2 
                 this.deptBudgetList[0].aduitInfo=await getAuditRecord({id:row.id}).toPromise()
             }
-        }else if(row.type=='入库单请款'||row.type=='运价审核'||row.type=='通用审核'||row.type=='合同审核'||row.type=='仓库设置'||row.type=='出入库任务'){
+        }else if(row.type=='入库单请款'||row.type=='运价审核'||row.type=='通用审核'||row.type=='合同审核'||row.type=='仓库设置'||row.type=='出入库任务'||row.type=='长途加油'){
           if(row.type=='入库单请款'){
             this.deptBudgetList=[await printgetdata({batchId:row.id}).toPromise()]
             this.deptBudgetList[0].printType=3
@@ -452,7 +461,33 @@ export default {
             }
             this.deptBudgetList[0].printType=9
           }
-          if(this.deptBudgetList[0].addressUrl){
+          else if(row.type=='长途加油'){
+            this.deptBudgetList=[await printfilling({id:row.id}).toPromise()]
+            this.deptBudgetList[0].printType=10
+            if(this.deptBudgetList[0].fillingDetailInfoList&&this.deptBudgetList[0].fillingDetailInfoList.length>0){
+              var arr3=[]
+              var data=this.deptBudgetList[0].fillingDetailInfoList
+              for (let i = 0; i < data.length; i++) {
+                if(data[i].addressUrl){
+                  var arr2=data[i].addressUrl.split(',')
+                  for (let q = 0; q < arr2.length; q++) {
+                    if(arr2[q]){
+                      arr3.push({'appendixPath':arr2[q]})
+                    }
+                  }
+                }
+              }
+              this.deptBudgetList[0].addressUrlArray = arr3
+              this.deptBudgetList[0].addressUrlArrayImage=arr3
+              this.deptBudgetList[0].addressUrlArrayFilelen=arr3.length-this.deptBudgetList[0].addressUrlArrayImage.length
+            }else{
+              this.deptBudgetList[0].addressUrlArray=[]
+              this.deptBudgetList[0].addressUrlArrayImage=[]
+              this.deptBudgetList[0].addressUrlArrayFilelen=0
+            }
+          } 
+          if(row.type!='长途加油'){
+            if(this.deptBudgetList[0].addressUrl){
             var arr1=await printgetfile({appendixIds:this.deptBudgetList[0].addressUrl}).toPromise()
             this.deptBudgetList[0].addressUrlArray=this.imagefilter(arr1)
             this.deptBudgetList[0].addressUrlArrayImage=this.imagefilter(arr1)
@@ -462,6 +497,8 @@ export default {
             this.deptBudgetList[0].addressUrlArrayImage=[]
             this.deptBudgetList[0].addressUrlArrayFilelen=0
           }
+          }
+      
           this.deptBudgetList[0].currectstatus=row.status
           var workflow=await printworkflow({businessCode:row.businessCode,tmpCompId:localStorage.getItem('ws-pf_compId')}).toPromise()
           if(row.type=='通用审核') {
@@ -512,9 +549,6 @@ export default {
     imagefilter(arr){
         var arr1=[]
         for (let i = 0; i < arr.length; i++) {
-          // var value=await this.getImageSize(arr[i].appendixPath)
-          // arr[i].width=value.width
-          // arr[i].height=value.height
             if(arr[i].appendixName.indexOf('jpg')!=-1||arr[i].appendixName.indexOf('jpeg')!=-1||arr[i].appendixName.indexOf('png')!=-1){
                     arr1.push(arr[i])
             }

src/views/warehousenew/awaitRansom.vue

@@ -0,0 +1,289 @@
+//待赎回
+<template>
+  <div class="container">
+    <el-row class="row_top">
+      <el-col :span="12">
+        <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" height="10"
+            style="vertion-align: bottom; margin-right: 3px" src="../../../public/img/lujing.png" alt="" />返回
+        </el-button></el-col>
+    </el-row>
+    <div class="center">
+      <el-row style='margin-bottom:10px;'>
+        <el-col :span="6">
+          <!-- <el-button style="margin-left:10px" @click="typeChange('')" type="primary">导出</el-button> -->
+        </el-col>
+        <el-col :span="18">
+          <div style='margin-left:10px;' class="datascreen">
+            <div style="display:inline-block;width:50;">
+              <el-date-picker value-format='yyyy-MM-dd' v-model="value" type="daterange" align="right" unlink-panels range-separator="至"
+              start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" class="data_css" @change="changeDate" >
+            </el-date-picker></div>
+            <el-input placeholder="可按合同编号、接收公司查找" class="input_css" v-model="searchKeyWord"></el-input>
+            <el-button class="find" type="primary" @click="find()"><img width="16" height="16" style="left: -8px;"
+                src="../../../public/img/sousuo.png" alt="" /></el-button>
+          </div>
+        </el-col>
+      </el-row>
+      <el-row style='margin-bottom:10px;'>
+        <el-col :span="18">
+          <el-button style="margin-left:10px" @click="typeChange('')" :type="searchType == ''?'primary':''">全部</el-button>
+          <el-button @click="typeChange(1)" :type="searchType == 1?'primary':''">未完成</el-button>
+          <el-button @click="typeChange(2)" :type="searchType == 2?'primary':''">已完成</el-button>
+        </el-col>
+        <el-col style='padding-right:10px;text-align:right;' :span="6">
+          合计待赎回：{{num}}吨
+        </el-col>
+      </el-row>
+      <div class="fromdata">
+        <el-table :data="tableData" stripe style="width: 100%" @selection-change="handleSelectionChange">
+          <el-table-column type="index" label="序号">
+            <template scope="scope">
+              <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+              <span v-else>{{ scope.$index + 1 }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="contractNo" label="合同编号">
+          </el-table-column>
+          <el-table-column prop="receivingCompany" label="接收公司">
+          </el-table-column>
+          <el-table-column prop="cumulativeTransfer" label="累计转出（吨）"></el-table-column>
+          <el-table-column prop="expectedRedemption" label="预计赎回（吨）"></el-table-column>
+          <el-table-column width="120" prop="redeemed" label="已赎回（吨）">
+          </el-table-column>
+           <el-table-column width="150" prop="settlementPrice" label="待赎回（吨）">
+          </el-table-column>
+          <el-table-column width="120" prop="signingDate" label="合同签订日期">
+          </el-table-column>
+        </el-table>
+      </div>
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        style="text-align:center" :page-size="pageSize"
+        layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+      </el-pagination>
+    </div>
+  </div>
+</template>
+<script>
+
+import {
+  getredeemedinfo
+} from '@/model/warehouse/index'
+  export default {
+    components: {},
+    data() {
+      return {
+        value: '',
+        tableData: [],
+        show:false,
+        deptBudgetTotal: 0,
+        currentPage: 1,
+        pageSize: 10,
+        deptCircularPage: {},
+        searchType:'',
+        searchKeyWord:'',
+        startDate:'',
+        endDate:'',
+        tableData:{},
+        datalist:{},
+        num:0,
+        compId:localStorage.getItem('ws-pf_compId'),
+      }
+    },
+    activated() {
+      this.getList()
+    },
+    methods: {
+      handleClose1(){
+        this.show=false
+      },
+      typeChange(num){
+        this.searchType= num
+        this.getList()
+      },
+      returnsales(){
+        this.$router.go(-1)
+      },
+      handleSelectionChange(val) {
+        this.multipleSelection = val;
+      },
+      async getList() {
+         var response=await getredeemedinfo({
+            // warehouseType: 1,
+            startDate:this.startDate,
+            endDate:this.endDate,
+            searchKeyWord:this.searchKeyWord,
+            currentPage: this.currentPage,
+            pageSize:this.pageSize ,
+            searchType:this.searchType,
+            dropFlag:0,
+            compId:localStorage.getItem('ws-pf_compId'),
+          })
+          .toPromise()
+          // 合计
+          var response1=await getredeemedinfo({
+            // warehouseType: 1,
+            startDate:this.startDate,
+            endDate:this.endDate,
+            searchKeyWord:this.searchKeyWord,
+            currentPage: this.currentPage,
+            pageSize:9999 ,
+            searchType:this.searchType,
+            dropFlag:0,
+            compId:localStorage.getItem('ws-pf_compId'),
+          })
+          .toPromise()
+          for (let i = 0; i < response.records.length; i++) {
+            response.records[i].settlementPrice=(response.records[i].expectedRedemption-response.records[i].redeemed).toFixed(3)
+          }
+          this.num=0
+          for (let i = 0; i < response1.records.length; i++) {
+            this.num+=Number((response1.records[i].expectedRedemption-response1.records[i].redeemed).toFixed(3))
+          }
+          this.num=this.num.toFixed(3)
+            this.tableData = response.records
+           this.deptBudgetTotal = response.total
+      },
+
+      changeDate(){
+        if(this.value){
+          this.startDate = this.value[0]
+          this.endDate = this.value[1]
+        }else{
+          this.startDate = ''
+          this.endDate = ''
+        }
+        this.getList()
+      },
+      pickerOptions() {},
+      find() {
+        this.getList()
+
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+    },
+  }
+</script>
+<style lang="scss" scoped>
+ table,
+      table tr th,
+      table tr td {
+        border: 2px solid #333333;
+        padding: 5px 0;
+        height: 55px;
+      }
+
+      .content {
+        width: 1000px;
+        padding: 70px 20px 20px 20px;
+        font-size: 22px;
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+      }
+
+      table {
+        width: 100%;
+        text-align: center;
+        border-collapse: collapse;
+        border: 3px solid #333333;
+      }
+
+      .col-bgc {
+        background: #f6f7fb;
+      }
+
+  .container {
+    background: #E8ECF6;
+  }
+
+  .center {
+    margin: 0 auto;
+    background: #ffffff;
+    height: calc(100vh - 13vh);
+    border-radius: 4px;
+    padding: 20px 0;
+
+    /deep/.el-table td,
+    /deep/.el-table th {
+      text-align: center;
+    }
+  }
+
+  .row_top {
+    background: #F6F7FC;
+    border-radius: 4px;
+    margin-bottom: 10px;
+
+    .bg-left {
+      padding-left: 30px;
+    }
+
+    .bg-right {
+      padding-right: 10px;
+      text-align: right;
+    }
+
+    .title {
+      position: relative;
+    }
+
+    .title::before {
+      content: '';
+      display: inline-block;
+      width: 5px;
+      height: 30px;
+      background: #5473e8;
+      position: absolute;
+      left: 0;
+    }
+  }
+
+  .datascreen {
+    display: flex;
+
+    .data_css {
+      width: 40%;
+    }
+
+    .input_css {
+      width: 50%;
+      margin: 0 10px;
+    }
+
+    .find {
+      margin-right: 10px;
+    }
+  }
+
+  .fromdata {
+    margin: 20px 0;
+    overflow-y: scroll;
+    height: 546px;
+  }
+  .top_info{
+    margin: 10px 0 0 10px;
+    min-width: 712px;
+    .info_css{
+      margin-right: 20px;
+    }
+  }
+  .bg-right{
+    padding-top:15px;
+  }
+  .el-icon-connection{
+    color:#409eff;
+  }
+</style>

src/views/warehousenew/component/router/index.js

@@ -508,6 +508,69 @@ const warehouseManagementRouter = {
       },
       hidden: true
     },
+    // {
+    //   path: 'awaitRansom',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/awaitRansom'),
+    //   name: 'awaitRansom',
+    //   meta: {
+    //     title: 'awaitrAnsom',
+    //     shortcutEntrance: 'warehouseManagementList',
+    //     module: 'warehouseManagement.warehouse.warehouseInfo',
+    //     permissicon: [],
+    //     keepAlive: true,
+    //     _title:'待赎回'
+    //     // module: 'procurement.sparepart.applDetail'
+    //   },
+    //   hidden:true
+    // },
+    // {
+    //   path: 'gooddetail',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/gooddetail'),
+    //   name: 'gooddetail',
+    //   meta: {
+    //     title: 'gooddetail',
+    //     shortcutEntrance: 'warehouseManagementList',
+    //     module: 'warehouseManagement.warehouse.warehouseInfo',
+    //     permissicon: [],
+    //     keepAlive: true,
+    //     _title:'货权明细'
+    //     // module: 'procurement.sparepart.applDetail'
+    //   },
+    // },
+    // {
+    //   path: 'customerrecord',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/customerrecord'),
+    //   name: 'customerrecord',
+    //   meta: {
+    //     title: 'customerrecord',
+    //     shortcutEntrance: 'warehouseManagementList',
+    //     module: 'warehouseManagement.warehouse.warehouseInfo',
+    //     permissicon: [],
+    //     keepAlive: true,
+    //     _title:'客户操作记录'
+    //     // module: 'procurement.sparepart.applDetail'
+    //   },
+    //   hidden:true
+    // },
+    // {
+    //   path: 'goodsrollIn',
+    //   component: () =>
+    //     import(/* webpackChunkName: "applDetail" */ '@/views/warehousenew/goodsrollIn'),
+    //   name: 'goodsrollIn',
+    //   meta: {
+    //     title: 'goodsrollIn',
+    //     shortcutEntrance: 'warehouseManagementList',
+    //     module: 'warehouseManagement.warehouse.warehouseInfo',
+    //     permissicon: [],
+    //     keepAlive: true,
+    //     _title:'货权转入'
+    //     // module: 'procurement.sparepart.applDetail'
+    //   },
+    //   hidden:true
+    // },
   ],
 };
 export default warehouseManagementRouter;

src/views/warehousenew/customerrecord.vue

@@ -0,0 +1,282 @@
+//客户操作记录
+<template>
+  <div class="container">
+    <el-row class="row_top">
+      <el-col :span="12">
+        <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" height="10"
+            style="vertion-align: bottom; margin-right: 3px" src="../../../public/img/lujing.png" alt="" />返回
+        </el-button></el-col>
+    </el-row>
+    <div class="center">
+      <el-row style='margin-bottom:10px;'>
+        <el-col :span="6">
+          <!-- <el-button style="margin-left:10px" @click="typeChange('')" type="primary">导出</el-button> -->
+        </el-col>
+        <el-col :span="18">
+          <div style='margin-left:10px;' class="datascreen">
+            <div style="display:inline-block;width:50;">
+              <el-date-picker value-format='yyyy-MM-dd' v-model="value" type="daterange" align="right" unlink-panels range-separator="至"
+              start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" class="data_css" @change="changeDate" >
+            </el-date-picker></div>
+            <el-input placeholder="可按业务编号、合同编号、客户查找" class="input_css" v-model="searchKeyWord"></el-input>
+            <el-button class="find" type="primary" @click="find()"><img width="16" height="16" style="left: -8px;"
+                src="../../../public/img/sousuo.png" alt="" /></el-button>
+          </div>
+        </el-col>
+      </el-row>
+      <div class="fromdata">
+        <el-table :data="tableData" stripe style="width: 100%" @selection-change="handleSelectionChange">
+          <el-table-column type="index" label="序号">
+            <template scope="scope">
+              <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+              <span v-else>{{ scope.$index + 1 }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="relationReceiveNo" label="我司业务编号">
+          </el-table-column>
+          <el-table-column prop="transferOutNo" label="客户业务编号">
+          </el-table-column>
+          <el-table-column prop="outContractNo" label="客户销售合同编号"></el-table-column>
+          <el-table-column prop="customer" label="客户"></el-table-column>
+          <el-table-column width="200" prop="agent" label="期初粮款数据（元）">
+            <template scope="scope">
+              应付{{scope.row.amountIngPayable}}-已付{{scope.row.amountEdPayable}}=未付{{scope.row.amountNotPayable}}
+            </template>
+          </el-table-column>
+          <el-table-column width="120" prop="transferOutWeight" label="重量（吨）">
+          </el-table-column>
+          <el-table-column width="120" prop="salePrice" label="售价（元/吨）">
+          </el-table-column>
+          <el-table-column width="120" prop="updateDate" label="日期">
+          </el-table-column>
+          <el-table-column width="120" prop="status" label="状态">
+          </el-table-column>
+          <el-table-column width="120" label="操作">
+            <template scope="scope">
+              <el-button v-if="scope.row.status=='待接收'" @click="rejection(scope.row)" type="text">拒收</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        style="text-align:center" :page-size="pageSize"
+        layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+      </el-pagination>
+    </div>
+  </div>
+</template>
+<script>
+
+import {
+  getcusationinfo,
+  rejectcusationinfo
+} from '@/model/warehouse/index'
+  export default {
+    components: {},
+    data() {
+      return {
+        value: '',
+        tableData: [],
+        show:false,
+        deptBudgetTotal: 0,
+        currentPage: 1,
+        pageSize: 10,
+        agreementType:'',
+        deptCircularPage: {},
+        searchType:'',
+        searchKeyWord:'',
+        startDate:'',
+        endDate:'',
+        tableData:{},
+        datalist:{},
+        currectData:{},
+        compId:localStorage.getItem('ws-pf_compId'),
+        binNumbershow:false,
+      }
+    },
+    activated() {
+      this.getList()
+    },
+    methods: {
+      lookbinNumber(item){
+        this.currectData=item
+        this.binNumbershow=true
+      },
+      handleClose1(){
+        this.show=false
+      },
+      returnsales(){
+        this.$router.go(-1)
+      },
+      rejection(row){
+        this.$confirm('确定拒收该笔货权？', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          rejectcusationinfo({id:row.id}).toPromise().then((response) => {
+              this.$message.success('操作成功！')
+              // row.weightedit=false
+              this.getList()
+            })
+        })
+      },
+      async getList() {
+         var response=await getcusationinfo({
+            // warehouseType: 1,
+            startDate:this.startDate,
+            endDate:this.endDate,
+            searchKeyWord:this.searchKeyWord,
+            currentPage: this.currentPage,
+            pageSize:this.pageSize ,
+            compId:localStorage.getItem('ws-pf_compId'),
+          })
+          .toPromise()
+            this.tableData = response.records
+           this.deptBudgetTotal = response.total
+      },
+
+      changeDate(){
+        if(this.value){
+          this.startDate = this.value[0]
+          this.endDate = this.value[1]
+        }
+        this.getList()
+      },
+      pickerOptions() {},
+      find() {
+        this.getList()
+
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+    },
+  }
+</script>
+<style lang="scss" scoped>
+ table,
+      table tr th,
+      table tr td {
+        border: 2px solid #333333;
+        padding: 5px 0;
+        height: 55px;
+      }
+
+      .content {
+        width: 1000px;
+        padding: 70px 20px 20px 20px;
+        font-size: 22px;
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+      }
+
+      table {
+        width: 100%;
+        text-align: center;
+        border-collapse: collapse;
+        border: 3px solid #333333;
+      }
+
+      .col-bgc {
+        background: #f6f7fb;
+      }
+
+  .container {
+    background: #E8ECF6;
+  }
+
+  .center {
+    margin: 0 auto;
+    background: #ffffff;
+    height: calc(100vh - 13vh);
+    border-radius: 4px;
+    padding: 20px 0;
+
+    /deep/.el-table td,
+    /deep/.el-table th {
+      text-align: center;
+    }
+  }
+
+  .row_top {
+    background: #F6F7FC;
+    border-radius: 4px;
+    margin-bottom: 10px;
+
+    .bg-left {
+      padding-left: 30px;
+    }
+
+    .bg-right {
+      padding-right: 10px;
+      text-align: right;
+    }
+
+    .title {
+      position: relative;
+    }
+
+    .title::before {
+      content: '';
+      display: inline-block;
+      width: 5px;
+      height: 30px;
+      background: #5473e8;
+      position: absolute;
+      left: 0;
+    }
+  }
+
+  .datascreen {
+    display: flex;
+
+    .data_css {
+      width: 40%;
+    }
+
+    .input_css {
+      width: 50%;
+      margin: 0 10px;
+    }
+
+    .find {
+      margin-right: 10px;
+    }
+  }
+
+  .fromdata {
+    margin: 20px 0;
+    overflow-y: scroll;
+    height: 546px;
+  }
+  .top_info{
+    margin: 10px 0 0 10px;
+    min-width: 712px;
+    .info_css{
+      margin-right: 20px;
+    }
+  }
+  .bg-right{
+    padding-top:15px;
+  }
+  .el-icon-connection{
+    color:#409eff;
+  }
+  .flex{
+    display:flex;justify-content: space-between;
+  }
+</style>

src/views/warehousenew/dryRecord.vue

@@ -38,7 +38,7 @@
                     <div style="text-align:right;margin-right:20px">净重合计（吨）：{{ count }}</div>
                 </el-col>
             </el-row>
-            <el-table class="forData" :data="weighingRecordList" style="width: 100%; margin-top: 20px" height="700"
+            <el-table class="forData" :data="weighingRecordList" style="width: 100%; margin-top: 20px" height="535"
                 @selection-change="handleSelectionChange">
                 <el-table-column type="selection" width="55"></el-table-column>
                 <el-table-column type="index" label="序号" width="80">
@@ -131,6 +131,9 @@ import {
 import {
     selectWarehouseSelf,
 } from '@/model/outboundManagement/index'
+import {
+    getcomp
+  } from '@/model/indexRx'
 export default {
     data() {
         return {
@@ -292,7 +295,10 @@ export default {
         this.compId = localStorage.getItem('ws-pf_compId')
         this.warehouseName = this.$route.query.warehouseName //仓库名
         this.warehouseId = this.$route.query.warehouseId //仓库Id
-        if(localStorage.getItem('compNameoptions')){
+        getcomp({userMobilePhone:JSON.parse(localStorage.getItem('ws_login_getTenantInfoByUser')).loginInfo.userMobilePhone}).toPromise().then((res)=>{
+        this.compNameoptions=res
+        localStorage.setItem('compNameoptions',JSON.stringify(this.compNameoptions))
+        if(this.compNameoptions.length>0){
         var company=JSON.parse(localStorage.getItem('compNameoptions'))
         
         var extra=company.filter((item)=>{
@@ -416,6 +422,7 @@ export default {
           }else{
             this.ewCustomer=extra[0]
           }
+          
           for (let i = 0; i < extra.length; i++) {
             this.ewCustomerOptions.push({value: extra[i],label:extra[i]})
             this.companyNameOptions.push({value: extra[i],label:extra[i]})
@@ -423,6 +430,7 @@ export default {
           }
         }
       }
+      })
         this.getList()
     },
     methods: {

src/views/warehousenew/dryWarehousing.vue

@@ -208,6 +208,9 @@
 import {
     selectWarehouseSelf,
 } from '@/model/outboundManagement/index'
+import {
+    getcomp
+  } from '@/model/indexRx'
 import {
     pullDown,
     carXiala,
@@ -335,16 +338,18 @@ export default {
         dialogDataList:[],
         printData:{
             warehouseName:''
-        }
-        }
+        },compNameoptions:[]
+        } 
     },
     mounted() { },
     activated() {
         this.selectWarehouse()
         this.getGoodsList()
         this.isShowBalance = true
-        console.log(localStorage.getItem('compNameoptions'))
-        if(localStorage.getItem('compNameoptions')){
+        getcomp({userMobilePhone:JSON.parse(localStorage.getItem('ws_login_getTenantInfoByUser')).loginInfo.userMobilePhone}).toPromise().then((res)=>{
+        this.compNameoptions=res
+        localStorage.setItem('compNameoptions',JSON.stringify(this.compNameoptions))
+        if(this.compNameoptions.length>0){
         var company=JSON.parse(localStorage.getItem('compNameoptions'))
         
         var extra=company.filter((item)=>{
@@ -358,7 +363,6 @@ export default {
           &&item!='黑龙江益储益运粮食贸易有限公司'
           &&item!='黑龙江启兴粮食贸易有限公司'
         })
-        console.log(extra,1111111111111111)
         if(extra.length>0){
           this.companyNameOptions=[
           {
@@ -477,6 +481,8 @@ export default {
           }
         }
       }
+      })
+        
         this.openPort()
         
     },
@@ -803,6 +809,8 @@ export default {
                 this.tpyeNo = '1'
                 this.cartips = '手动输入'//用来点称皮重时显示皮重输入框
             } else {
+              this.weighingList.goodsName = this.goodsNameList[0].constValue
+              this.weighingList.goodsNameKey = this.goodsNameList[0].constKey
                 this.tpyeNo = '2'
                 this.information = '毛重'
             }

src/views/warehousenew/gooddetail.vue

@@ -0,0 +1,316 @@
+//货权明细
+<template>
+  <div class="container">
+    <div class="center">
+      <el-row style='margin-bottom:10px;'>
+        <el-col :span="6">
+          <!-- <el-button style="margin-left:10px" @click="typeChange('')" type="primary">导出</el-button> -->
+        </el-col>
+        <el-col :span="18">
+          <div style='margin-left:10px;' class="datascreen">
+            <div style="display:inline-block;width:50;">
+              <el-date-picker value-format='yyyy-MM-dd' v-model="value" type="daterange" align="right" unlink-panels range-separator="至"
+              start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" class="data_css" @change="changeDate" >
+            </el-date-picker></div>
+            <el-input placeholder="可按业务编号、合同编号、客户查找" class="input_css" v-model="searchKeyWord"></el-input>
+            <el-button class="find" type="primary" @click="find()"><img width="16" height="16" style="left: -8px;"
+                src="../../../public/img/sousuo.png" alt="" /></el-button>
+          </div>
+        </el-col>
+      </el-row>
+      <el-row style='margin-bottom:10px;'>
+        <el-col :span="18">
+          <el-button style="margin-left:10px" @click="typeChange('')" :type="searchType == ''?'primary':''">全部</el-button>
+          <el-button @click="typeChange(2)" :type="searchType == 2?'primary':''">转入</el-button>
+          <el-button @click="typeChange(1)" :type="searchType == 1?'primary':''">转出</el-button>
+        </el-col>
+        <el-col style="text-align:right;padding-right:10px;" :span="6">
+          <el-button @click="handlerecord" type="primary">客户操作记录</el-button>
+          <el-button @click="rollin" type="primary">货权转入</el-button>
+        </el-col>
+      </el-row>
+      <div class="fromdata">
+        <el-table :data="tableData" stripe style="width: 100%" @selection-change="handleSelectionChange">
+          <el-table-column type="index" label="序号">
+            <template scope="scope">
+              <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+              <span v-else>{{ scope.$index + 1 }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="transferOutNo" label="业务编号">
+          </el-table-column>
+          <el-table-column prop="relationReceiveNo" label="关联业务编号">
+            <template scope="scope">
+              <span v-if="scope.row.transferFlag==1"></span>
+              <span v-if="scope.row.transferFlag==2">{{scope.row.relationReceiveNo}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="outContractNo" label="合同编号"></el-table-column>
+          <el-table-column prop="customer" label="客户">
+            <template scope="scope">
+              <span v-if="scope.row.transferFlag==1">{{scope.row.receiveCompName}}</span>
+              <span v-if="scope.row.transferFlag==2">{{scope.row.customer}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column width="120" prop="warehouseName" label="库点名称">
+          </el-table-column>
+           <el-table-column width="150" prop="settlementPrice" label="仓位">
+            <template scope="scope">
+              <el-button @click="lookbinNumber(scope.row)" type="text">查看</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column width="120" prop="signingDate" label="类型">
+            <template scope="scope">
+
+             <span v-if="scope.row.transferFlag==1">转出</span>
+             <span v-if="scope.row.transferFlag==2">转入</span>
+            </template>
+          </el-table-column>
+          <el-table-column width="120" prop="agent" label="经办人">
+          </el-table-column>
+          <el-table-column width="200" prop="agent" label="期初粮款数据（元）">
+            <template scope="scope">
+              应付{{scope.row.amountIngPayable}}-已付{{scope.row.amountEdPayable}}=未付{{scope.row.amountNotPayable}}
+            </template>
+          </el-table-column>
+          <el-table-column width="120" prop="transferOutWeight" label="重量（吨）">
+          </el-table-column>
+          <el-table-column width="120" prop="avgCost" label="成本（元/吨）">
+            <template scope="scope">
+              <span v-if="scope.row.transferFlag==1">{{scope.row.salePrice}}</span>
+              <span v-if="scope.row.transferFlag==2">{{scope.row.avgCost}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column width="120" prop="updateDate" label="日期">
+          </el-table-column>
+        </el-table>
+      </div>
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        style="text-align:center" :page-size="pageSize"
+        layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+      </el-pagination>
+      <el-dialog width='50%' :visible.sync="binNumbershow" :title="'仓位详情-'+(currectData.transferFlag==1?'转出':'')" top="20vh">
+        <div class="flex"><div>仓位号</div><div>重量（吨）</div></div>
+        <div class="flex" v-for="item in currectData.cargoPositionDetailsList">
+          <div>{{ item.binNumber }}</div>
+          <div>{{ item.weight }}</div>
+        </div>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+<script>
+
+import {
+  getroll
+} from '@/model/warehouse/index'
+  export default {
+    components: {},
+    data() {
+      return {
+        value: '',
+        tableData: [],
+        show:false,
+        deptBudgetTotal: 0,
+        currentPage: 1,
+        pageSize: 10,
+        agreementType:'',
+        deptCircularPage: {},
+        searchType:'',
+        searchKeyWord:'',
+        startDate:'',
+        endDate:'',
+        tableData:{},
+        datalist:{},
+        currectData:{},
+        compId:localStorage.getItem('ws-pf_compId'),
+        binNumbershow:false,
+      }
+    },
+    activated() {
+      this.getList()
+    },
+    methods: {
+      lookbinNumber(item){
+        this.currectData=item
+        this.binNumbershow=true
+      },
+      typeChange(num){
+        this.searchType=num
+        this.getList()
+      },
+      handleClose1(){
+        this.show=false
+      },
+      returnsales(){
+        this.$router.go(-1)
+      },
+      handleSelectionChange(val) {
+        this.multipleSelection = val;
+      },
+      handlerecord(){
+        this.$router.push({path:'customerrecord'})
+      },
+      rollin(){
+        this.$router.push({path:'goodsrollIn'})
+      },
+
+      async getList() {
+         var response=await getroll({
+            // warehouseType: 1,
+            startDate:this.startDate,
+            endDate:this.endDate,
+            searchKeyWord:this.searchKeyWord,
+            currentPage: this.currentPage,
+            pageSize:this.pageSize ,
+            searchType:this.searchType,
+            
+            dropFlag:0,
+            compId:localStorage.getItem('ws-pf_compId'),
+          })
+          .toPromise()
+            this.tableData = response.records
+           this.deptBudgetTotal = response.total
+      },
+
+      changeDate(){
+        if(this.value){
+          this.startDate = this.value[0]
+          this.endDate = this.value[1]
+        }
+        this.getList()
+      },
+      pickerOptions() {},
+      find() {
+        this.getList()
+
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+    },
+  }
+</script>
+<style lang="scss" scoped>
+ table,
+      table tr th,
+      table tr td {
+        border: 2px solid #333333;
+        padding: 5px 0;
+        height: 55px;
+      }
+
+      .content {
+        width: 1000px;
+        padding: 70px 20px 20px 20px;
+        font-size: 22px;
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+      }
+
+      table {
+        width: 100%;
+        text-align: center;
+        border-collapse: collapse;
+        border: 3px solid #333333;
+      }
+
+      .col-bgc {
+        background: #f6f7fb;
+      }
+
+  .container {
+    background: #E8ECF6;
+  }
+
+  .center {
+    margin: 0 auto;
+    background: #ffffff;
+    height: calc(100vh - 13vh);
+    border-radius: 4px;
+    padding: 20px 0;
+
+    /deep/.el-table td,
+    /deep/.el-table th {
+      text-align: center;
+    }
+  }
+
+  .row_top {
+    background: #F6F7FC;
+    border-radius: 4px;
+    margin-bottom: 10px;
+
+    .bg-left {
+      padding-left: 30px;
+    }
+
+    .bg-right {
+      padding-right: 10px;
+      text-align: right;
+    }
+
+    .title {
+      position: relative;
+    }
+
+    .title::before {
+      content: '';
+      display: inline-block;
+      width: 5px;
+      height: 30px;
+      background: #5473e8;
+      position: absolute;
+      left: 0;
+    }
+  }
+
+  .datascreen {
+    display: flex;
+
+    .data_css {
+      width: 40%;
+    }
+
+    .input_css {
+      width: 50%;
+      margin: 0 10px;
+    }
+
+    .find {
+      margin-right: 10px;
+    }
+  }
+
+  .fromdata {
+    margin: 20px 0;
+    overflow-y: scroll;
+    height: 546px;
+  }
+  .top_info{
+    margin: 10px 0 0 10px;
+    min-width: 712px;
+    .info_css{
+      margin-right: 20px;
+    }
+  }
+  .bg-right{
+    padding-top:15px;
+  }
+  .el-icon-connection{
+    color:#409eff;
+  }
+  .flex{
+    display:flex;justify-content: space-between;
+  }
+</style>

src/views/warehousenew/goodsrollIn.vue

@@ -0,0 +1,457 @@
+//货权转入
+<template>
+  <div class="container">
+    <el-row class="row_top">
+      <el-col :span="12">
+        <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" height="10"
+            style="vertion-align: bottom; margin-right: 3px" src="../../../public/img/lujing.png" alt="" />返回
+        </el-button></el-col>
+    </el-row>
+    <div class="center">
+        <el-form ref="form" :model="form" label-width="200px">
+            <el-form-item label="关联货权转出记录">
+                <el-select @change="receiveNochange" v-model="form.relationReceiveNo" placeholder="选择关联货权">
+                    <el-option label="不关联" value="不关联"></el-option>
+                    <el-option v-for="item in cusationinfo" :key="item.id" :label="item.relationReceiveNo+('（'+item.transferOutWeight+'吨）')" :value="item.relationReceiveNo"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="合同编号">
+                <el-select @change="contractNochange" v-model="form.outContractNo" placeholder="请选择合同编号">
+                <el-option v-for="item in contractNoList" :key="item.id" :label="item.contractNo" :value="item.contractNo"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="客户">
+                <el-input disabled placeholder="自动获取，不可编辑" v-model="form.customer"></el-input>
+            </el-form-item>
+            <el-form-item label="货名">
+                <el-select @change="goosnamechange" v-model="form.goodsName" placeholder="选择货名">
+                    <el-option v-for="item in goodnameList" :key="item.constKey" :label="item.constValue" :value="item.constValue"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="是否为货权赎回">
+                <el-radio-group v-model="form.redeemFlag">
+                    <el-radio label="0" >否</el-radio>
+                    <el-radio label="1" >是</el-radio>
+                </el-radio-group>
+            </el-form-item>
+            <el-form-item v-if="form.redeemFlag==1" label="待赎回合同">
+                <el-select v-model="form.redeemContractNo" placeholder="选择待赎回的合同">
+                    <el-option v-for="item in tableData" :key="item.id" :label="item.contractNo" :value="item.contractNo"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="平均成本（元/吨）">
+                <el-input v-model="form.avgCost" placeholder="输入平均成本"></el-input>
+            </el-form-item>
+            <el-form-item label="应付粮款（元）">
+                <el-input @input="amountinginput" v-model="form.amountIngPayable" placeholder="输入粮款金额"></el-input>
+            </el-form-item>
+            <el-form-item label="已付粮款（元）">
+                <el-input @input="amountedinput" v-model="form.amountEdPayable" placeholder="输入粮款金额"></el-input>
+            </el-form-item>
+            <el-form-item label="未付粮款（元）">
+                <el-input disabled v-model="form.amountNotPayable" placeholder="自动计算，不可编辑"></el-input>
+            </el-form-item>
+            <el-form-item label="库点">
+                <el-select @change="warehouseNamechange" v-model="form.warehouseName" placeholder="选择库点">
+                    <el-option  v-for="item in warehouseList" :key="item.id" :label="item.warehouseName" :value="item.warehouseName"></el-option>
+                </el-select>
+            </el-form-item>
+        </el-form>
+        <el-form :inline="true" label-width="200px" v-for="(item,index) in form.cargoPositionDetailsList" :key="'cangwe'+index" class="demo-form-inline">
+          <el-form-item :label="'仓位-'+(index+1)">
+            <el-select @focus="binNumberfocus" clearable filterable @change="($event)=>binNumberchange($event,item,index)" v-model="item.binNumber" placeholder="选择仓位">
+              <el-option v-for="item1 in binNumberList" :label="item1.binNumber" :value="item1.binNumber"></el-option>
+            </el-select>
+          </el-form-item> 
+          <el-form-item label="入库重量（吨）">
+            <el-input @input="weightinput" v-model="item.weight" placeholder="输入该仓位出库重量"></el-input>
+          </el-form-item>
+          <img width="22" height="22" class="add" @click="add" src="../../../public/img/add.png" alt="" />
+          <img width="22" height="22" class="del" @click="del(index)" src="../../../public/img/del.png" alt="" />
+        </el-form>
+        <el-form label-width="200px">
+            <el-form-item label="合计重量">
+                <el-input disabled v-model="form.transferOutWeight" placeholder="自动计算，不可编辑"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" @click="onSubmit">提交</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+  </div>
+</template>
+<script>
+
+import {
+    getredeemedinfo,
+    getcusationinfo,
+    setrollin
+} from '@/model/warehouse/index'
+import {
+    packList,
+  } from '@/model/contarct/index'
+  import {
+    getwarehouse
+  } from '@/model/houseSelfCollect/index'
+import {xialaNo} from '@/model/tasksport/index'
+  export default {
+    components: {},
+    data() {
+      return {
+        cusationinfo:[],
+        tableData:[],
+        contractNoList:[],
+        goodnameList:[],
+        warehouseList:[],
+        binNumberList:[],
+        rollweight:0,
+        compId: localStorage.getItem('ws-pf_compId'),
+        form:{
+            relationReceiveNo:'不关联',
+            redeemFlag:'0',
+            cargoPositionDetailsList:[{binNumber:'',positionId:'',weight:'',goodsweight:''}],
+            compId: localStorage.getItem('ws-pf_compId')
+        }
+      }
+    },
+    activated() {
+      this.getList()
+    },
+    methods: {
+    amountinginput(e){
+        if(this.form.amountEdPayable){
+            this.form.amountNotPayable=e-this.form.amountEdPayable
+        }
+    },
+    amountedinput(e){
+        if(this.form.amountIngPayable){
+            this.form.amountNotPayable=this.form.amountIngPayable-e
+        }
+    },
+    del(index){
+        if(this.form.cargoPositionDetailsList.length>1){
+            this.form.cargoPositionDetailsList.splice(index,1)
+        }else{
+            this.$message.error('至少保留一条仓位！')
+        }
+        this.form.transferOutWeight=0
+        for (let i = 0; i < this.form.cargoPositionDetailsList.length; i++) {
+                if(this.form.cargoPositionDetailsList[i].weight){
+                this.form.transferOutWeight+=Number(this.form.cargoPositionDetailsList[i].weight)
+                }
+            }
+        this.form.transferOutWeight=this.form.transferOutWeight.toFixed(3)
+    },
+    add(){
+      this.form.cargoPositionDetailsList.push({binNumber:'',positionId:'',weight:'',goodsweight:''})
+      this.$forceUpdate()
+    },
+    onSubmit(){
+        if(!this.form.outContractNo){
+            this.$message.error('合同编号不能为空！')
+            return
+        }
+        if(!this.form.goodsName){
+            this.$message.error('货名不能为空！')
+            return
+        }
+        if(this.form.redeemFlag==1&&!this.form.redeemContractNo){
+            this.$message.error('待赎回合同不能为空！')
+            return
+        }
+        if(!this.form.avgCost){
+            this.$message.error('平均成本不能为空！')
+            return
+        }
+        if(!this.form.amountIngPayable&&this.form.amountIngPayable!=0){
+            this.$message.error('应付粮款不能为空！')
+            return
+        }
+        if(!this.form.amountEdPayable&&this.form.amountEdPayable!=0){
+            this.$message.error('已付粮款不能为空！')
+            return
+        }
+        if(!this.form.amountNotPayable&&this.form.amountNotPayable!=0){
+            this.$message.error('未付粮款不能为空！')
+            return
+        }
+        if(!this.form.warehouseName){
+            this.$message.error('库点不能为空！')
+            return
+        }
+            for (let i = 0; i < this.form.cargoPositionDetailsList.length; i++) {
+                if(!this.form.cargoPositionDetailsList[i].binNumber){
+                this.$message.error('仓位号不能为空！')
+                return
+                }
+                if(!this.form.cargoPositionDetailsList[i].weight){
+                this.$message.error('入库重量不能为空！')
+                return
+                }
+                if(this.form.cargoPositionDetailsList[i].weight<0||
+                String(this.form.cargoPositionDetailsList[i].weight).indexOf(".") != -1 && String(this.form.cargoPositionDetailsList[i].weight).split('.')[1].length > 3){
+                this.$message.error('入库重量输入错误！')
+                return
+                }
+                var binNumberdata=this.form.cargoPositionDetailsList.filter((item)=>{return item.binNumber==this.form.cargoPositionDetailsList[i].binNumber})
+                if(binNumberdata.length>1){
+                this.$message.error('仓位号不能重复！')
+                return
+                }
+            }
+            if(this.form.transferOutWeight!=this.form.transferOutWeight1&&this.form.relationReceiveNo!='不关联'){
+                this.$message.error('入库重量与出库重量不相等！')
+                return
+            }
+            this.$confirm('确定提交货权转移信息？', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+            })
+                .then(() => {
+                    setrollin(this.form).toPromise()
+                    .then((response) => {
+                    this.$message.success('提交成功！')
+                    this.$router.go(-1)
+                    // row.weightedit=false
+                    this.getList()
+                    }).catch((req)=>{
+                    this.$message.error(req.message)
+                    })
+                })
+        },
+        returnsales(){
+        this.$router.go(-1)
+      },
+        binNumberchange(e,item,index){
+            for (let i = 0; i < this.binNumberList.length; i++) {
+                if(this.binNumberList[i].binNumber==e){
+                item.positionId=this.binNumberList[i].id
+                }
+            }
+        },
+        binNumberfocus(){
+            if(!this.form.warehouseName){
+                this.$message.error('请选择库点！')
+            }
+        },
+        async warehouseNamechange(e){
+            for (let i = 0; i < this.warehouseList.length; i++) {
+                this.form.baseId=this.warehouseList[i].id
+                if(this.form.warehouseName==this.warehouseList[i].warehouseName){
+                    console.log(this.warehouseList[i].positionInfos,111111)
+                    this.binNumberList = this.warehouseList[i].positionInfos
+                    this.$forceUpdate()
+                }
+            }
+        },
+        weightinput(e){
+            this.form.transferOutWeight=0
+            for (let i = 0; i < this.form.cargoPositionDetailsList.length; i++) {
+                if(this.form.cargoPositionDetailsList[i].weight){
+                this.form.transferOutWeight+=Number(this.form.cargoPositionDetailsList[i].weight)
+                }
+            }
+            this.form.transferOutWeight=this.form.transferOutWeight.toFixed(3)
+        },
+    contractNochange(e){
+        for (let i = 0; i < this.contractNoList.length; i++) {
+            if(this.contractNoList[i].contractNo==e&&this.form.relationReceiveNo=='不关联'){
+                this.$set(this.form,'customer',this.contractNoList[i].seller)
+            }
+            if(this.contractNoList[i].contractNo==e){
+              this.$set(this.form,'contractSeller',this.contractNoList[i].seller)
+                this.$set(this.form,'goodsName',this.contractNoList[i].goodsName)
+                this.$set(this.form,'goodsNameKey',this.contractNoList[i].goodsNameKey)
+                this.$set(this.form,'avgCost',this.contractNoList[i].unitContractPrice)
+            }
+        }
+    },
+    receiveNochange(e){
+        for (let i = 0; i < this.cusationinfo.length; i++) {
+            if(this.cusationinfo[i].relationReceiveNo==e){
+                this.$set(this.form,'customer',this.cusationinfo[i].customer)
+                this.$set(this.form,'transferOutWeight1',this.cusationinfo[i].transferOutWeight)
+                this.$set(this.form,'amountIngPayable',this.cusationinfo[i].amountIngPayable)
+                this.$set(this.form,'amountEdPayable',this.cusationinfo[i].amountEdPayable)
+                this.$set(this.form,'amountNotPayable',this.cusationinfo[i].amountNotPayable)
+            } 
+        }
+    },
+    goosnamechange(e){
+        for (var i = 0; i < this.goodnameList.length; i++) {
+          if (this.goodnameList[i].constValue == e) {
+            this.form.goodsNameKey = this.goodnameList[i].constKey
+          }
+        }
+    },
+    async getList() {
+        var response=await getcusationinfo({
+            searchType:1,
+            currentPage: 1,
+            pageSize:9999,
+            compId:localStorage.getItem('ws-pf_compId'),
+          })
+          .toPromise()
+          this.cusationinfo=response.records
+          this.contractNoList=await xialaNo({compId: localStorage.getItem('ws-pf_compId'),flag: 0}).toPromise()
+          this.warehouseList=await getwarehouse({compId: this.compId}).toPromise()
+          // 货名
+          this.goodnameList =await packList({
+            constId: 'CON2',
+          })
+          .toPromise()
+         var response1=await getredeemedinfo({
+            dropFlag:1,
+            pageSize:9999 ,
+            currentPage: 1,
+            compId:localStorage.getItem('ws-pf_compId'),
+          })
+          .toPromise()
+            this.tableData = response1.records
+           this.deptBudgetTotal = response.total
+      },
+    },
+  }
+</script>
+<style lang="scss" scoped>
+ table,
+      table tr th,
+      table tr td {
+        border: 2px solid #333333;
+        padding: 5px 0;
+        height: 55px;
+      }
+
+      .content {
+        width: 1000px;
+        padding: 70px 20px 20px 20px;
+        font-size: 22px;
+        position: absolute;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+      }
+
+      table {
+        width: 100%;
+        text-align: center;
+        border-collapse: collapse;
+        border: 3px solid #333333;
+      }
+
+      .col-bgc {
+        background: #f6f7fb;
+      }
+
+  .container {
+    background: #E8ECF6;
+  }
+
+  .center {
+    margin: 0 auto;
+    background: #ffffff;
+    height: calc(100vh - 13vh);
+    border-radius: 4px;
+    padding: 20px 0;
+
+    /deep/.el-table td,
+    /deep/.el-table th {
+      text-align: center;
+    }
+  }
+
+  .row_top {
+    background: #F6F7FC;
+    border-radius: 4px;
+    margin-bottom: 10px;
+
+    .bg-left {
+      padding-left: 30px;
+    }
+
+    .bg-right {
+      padding-right: 10px;
+      text-align: right;
+    }
+
+    .title {
+      position: relative;
+    }
+
+    .title::before {
+      content: '';
+      display: inline-block;
+      width: 5px;
+      height: 30px;
+      background: #5473e8;
+      position: absolute;
+      left: 0;
+    }
+  }
+
+  .datascreen {
+    display: flex;
+
+    .data_css {
+      width: 40%;
+    }
+
+    .input_css {
+      width: 50%;
+      margin: 0 10px;
+    }
+
+    .find {
+      margin-right: 10px;
+    }
+  }
+
+  .fromdata {
+    margin: 20px 0;
+    overflow-y: scroll;
+    height: 546px;
+  }
+  .top_info{
+    margin: 10px 0 0 10px;
+    min-width: 712px;
+    .info_css{
+      margin-right: 20px;
+    }
+  }
+  .bg-right{
+    padding-top:15px;
+  }
+  .el-icon-connection{
+    color:#409eff;
+  }
+  .flex{
+    display:flex;justify-content: space-between;
+  }
+  .el-form{
+    width:50%;
+    margin:0 auto; 
+    position:relative;
+  }
+  /deep/.el-form .el-select{
+    width:100%;
+  }
+  /deep/.el-form.el-form--inline{
+    margin-bottom:18px;
+  }
+  /deep/.el-form.el-form--inline .el-form-item{
+      margin:0;
+}
+.add,.del{
+      position:absolute;
+      top:50%;
+      transform:translateY(-50%);
+      right:25px;
+    }
+    .del{
+      right:-2px;
+    }
+</style>

src/views/warehousenew/inventoryCheck.vue

@@ -96,7 +96,7 @@
         <el-table-column prop="profitAndLoss" class="table_td" label="盈亏（吨）">
            <template slot-scope="scope">
            <span>{{scope.row.profitAndLoss}}</span>
-           <i @click="handlerecord(scope.row)" class="el-icon-s-claim"></i>
+           <!-- <i @click="handlerecord(scope.row)" class="el-icon-s-claim"></i> -->
         </template>
         </el-table-column>
         <el-table-column prop="surplusWeight" width="130" class="table_td" label="剩余重量（吨）"></el-table-column>
@@ -567,7 +567,7 @@
             return
           }
         if(this.title=='盘盈'){
-          this.form.plValue=(this.form.num-this.form.surplusWeight).toFixed(3)
+          this.form.plValue=Math.floor((this.form.num-this.form.surplusWeight)*1000)/1000
           this.form.flag=0
           if(this.form.num<this.form.surplusWeight){
             this.$notify.warning({
@@ -579,7 +579,7 @@
           title='确定提交盘盈数据？'
         }
         if(this.title=='盘亏'){
-          this.form.plValue=(this.form.num-this.form.surplusWeight).toFixed(3)
+          this.form.plValue=Math.floor((this.form.num-this.form.surplusWeight)*1000)/1000
           this.form.flag=1
           if(this.form.num>this.form.surplusWeight){
             this.$notify.warning({

src/views/warehousenew/warehouseManagementList.vue

@@ -438,7 +438,6 @@
           if(strDate<10){ 
              strDate = "0"+strDate
           }
-          debugger
           var pastdate = new Date(date.getTime() - 24 * 60 * 60 * 1000)
           this.StartDate =pastdate.getFullYear() + '-' + (pastdate.getMonth() + 1) + '-' + (pastdate.getDate()>10?pastdate.getDate():'0'+pastdate.getDate())+' 00:00:00'
           // this.StartDate = new Date(pastdate.getFullYear() + '-' + (pastdate.getMonth() + 1) + '-' + (pastdate.getDate()>10?pastdate.getDate():'0'+pastdate.getDate())+' 00:00:00')
@@ -462,7 +461,6 @@
           this.$message.error('请选择打印的类型')
           return
         }
-        debugger
         if (!this.parameter.printStartDate) {
           this.$message.error('请选择打印的起始日期')
           return

src/views/warehousenew/warehousingOrder.vue

@@ -62,7 +62,10 @@
       <el-col style='text-align:right;' :span="12">
         <!-- <ws-button v-hasPermission="
             `warehouseManagement.warehousingOrder.yufu`" type="primary" @click="interestrate()" >{{interestratevalue.value}}利率</ws-button> -->
-            <ws-button  type="primary" @click="exportList()">导出</ws-button>
+        <!-- <ws-button  type="primary" @click="awatingransom()">待赎回</ws-button>
+        <ws-button  type="primary" @click="editRollout()">修改赎回状态</ws-button>
+        <ws-button  type="primary" @click="goodrollOut()">货权转出</ws-button> -->
+        <ws-button  type="primary" @click="exportList()">导出</ws-button>
         <ws-button v-hasPermission="
         `warehouseManagement.warehousingOrder.yufu`" type="primary" @click="fieldrations()">折干</ws-button>
         <ws-button v-hasPermission="
@@ -149,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>
@@ -163,6 +166,18 @@
           </template>
         </el-table-column>
         <el-table-column prop="outWarehouseWeight" width="80" class="table_td" label="出库重量"></el-table-column>
+        <!-- <el-table-column prop="transferOutWeight" width="200" class="table_td" label="转出">
+          <template scope="scope">
+            <el-popover v-if="scope.row.transferOutWeight>0"
+              placement="top-start"
+              width="220"
+              trigger="hover"
+              :content="scope.row.transferOutNo">
+              <span slot="reference" :style="scope.row.transferOutWeight>0?'color:#5F7DE9;':''">{{ scope.row.transferOutWeight }} <span v-if="scope.row.redeemFlag=='赎'">（赎）</span></span>
+            </el-popover>
+            <span v-else>{{ scope.row.transferOutWeight }}</span>
+          </template>
+        </el-table-column> -->
         <el-table-column prop="profitAndLoss" class="table_td" label="盈亏（吨）"></el-table-column>
         <el-table-column prop="surplusWeight" width="80" class="table_td" label="剩余重量"></el-table-column>
         <el-table-column prop="grainFund" width="80" class="table_td" label="粮款（元）"></el-table-column>
@@ -467,6 +482,57 @@
     <el-dialog width='30%' :visible.sync="remarkList" title="备注" top="20vh">
       <span>{{ remark }}</span>
     </el-dialog>
+    <el-dialog width='50%' :visible.sync="rolloutShow" title="货权转出" top="20vh">
+      <div class="form-inline">
+        <div style="margin:10px;">
+          选中{{ rolloutData.warehousingOrderList.length }}条：{{rolloutData.warehouseName}}&nbsp;转出&nbsp;{{ rolloutData.goodsName }}&nbsp;
+          {{ rolloutData.transferOutWeight }}吨&nbsp;应付{{rolloutData.amountIngPayable}}&nbsp; 已付{{rolloutData.amountEdPayable}}&nbsp; 
+          未付{{rolloutData.amountNotPayable}}&nbsp; 平均成本 {{ rolloutData.avgCost }}
+        </div>
+        <el-form :inline="true" label-width="120px" class="demo-form-inline">
+          <el-form-item label="售价（元/吨）">
+            <el-input v-model="rolloutData.salePrice" placeholder="输入货权转出售价"></el-input>
+          </el-form-item>
+          <el-form-item label="是否赎回">
+            <el-radio v-model="rolloutData.redeemFlag" label="1">暂定赎回</el-radio>
+            <el-radio v-model="rolloutData.redeemFlag" label="0">永不赎回</el-radio>
+          </el-form-item>
+        </el-form>
+        <el-form :inline="true" label-width="120px" class="demo-form-inline">
+          <el-form-item label="合同编号">
+            <el-select clearable filterable @change="contractNochange" v-model="rolloutData.outContractNo" placeholder="选择合同编号">
+              <el-option v-for="item in contractNoList" :key="item.contractNo" :label="item.contractNo" :value="item.contractNo"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
+        <el-form :inline="true" label-width="120px" class="demo-form-inline">
+          <el-form-item label="是否赎回">
+            <el-radio v-model="rolloutData.systemIdentification" label="1">易粮易运用户</el-radio>
+            <el-radio v-model="rolloutData.systemIdentification" label="0">非易粮易运用户</el-radio>
+          </el-form-item>
+          <el-form-item label="">
+            <el-input v-model="rolloutData.receiveCompName" placeholder="输入货权接收公司全称"></el-input>
+          </el-form-item>
+        </el-form>
+        <el-form :inline="true" label-width="120px" v-for="(item,index) in rolloutData.cargoPositionDetailsList" class="demo-form-inline">
+          <el-form-item :label="'仓位-'+(index+1)">
+            <el-select clearable filterable @change="($event)=>binNumberchange($event,item,index)" v-model="item.binNumber" placeholder="选择仓位">
+              <el-option v-for="item1 in binNumberList" :label="item1.binNumber+'（'+item1.goodsweight+'）'" :value="item1.binNumber"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="出库重量（吨）">
+            <el-input @input="weightinput" v-model="item.weight" placeholder="输入该仓位出库重量"></el-input>
+          </el-form-item>
+          <img width="22" height="22" class="add" @click="add" src="../../../public/img/add.png" alt="" />
+          <img width="22" height="22" class="del" @click="del(index)" src="../../../public/img/del.png" alt="" />
+        </el-form>
+        <div style="text-align: right;margin: 10px;">合计：{{rollweight}}吨</div>
+        <span slot="footer" class="dialog-footer">
+          <el-button @click="rolloutShow = false">取 消</el-button>
+          <el-button type="primary" @click="rolloutclick">确 定</el-button>
+        </span>
+      </div>
+    </el-dialog>
     <el-dialog width='50%' :visible.sync="interestrateshow" title="修改利率" top="20vh">
       <el-input placeholder="" v-model="interestratevalue.value"></el-input>
       <span slot="footer" class="dialog-footer">
@@ -493,6 +559,10 @@
         <div>累计仓储费</div>
         <div>{{storageFee}}</div>
       </div>
+      <div style="justify-content:space-between;" class="flex">
+        <div>烘干费</div>
+        <div>{{dryingFee?dryingFee:0}}</div>
+      </div>
       <div v-for="(item, index) in costlist" :key="index" class="audit">
         <div class="audit_item">
           <div class="audit_left">
@@ -530,6 +600,7 @@
   </div>
 </template>
 <script>
+import { allRoles } from '@/utils/util'
 import {
   getoreditoutput,
   outdelete,
@@ -549,7 +620,11 @@ import {
   setenabledinfo,
   getbyname,
   sponsorWithdraw,
-  exportOrder
+  exportOrder,
+  getdryweight,
+  getbinnumber,
+  setrollout,
+  editrollout
 } from '@/model/warehouse/index'
 import {
   selectWarehouseSelf,
@@ -565,6 +640,9 @@ import {
   fmoney,
   EventBus
 } from 'base-core-lib'
+import {
+		xialaNo,
+	} from '@/model/tasksport/index'
 import { findLastIndexOfIterate } from 'xe-utils/methods'
 export default {
   name: 'viewSpareMoney',
@@ -594,7 +672,24 @@ export default {
       EndDate:'',
       rejectshow:false,
       options: [],
+      rollweight:0,
+      rolloutData:{
+        warehouseId:'',
+        warehouseName:'',
+        goodsName:'',
+        transferOutWeight:0,
+        amountEdPayable:0,
+        amountNotPayable:0,
+        amountIngPayable:0,
+        avgCost:0,
+        redeemFlag:'1',
+        systemIdentification:'1',
+        warehousingOrderList:[],
+        cargoPositionDetailsList:[{binNumber:'',positionId:'',weight:'',goodsweight:''}],
+        compId: localStorage.getItem('ws-pf_compId')
+      },
       isShowPrintType: false,
+      rolloutShow:false,
       // warehouseAllXiaLa:[],
       textarea: '',
       weightGreater:'',
@@ -710,6 +805,7 @@ export default {
       money: 0,
       interest:'',
       storageFee:'',
+      dryingFee:'',
       multipleSelection1: {},
       aduitshow: false,
       distributionshow: false,
@@ -738,7 +834,9 @@ export default {
       titletype: '',
       remark: '',
       baseId:'',
-      auditMind:''
+      auditMind:'',
+      contractNoList:[],
+      binNumberList:[],
     }
   },
   // activated() {
@@ -762,6 +860,285 @@ export default {
     this.showType = this.isShow
   },
   methods: {
+    weightinput(e){
+      this.rollweight=0
+      for (let i = 0; i < this.rolloutData.cargoPositionDetailsList.length; i++) {
+        if(this.rolloutData.cargoPositionDetailsList[i].weight){
+          this.rollweight+=Number(this.rolloutData.cargoPositionDetailsList[i].weight)
+        }
+      }
+      this.rollweight=this.rollweight.toFixed(3)
+    },
+    contractNochange(e){
+      for (let i = 0; i < this.contractNoList.length; i++) {
+        if(this.contractNoList[i].contractNo==e){
+          this.rolloutData.receiveCompName=this.contractNoList[i].buyer
+        }
+      }
+      
+    },
+    awatingransom(){
+      this.$router.push({path: 'awaitRansom'})
+    },
+    editRollout(){
+      var concatarr=[]
+      var arr=[]
+      for (const key in this.multipleSelection1) {
+        concatarr = concatarr.concat(this.multipleSelection1[key])
+      }
+      if(concatarr.length==0){
+        this.$message.error('至少勾选一条！')
+        return 
+      }
+      for (const key in this.multipleSelection1) {
+        var array = this.multipleSelection1[key]
+        for (let i = 0; i < array.length; i++) {
+          if(array[i].redeemFlag == '赎'){
+            arr.push(array[i])
+          }else{
+            this.$message.error('请勾选需要赎回的货源！')
+            return
+          }
+        }
+        
+      }
+      this.$confirm('确定以上货源不再赎回？', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          editrollout({warehousingOrderList:concatarr}).toPromise()
+            .then((response) => {
+              this.$message.success('操作成功！')
+              // row.weightedit=false
+              this.getList()
+            })
+        })
+    },
+    rolloutclick(){
+      if(!this.rolloutData.salePrice){
+        this.$message.error('转出售价不能为空！')
+        return
+      }
+      if(!this.rolloutData.outContractNo){
+        this.$message.error('合同编号不能为空！')
+        return
+      }
+      if(this.rolloutData.systemIdentification==1&&!this.rolloutData.receiveCompName){
+        this.$message.error('货权接收公司不存在！')
+        return
+      }
+      for (let i = 0; i < this.rolloutData.cargoPositionDetailsList.length; i++) {
+        if(!this.rolloutData.cargoPositionDetailsList[i].binNumber){
+          this.$message.error('仓位号不能为空！')
+          return
+        }
+        if(!this.rolloutData.cargoPositionDetailsList[i].weight){
+          this.$message.error('出库重量不能为空！')
+          return
+        }
+        if(this.rolloutData.cargoPositionDetailsList[i].weight<0||
+        String(this.rolloutData.cargoPositionDetailsList[i].weight).indexOf(".") != -1 && String(this.rolloutData.cargoPositionDetailsList[i].weight).split('.')[1].length > 3){
+          this.$message.error('出库重量输入错误！')
+          return
+        }
+        if(this.rolloutData.cargoPositionDetailsList[i].weight>this.rolloutData.cargoPositionDetailsList[i].goodsweight){
+          this.$message.error('出库重量不能超过库存重量！')
+          return
+        }
+        var binNumberdata=this.rolloutData.cargoPositionDetailsList.filter((item)=>{return item.binNumber==this.rolloutData.cargoPositionDetailsList[i].binNumber})
+        if(binNumberdata.length>1){
+          this.$message.error('仓位号不能重复！')
+          return
+        }
+      }
+      if(this.rollweight!=this.rolloutData.transferOutWeight){
+        this.$message.error('输入的出库重量合计须等于勾选的重量合计！')
+        return
+      }
+      
+      this.$confirm('提交后不可修改，确定转出货权？', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          setrollout(this.rolloutData).toPromise()
+            .then((response) => {
+              this.rolloutShow=false
+              this.$message.success('提交成功！')
+              // row.weightedit=false
+              this.getList()
+              this.rolloutData={
+                warehouseId:'',
+                warehouseName:'',
+                goodsName:'',
+                transferOutWeight:0,
+                amountEdPayable:0,
+                amountNotPayable:0,
+                amountIngPayable:0,
+                avgCost:0,
+                redeemFlag:'1',
+                systemIdentification:'1',
+                warehousingOrderList:[],
+                cargoPositionDetailsList:[{binNumber:'',positionId:'',weight:'',goodsweight:''}],
+                compId: localStorage.getItem('ws-pf_compId')
+              }
+            }).catch((req)=>{
+              this.$message.error(req.message)
+            })
+        })
+      
+    },
+    binNumberchange(e,item,index){
+      for (let i = 0; i < this.binNumberList.length; i++) {
+        if(this.binNumberList[i].binNumber==e){
+          item.positionId=this.binNumberList[i].id
+          item.weight=this.binNumberList[i].goodsweight
+          item.goodsweight=this.binNumberList[i].goodsweight
+        }
+      }
+      this.rollweight=0
+      for (let i = 0; i < this.rolloutData.cargoPositionDetailsList.length; i++) {
+        if(this.rolloutData.cargoPositionDetailsList[i].weight){
+          this.rollweight+=Number(this.rolloutData.cargoPositionDetailsList[i].weight)
+        }
+      }
+      this.rollweight=this.rollweight.toFixed(3)
+    },
+    del(index){
+      if(this.rolloutData.cargoPositionDetailsList.length>1){
+        this.rolloutData.cargoPositionDetailsList.splice(index,1)
+      }else{
+        this.$message.error('至少保留一条仓位！')
+      }
+      this.rollweight=0
+      for (let i = 0; i < this.rolloutData.cargoPositionDetailsList.length; i++) {
+        if(this.rolloutData.cargoPositionDetailsList[i].weight){
+          this.rollweight+=this.rolloutData.cargoPositionDetailsList[i].weight
+        }
+      }
+      this.rollweight=this.rollweight.toFixed(3)
+    },
+    add(){
+      this.rolloutData.cargoPositionDetailsList.push({binNumber:'',positionId:'',weight:'',goodsweight:''})
+      console.log(this.rolloutData)
+      this.$forceUpdate()
+    },
+    async goodrollOut(){
+      var concatarr=[]
+      var arr=[]
+      var arr3=[]
+      var arr4=[]
+      for (const key in this.multipleSelection1) {
+        concatarr = concatarr.concat(this.multipleSelection1[key])
+      }
+      if(concatarr.length==0){
+        this.$message.error('至少勾选一条！')
+        return 
+      }
+      for (const key in this.multipleSelection1) {
+        var array = this.multipleSelection1[key]
+        for (let i = 0; i < array.length; i++) {
+          if(array[i].amountEdPayable == 0 && !array[i].approveStatus||array[i].amountEdPayable == array[i].grainFund && !array[i].approveStatus){
+            arr.push(array[i])
+          }else{
+            this.$message.error('请选择已付全款或未请款的条目！')
+            return
+          }
+          if (arr3.length == 0) {
+            arr3.push(array[i])
+          } else {
+            var arr2 = arr3.filter((item) => { return item.warehouseName == array[i].warehouseName })
+            if (arr2.length == 0) {
+              arr3.push(array[i])
+            }
+          }
+          if (arr4.length == 0) {
+            arr4.push(array[i])
+          } else {
+            var arr5 = arr4.filter((item) => { return item.warehouseName == array[i].warehouseName })
+            if (arr5.length == 0) {
+              arr4.push(array[i])
+            }
+          }
+        }
+        
+      }
+      let map = new Map();
+      for (let item of arr) {
+        map.set(item.goodsName, item);
+      }
+
+      var data = [...map.values()];
+      if (data.length > 1) {
+        this.$message({
+          message: '所选条目货名不一致！',
+          type: 'warning'
+        });
+        return
+      }
+      if (arr3.length > 1) {
+        this.$message({
+          message: '所选条目库点不一致！',
+          type: 'warning'
+        });
+        return
+      }
+      if (arr4.length > 1) {
+        this.$message({
+          message: '所选条目合同编号不一致！',
+          type: 'warning'
+        });
+        return
+      }
+      var num=0
+      this.rolloutData.warehousingOrderList=arr
+      this.rolloutData.warehouseId=arr[0].baseId
+      this.rolloutData.warehouseName=arr[0].warehouseName
+      this.rolloutData.goodsName=arr[0].goodsName
+      this.rolloutData.transferOutWeight=0
+      this.rolloutData.amountEdPayable=0
+      this.rolloutData.amountNotPayable=0
+      this.rolloutData.amountIngPayable=0
+      for (let i = 0; i < arr.length; i++) {
+        this.rolloutData.transferOutWeight+=Number(arr[i].surplusWeight)
+        this.rolloutData.amountEdPayable+=Number(arr[i].amountEdPayable)
+        this.outamountNotPayable+=Number(arr[i].amountNotPayable)
+        this.rolloutData.amountIngPayable+=Number(arr[i].grainFund)
+        num+=(Number(arr[i].surplusWeight*arr[i].avgCost))
+      }
+      this.rolloutData.transferOutWeight= this.rolloutData.transferOutWeight.toFixed(3)
+      this.rolloutData.avgCost=(num/this.rolloutData.transferOutWeight).toFixed(3)
+      this.rolloutData.amountEdPayable=this.rolloutData.amountEdPayable.toFixed(3)
+      this.rolloutData.amountNotPayable=this.rolloutData.amountNotPayable.toFixed(3)
+      this.rolloutData.amountIngPayable=this.rolloutData.amountIngPayable.toFixed(3)
+      this.contractNoList=await xialaNo({compId: localStorage.getItem('ws-pf_compId'),flag: 1}).toPromise()
+      var data=await getbinnumber({id: this.rolloutData.warehouseId,}).toPromise()
+      for (let i = 0; i < data.warehousePositionInfoList.length; i++) {
+        var item=data.warehousePositionInfoList[i]
+        if(item.warehousePositionStorageInfoList){
+          for (let q = 0; q < item.warehousePositionStorageInfoList.length; q++) {
+            if(item.warehousePositionStorageInfoList[q].goodsName==this.rolloutData.goodsName){
+              this.$set(item,'goodsweight',item.warehousePositionStorageInfoList[q].storage)
+            }
+          }
+          if(item.warehousePositionStorageInfoList.filter((item)=>{return item.goodsName==this.rolloutData.goodsName}).length==0){
+            this.$set(item,'goodsweight',0)
+          }
+        }else{
+          this.$set(item,'goodsweight',0)
+        }
+      }
+      console.log(data.warehousePositionInfoList)
+      this.binNumberList = data.warehousePositionInfoList
+      // var that = this
+      // setTimeout(function(){
+        this.rolloutShow=true
+      // },1000)
+      
+    },
     exportList() {
           let date = new Date()
           var year = date.getFullYear();
@@ -928,7 +1305,6 @@ export default {
       this.getList()
     },
     goodsNameChange(e){
-      console.log(e,1111111111)
       if (e == '全部货名' || e == '0') {
         this.goodsName = '0'
         this.reserves = ''
@@ -988,8 +1364,10 @@ export default {
         if (this.options[i].binNumber == e) {
           this.fieldrationsList.beforePositionId = this.options[i].id
         }
-
       }
+    },
+    warehouseweightfocus(){
+
     },
     warehousefocus1() {
       getposition({ baseId: this.fieldrationsList.baseId }).toPromise()
@@ -1115,7 +1493,7 @@ export default {
         type: 'warning',
       })
         .then(() => {
-          editwarehousingorder({ id: row.id, inWarehouseWeight: row.inWarehouseWeight1 }).toPromise()
+          editwarehousingorder({ id: row.id, inWarehouseWeight: row.inWarehouseWeight1,flag: 6}).toPromise()
             .then((response) => {
               // row.weightedit=false
               this.getList()
@@ -1144,6 +1522,13 @@ export default {
         })
     },
     withdraw(item) {
+      if(!this.multipleSelection1[item.id]){
+        this.$message({
+            message: '至少选择一条请款审核中的条目',
+            type: 'error'
+          });
+      }
+      else{
       var arr1 = this.multipleSelection1[item.id]
       for (let i = 0; i < arr1.length; i++) {
         if (!arr1[i].approveStatus || arr1[i].approveStatus == '发起人撤回') {
@@ -1177,6 +1562,7 @@ export default {
         }
       }
       this.getList()
+      }
     },
     unique(arr) {
       const res = new Map();
@@ -1202,6 +1588,13 @@ export default {
                 });
                 return
               }
+              if (this.multipleSelection1[item.id][i].transferOutWeight > 0) {
+                this.$message({
+                  message: '已转出的条目禁止请款！',
+                  type: 'warning'
+                });
+                return
+              }
               if (this.multipleSelection1[item.id][i].amountNotPayable > 0 && this.multipleSelection1[item.id][i].approveStatus 
               && this.multipleSelection1[item.id][i].approveStatus !='发起人撤回') {
                 this.$message({
@@ -1231,8 +1624,6 @@ export default {
           type: 'warning'
         });
       }
-
-
     },
     marginAllocation() {
       let _this = this
@@ -1297,12 +1688,11 @@ export default {
             return
           })
       }
-
     },
     interestrate() {
       this.interestrateshow = true
     },
-    fieldrations() {
+    async fieldrations() {
       let _this = this
       console.log(this.multipleSelection1)
       var arr = []
@@ -1389,28 +1779,29 @@ export default {
       }
       // this.currectdata=item
       this.currectdata = arr1
-      console.log(this.currectdata)
       this.fieldrationsList.warehousingOrderList = this.currectdata
       this.fieldrationsList.baseId = this.currectdata[0].baseId
       this.fieldrationsList.beforeWeight = weight.toFixed(3)
-      getbyname({ warehouseId: this.currectdata[0].baseId, goodsName: this.currectdata[0].goodsName }).toPromise()
-        .then((response) => {
-          if (response) {
+      var response=await getbyname({ warehouseId: this.currectdata[0].baseId, goodsName: this.currectdata[0].goodsName }).toPromise()
+      let count = 0
+      for(let i = 0;i<arr1.length;i++){
+        let array =[]
+        array.push(arr1[i])
+        var response1=await getdryweight({ warehousingOrderList: array }).toPromise()
+        if (response) {
             let weight2 = 0
             for (let i = 0; i < this.currectdata.length; i++) {
               var weightedMoisture = (this.currectdata[i].weightedMoisture - 14)
               var deductWeight = 100 - (weightedMoisture * response.deductWeight)
-              // console.log(deductWeight,111111111)
-              this.currectdata[i].afterWeight = ((deductWeight / 100) * this.currectdata[i].surplusWeight)
-              weight2 += ((deductWeight / 100) * this.currectdata[i].surplusWeight)
             }
-            console.log(this.currectdata)
-            this.fieldrationsList.afterWeight = weight2.toFixed(3)
+            count =Number(count)+ Number(response1)
+            this.fieldrationsList.warehousingOrderList[i].afterWeight = response1
+
             this.fieldrationsshow = true
           }
-        })
+      }
+      this.fieldrationsList.afterWeight = count.toFixed(3)
       // this.fieldrationsList.beforeCost=this.currectdata[0].avgCost
-
     },
     distribution() {
       let _this = this
@@ -1495,7 +1886,6 @@ export default {
     },
     cancel(item) {
       item.payshow = true
-
       for (let i = 0; i < this.multipleSelection1[item.id].length; i++) {
         if (item.warehouseName == this.multipleSelection1[item.id][i].warehouseName) {
           this.multipleSelection1[item.id][i].select = false
@@ -1505,6 +1895,7 @@ export default {
     costclick(row) {
       this.interest=row.interest
       this.storageFee=row.storageFee
+      this.dryingFee = row.dryingFee
       this.costlist = row.expenseAllocationInfoList
       console.log(this.interest,this.storageFee)
       this.dialogVisible1 = true
@@ -1515,16 +1906,16 @@ export default {
       //   })
     },
     selectInit(row, index) {
-      if (localStorage.getItem('ws-pf_roleName') == '销售内勤' || localStorage.getItem('ws-pf_roleName') == '采购内勤'||localStorage.getItem('ws-pf_roleName').indexOf('专员')> -1) {
+      var role = allRoles()
+      if (role.roleName.indexOf('销售内勤') != -1 ||role.roleName.indexOf('采购内勤') != -1||role.roleName.indexOf('专员') != -1) {
         return true
-
       } else if (localStorage.getItem('ws-pf_staffName') == '杜大光') {
         return true
       } else if (localStorage.getItem('ws-pf_staffName') == '范占国') {
         return true
-      } else if (localStorage.getItem('ws-pf_roleName') == '财务') {
+      } else if (role.roleName.indexOf('财务') != -1) {
         return true
-      } else if (localStorage.getItem('ws-pf_roleName') == '出纳') {
+      } else if (role.roleName.indexOf('出纳') != -1) {
         return true
       }else if (localStorage.getItem('ws-pf_deptName') == '单证中心') {
         return true
@@ -1686,7 +2077,7 @@ export default {
         });
         return
       }
-      if (this.fieldrationsList.afterWeight >this.fieldrationsList.beforeWeight) {
+      if (Number(this.fieldrationsList.afterWeight) > Number(this.fieldrationsList.beforeWeight)) {
         this.$message({
           message: '折干后重量输入错误',
           type: 'warning'
@@ -1712,7 +2103,19 @@ export default {
               type: 'success'
             });
             this.form.distributionIng = ''
+            this.$set(this.fieldrationsList,'beforeBinNo','')
+            this.$set(this.fieldrationsList,'afterBinNo','')
+            // this.fieldrationsList.beforeBinNo = ''
+            // this.fieldrationsList.afterBinNo = ''
             this.fieldrationsshow = false
+            selectWarehouseSelf({
+              compId: localStorage.getItem('ws-pf_compId'),
+            })
+              .toPromise()
+              .then((response) => {
+                this.warehouseList = response
+                this.warehouseNameChange(this.warehouseName)
+              })
             this.getList()
           }).catch((response) => {
             if (response.code == null) {
@@ -2032,14 +2435,14 @@ export default {
             for (let q = 0; q < data.length; q++) {
               if (data[q].inType == '收购入库') {
                 data[q].inWarehouseWeight1 = Number((data[q].inWarehouseWeight).toFixed(3))
-                data[q].surplusWeight = ((data[q].inWarehouseWeight) - data[q].outWarehouseWeight + data[q].profitAndLoss).toFixed(3)
+                // data[q].surplusWeight = ((data[q].inWarehouseWeight) - data[q].outWarehouseWeight + data[q].profitAndLoss).toFixed(3)
               } else {
+                console.log( data[q].inWarehouseWeight.toFixed(3))
                 data[q].inWarehouseWeight1 = data[q].inWarehouseWeight.toFixed(3)
-                data[q].surplusWeight =(data[q].inWarehouseWeight - data[q].outWarehouseWeight + data[q].profitAndLoss).toFixed(3)
+                // data[q].surplusWeight =(data[q].inWarehouseWeight - data[q].outWarehouseWeight + data[q].profitAndLoss).toFixed(3)
               }
               data[q].avgCost = Number(data[q].avgCost).toFixed(2)
               data[q].amountMoney = Number(data[q].amountMoney).toFixed(4)
-              console.log(response.records[i].warehouseType)
               data[q].select = false
               data[q].weightedit = false
               data[q].edit = false
@@ -2187,6 +2590,7 @@ export default {
       this.marginshow = false
     },
     handleClose4() {
+      this.fieldrationsList.afterWeight = 0
       this.fieldrationsshow = false
     },
     handleSizeChange(val) {
@@ -2389,4 +2793,31 @@ export default {
       text-align: center;
      
     }
+    /deep/.form-inline .el-form.el-form--inline{
+      width:90%;
+      position:relative;
+    }
+    /deep/.form-inline .el-form.el-form--inline .el-form-item{
+      width:49%;
+      
+    }
+    /deep/.form-inline .el-form.el-form--inline .el-form-item .el-form-item__label{
+      width:30%;
+    }
+    /deep/.form-inline .el-form.el-form--inline .el-form-item .el-form-item__content{
+      width:70%;
+    }
+    .add,.del{
+      position:absolute;
+      top:50%;
+      transform:translateY(-50%);
+      right:-10px;
+    }
+    .del{
+      right:-40px;
+    }
+    // {
+    //   position:absolute;
+    //   top:50%;
+    // }
 </style>