Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

public/static/aduitprint.html

@@ -178,13 +178,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 +538,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">

public/static/inspection.html

@@ -168,7 +168,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>
@@ -276,7 +276,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/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

@@ -462,7 +462,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>
@@ -1050,7 +1050,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/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/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,7 +179,7 @@
                             <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:''}}
                             </td>
@@ -294,7 +294,7 @@
                             <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:''}}
                             </td>
@@ -397,8 +397,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,7 +412,7 @@
                         <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:''}}
                         </td>

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/views/houseSelfCollect/component/inspectInfoPrint.vue

@@ -40,7 +40,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/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/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/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/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/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>

src/views/warehousenew/warehousingOrder.vue

@@ -1149,6 +1149,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 == '发起人撤回') {
@@ -1182,6 +1189,7 @@ export default {
         }
       }
       this.getList()
+      }
     },
     unique(arr) {
       const res = new Map();
@@ -1711,6 +1719,10 @@ 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
             this.getList()
           }).catch((response) => {