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

public/static/payprint.html

@@ -282,7 +282,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">{{printData1[index].goodsName != '大豆'?'容重（克/升）':'蛋白'}}</td>
                   <td class="col col-bgc">毛重</td>
                   <td class="col col-bgc">皮重</td>
                   <td class="col col-bgc">扣杂重</td>
@@ -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">容量（克/升）</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">容量（克/升）</td>
+              <td class="col col-bgc">{{tableData.goodsName!= '大豆'?'容量（克/升）':'蛋白'}}</td>
               <td class="col">
                 {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.bulkDensity:''}}
               </td>

public/static/payprint1.html

@@ -276,7 +276,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">{{printData1[index].goodsName != '大豆'?'容重':'蛋白'}}</td>
                                 <td class="col col-bgc">毛重</td>
                                 <td class="col col-bgc">皮重</td>
                                 <td class="col col-bgc">扣重</td>
@@ -458,7 +458,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">容量（克/升）</td>
+                                <td class="col col-bgc">{{printData1[index].weighingManagement.goodsName != '大豆'?'容量（克/升）':'蛋白'}}</td>
                                 <td class="col">
                                     {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.bulkDensity:''}}
                                 </td>
@@ -646,7 +646,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>
@@ -666,7 +666,7 @@
                         <td class="col">
                             {{ printData.qualityInspectionManagement.impurity}}
                         </td>
-                        <td class="col">{{ printData.qualityInspectionManagement.bulkDensity}}</td>
+                        <td class="col">{{printData.qualityInspectionManagement?printData.qualityInspectionManagement.bulkDensity:''}}</td>
                         <td class="col">{{ printData.grossWeight}}</td>
                         <td class="col">{{ printData.tare}}</td>
                         <td class="col" v-if="compId!='6a713699e08c4cbc97a87f7648a95e3d' 
@@ -822,7 +822,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">{{tableData.goodsName != '大豆'?'容量（克/升）':'蛋白'}}</td>
                         <td class="col">
                             {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.bulkDensity:''}}
                         </td>

public/static/payprint1A5.html

@@ -276,7 +276,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">{{ printData1[index].goodsName != '大豆'?'容重（克/升）':'蛋白'}}</td>
                                 <td class="col col-bgc">毛重</td>
                                 <td class="col col-bgc">皮重</td>
                                 <td class="col col-bgc">扣杂重</td>
@@ -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">容量（克/升）</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">容量（克/升）</td>
+                        <td class="col col-bgc">{{tableData.goodsName!= '大豆'?'容量（克/升）':'蛋白'}}</td>
                         <td class="col">
                             {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.bulkDensity:''}}
                         </td>

public/static/payprint2.html

@@ -276,7 +276,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">{{printData1[index].goodsName != '大豆'? '容重（克/升）': '蛋白'}}</td>
                                 <td class="col col-bgc">毛重</td>
                                 <td class="col col-bgc">皮重</td>
                                 <td class="col col-bgc">扣杂重</td>
@@ -295,7 +295,7 @@
                                     {{ printData1[index].qualityInspectionManagement.impurity}}
                                 </td>
                                 <td class="col">
-                                    {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.bulkDensity:''}}
+                                    {{printData1[index].qualityInspectionManagement?printData1[index].qualityInspectionManagement.bulkDensity:''}}
                                 </td>
                                 <td class="col">{{ printData1[index].grossWeight}}</td>
                                 <td class="col">{{ printData1[index].tare}}</td>
@@ -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">容量（克/升）</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">容量（克/升）</td>
+                        <td class="col col-bgc">{{tableData.goodsName!= '大豆' ? '容量（克/升）' : '蛋白'}}</td>
                         <td class="col">
                             {{tableData.qualityInspectionManagement?tableData.qualityInspectionManagement.bulkDensity:''}}
                         </td>
