更新

public/static/inspection.html

@@ -159,6 +159,12 @@
             <td v-if="tableData.confirm == '1'" class="col col-bgc">单价（元/公斤）</td>
             <td v-else class="col col-bgc">待定单价（元/公斤）</td>
             <td class="col">{{tableData.tidalGrainPrice}}</td>
+            <td class="col " v-if="printData.type == '潮粮'">
+              {{tableData.tidalGrainPrice}}
+            </td>
+            <td class="col " v-if="printData.type == '干粮'">
+              {{tableData.dryGrainPrice}}
+            </td>
           </tr>
           <tr class="row">
             <td class="col col-bgc">杂质（%）</td>
@@ -259,7 +265,13 @@
         <div class="small-row">
           <div v-if="tableData.confirm == '1'">单价（元/公斤）</div>
           <div v-else>待定单价（元/公斤）</div>
-          <div>{{tableData.tidalGrainPrice}}</div>
+          <div  v-if="tableData.type == '潮粮'">
+            {{tableData.tidalGrainPrice}}
+          </div>
+          <div v-if="tableData.type == '干粮'">
+            {{tableData.dryGrainPrice}}
+          </div>
+          <!-- <div>{{tableData.tidalGrainPrice}}</div> -->
         </div>
         <div class="small-row">
           <div>杂质（%）</div>

src/views/houseSelfCollect/paymentManagement.vue

@@ -127,11 +127,7 @@
           <span v-else>已开票</span>
         </template>
       </el-table-column>
-<<<<<<< HEAD
       <el-table-column class="table_td" prop="collectionEdPayable" label="操作" width="500">
-=======
-      <el-table-column class="table_td" prop="collectionEdPayable" label="操作" width="450">
->>>>>>> 8b8a6ad600972213308e628164112ce037ce8786
         <template scope="scope">
           <span v-hasPermission="`acquisitionManagement.acquisitionPay.add`">
             <el-button v-if="
@@ -451,7 +447,6 @@
       })
     },
     methods: {
-<<<<<<< HEAD
       imgshow(){
         this.deleteshow=false
         console.log(11111)
@@ -460,10 +455,7 @@
         this.dialogImageUrl = file.url;
         this.dialogVisible = true;
       },
-      previewPayOrder(val){debugger
-=======
       previewPayOrder(val){
->>>>>>> 8b8a6ad600972213308e628164112ce037ce8786
       this.paymentReceipt = val.paymentScreenshot
       this.isPreviewPayOrder = true
      console.log(val.paymentScreenshot)
@@ -756,8 +748,8 @@
               })
           }
         } else {
-          let _url1 = process.env.VUE_APP_BASE_API + "/identityAuthenticationInfo/api/getIdentityAuthenticationInfo"
-          let _url2 = process.env.VUE_APP_BASE_API + "/paymentManagement/getInfo"
+          let _url1 = process.env.VUE_APP_BASE_API + '/identityAuthenticationInfo/api/getIdentityAuthenticationInfo'
+          let _url2 = process.env.VUE_APP_BASE_API + '/paymentManagement/getInfo'
           this.$axios.all([
             this.$axios.get(_url1, {
               params: {

src/views/houseSelfCollect/weightCheck.vue

@@ -499,7 +499,7 @@
             var flag = false;
             var flag1 = false;
             if (this.warehouseName && (this.warehouseName == '山东诸城迈饶库' || this.warehouseName == '克东千红库' || this
-                .warehouseName == '鲅鱼圈祥腾库' || this.warehouseName == '哈尔滨依兰库')) {
+                .warehouseName == '鲅鱼圈祥腾库' || this.warehouseName == '哈尔滨依兰库'|| this.warehouseName == '龙江金信库')) {
               for (var i = 0; i < value.length; i++) {
                 var tmp = String.fromCharCode(value[i])
                 if (tmp == '+') {

src/views/outboundManagement/weighing.vue

@@ -213,7 +213,8 @@
 				// else{
 				// 	this.weighingList.tare = parseInt(result) 
 				// }
-				if(this.warehouseName&&(this.warehouseName == '山东诸城迈饶库'||this.warehouseName == '克东千红库')||this.warehouseName == '鲅鱼圈祥腾库'||this.warehouseName == '哈尔滨依兰库'){
+				if(this.warehouseName&&(this.warehouseName == '山东诸城迈饶库'||this.warehouseName == '克东千红库')||this.warehouseName == '鲅鱼圈祥腾库'||this.warehouseName == '哈尔滨依兰库'
+				||this.warehouseName == '龙江金信库'){
 					for (var i = 0; i < value.length; i++) {
 						var tmp = String.fromCharCode(value[i])
 						if (tmp == '+') {

src/views/warehouse/warehouseManagementGross.vue

@@ -955,7 +955,8 @@ export default {
             (this.deptBudgetList.warehouseName == '山东诸城迈饶库' ||
               this.deptBudgetList.warehouseName == '克东千红库' ||
               this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库' ||
-              this.deptBudgetList.warehouseName == '哈尔滨依兰库')
+              this.deptBudgetList.warehouseName == '哈尔滨依兰库'||
+              this.deptBudgetList.warehouseName == '龙江金信库')
           ) {
             for (var i = 0; i < value.length; i++) {
               var tmp = String.fromCharCode(value[i])

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -932,7 +932,8 @@ export default {
             (this.deptBudgetList1.warehouseName == '山东诸城迈饶库' ||
               this.deptBudgetList1.warehouseName == '克东千红库' ||
               this.deptBudgetList1.warehouseName == '鲅鱼圈祥腾库' ||
-              this.deptBudgetList1.warehouseName == '哈尔滨依兰库')
+              this.deptBudgetList1.warehouseName == '哈尔滨依兰库'||
+              this.deptBudgetList1.warehouseName == '龙江金信库')
           ) {
             for (var i = 0; i < value.length; i++) {
               var tmp = String.fromCharCode(value[i])

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -702,7 +702,8 @@ export default {
             (this.deptBudgetList.warehouseName == '山东诸城迈饶库' ||
               this.deptBudgetList1.warehouseName == '克东千红库' ||
               this.deptBudgetList1.warehouseName == '鲅鱼圈祥腾库' ||
-              this.deptBudgetList1.warehouseName == '哈尔滨依兰库')
+              this.deptBudgetList1.warehouseName == '哈尔滨依兰库'||
+              this.deptBudgetList1.warehouseName == '龙江金信库')
           ) {
             for (var i = 0; i < value.length; i++) {
               var tmp = String.fromCharCode(value[i])

src/views/warehouse/warehouseManagementTare.vue

@@ -828,7 +828,8 @@ export default {
             (this.deptBudgetList.warehouseName == '山东诸城迈饶库' ||
               this.deptBudgetList.warehouseName == '克东千红库' ||
               this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库' ||
-              this.deptBudgetList.warehouseName == '哈尔滨依兰库')
+              this.deptBudgetList.warehouseName == '哈尔滨依兰库' ||
+              this.deptBudgetList.warehouseName == '龙江金信库')
           ) {
             for (var i = 0; i < value.length; i++) {
               var tmp = String.fromCharCode(value[i])