@@ -1186,7 +1186,7 @@
             if (cwprint == 'true') {
                 if (this.selectPrint) {
                     for (let i = 0; i < this.customerList1.length; i++) {
-                        let _url1 = this.customerList1[i].cardAddressUrl.split(',')
+                        let _url1 = this.customerList1[i].identityAuthenticationInfo.cardAddressUrl.split(',')
                             // let _url2 = this.customerList1[i].payeeAddressUrl.split(',')
                         this.customerList1[i].imgURl = {
                             imageUrl1: _url1[0],

public/static/print.html

@@ -152,10 +152,10 @@
     <div id="app">
       <div class="content"  v-if="type == 1"><!--容重打印-->
         <div class="title">
-          <div class="name">{{name}}价格对照表（按容重）</div>
+          <div class="name">{{name}}{{name != '大豆'? '价格对照表（按容重）' : '价格对照表（按蛋白）'}}</div>
           <div class="price">价格单位：元/公斤</div>
         </div>
-        <div class="table-row">
+        <div class="table-row" v-show="name != '大豆'">
           <el-table :data="tableData" :row-class-name="tableRowClassName" >
             <el-table-column prop="bulkDensityMax" label="容重上限" header-align="center">
             </el-table-column>
@@ -165,6 +165,16 @@
             </el-table-column>
           </el-table>
         </div>
+        <div class="table-row" v-show="name == '大豆'">
+          <el-table :data="tableData" :row-class-name="tableRowClassName" >
+            <el-table-column prop="bulkDensityMax" label="蛋白上限" header-align="center">
+            </el-table-column>
+            <el-table-column prop="bulkDensityMin" label="蛋白下限" header-align="center">
+            </el-table-column>
+            <el-table-column prop="bulkDensityPrice" label="蛋白单价" header-align="center">
+            </el-table-column>
+          </el-table>
+        </div>
       </div>
 
       <div v-else>

public/static/weightCheck.html

@@ -179,14 +179,10 @@
                             <td class="col">{{item.goodsName}}</td>
                             <td class="col col-bgc">类型</td>
                             <td class="col">{{item.type}}</td>
-                            <td class="col col-bgc" v-if="item.goodsName != '大豆'">容量（克/升）</td>
-                            <td class="col" v-if="item.goodsName != '大豆'">
+                            <td class="col col-bgc">{{item.goodsName != '大豆' ? '容量（克/升）' : '蛋白'}}</td>
+                            <td class="col">
                                 {{item.qualityInspectionManagement?item.qualityInspectionManagement.bulkDensity:''}}
                             </td>
-                            <td class="col col-bgc" v-if="item.goodsName == '大豆'" >蛋白</td>
-                            <td class="col" v-if="item.goodsName == '大豆'">
-                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.protein:''}}
-                            </td>
                             <td class="col col-bgc">不完善粒（%）</td>
                             <td class="col">
                                 {{item.qualityInspectionManagement?item.qualityInspectionManagement.imperfectGrain:''}}
@@ -298,17 +294,9 @@
                             <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">{{item.goodsName != '大豆' ? '容量（克/升）' : '蛋白'}}</td>
                             <td class="col">
                                 {{item.qualityInspectionManagement?item.qualityInspectionManagement.bulkDensity:''}}
-                            </td> -->
-                            <td class="col col-bgc" v-if="item.goodsName != '大豆'">容量（克/升）</td>
-                            <td class="col" v-if="item.goodsName != '大豆'">
-                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.bulkDensity:''}}
-                            </td>
-                            <td class="col col-bgc" v-if="item.goodsName == '大豆'" >蛋白</td>
-                            <td class="col" v-if="item.goodsName == '大豆'">
-                                {{item.qualityInspectionManagement?item.qualityInspectionManagement.protein:''}}
                             </td>
                             <td class="col col-bgc">不完善粒（%）</td>
                             <td class="col">
@@ -421,17 +409,10 @@
                         <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">{{_item.goodsName != '大豆' ? '容量（克/升）' :'蛋白'}}</td>
                         <td class="col">
-                            {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.bulkDensity:''}}</td> -->
-                                <td class="col col-bgc" v-if="_item.goodsName != '大豆'">容量（克/升）</td>
-                                <td class="col" v-if="_item.goodsName != '大豆'">
-                                    {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.bulkDensity:''}}
-                                </td>
-                                <td class="col col-bgc" v-if="_item.goodsName == '大豆'" >蛋白</td>
-                                <td class="col" v-if="_item.goodsName == '大豆'">
-                                    {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.protein:''}}
-                                </td>
+                            {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.bulkDensity:''}}
+                        </td>
                         <td class="col col-bgc">不完善粒（%）</td>
                         <td class="col">
                             {{_item.qualityInspectionManagement?_item.qualityInspectionManagement.imperfectGrain:''}}

src/views/profitable/expensemanagementdetails.vue

@@ -23,32 +23,32 @@
         <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="getList" 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-select>
-            <el-select v-model="costNo" multiple filterable allow-create default-first-option placeholder="按编号筛选" clearable @change="getList" 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="getList" class="options_css">
+            <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="getList" 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="getList" class="options_css">
+            <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="getList" class="options_css">
+            <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="getList" class="options_css">
+            <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>
@@ -479,8 +479,8 @@ export default {
             }
           }
         })
-          //费用名称
-          getXialaList({
+      //费用名称
+      getXialaList({
         removeRepeatFlag: 2,
       })
         .toPromise()
@@ -523,6 +523,10 @@ export default {
         // this.$router.go(-1)
       })
     },
+    getList1(){
+      this.currentPage=1
+      this.getList()
+    },
     onChange() {
         this.$refs.upload1
           .handleSaveBill()
@@ -889,6 +893,7 @@ export default {
     },
     pickerOptions() { },
     find() {
+      this.currentPage=1
       this.getList()
     },
     handleSizeChange(val) {