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

src/components/balanceAlert.vue

@@ -56,7 +56,9 @@ export default {
           const port = await navigator.serial.requestPort()
           if (
             this.deptBudgetList.warehouseName == '白城内陆港' ||
-            this.deptBudgetList.warehouseName == '肇东金信库'
+            this.deptBudgetList.warehouseName == '肇东金信库'||
+            this.deptBudgetList.warehouseName == '洮南胡力吐粮食储备库'||
+            this.deptBudgetList.warehouseName == '洮南向阳乡金昊'
           ) {
             this.param = 1200
           } else if (this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库') {
@@ -124,7 +126,9 @@ export default {
             console.log('valuezzz:', zzz)
           } else if (
             this.deptBudgetList.warehouseName == '白城内陆港' ||
-            this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库'
+            this.deptBudgetList.warehouseName == '洮南胡力吐粮食储备库' ||
+            this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库'||
+            this.deptBudgetList.warehouseName == '洮南向阳乡金昊'
           ) {
             console.log('value:', value)
             var start = new Date().getTime()
@@ -154,6 +158,8 @@ export default {
               this.deptBudgetList.warehouseName == '哈尔滨依兰库' ||
               this.deptBudgetList.warehouseName == '龙江金信库' ||
               this.deptBudgetList.warehouseName == '白城内陆港' ||
+              this.deptBudgetList.warehouseName == '洮南胡力吐粮食储备库' ||
+              this.deptBudgetList.warehouseName == '洮南向阳乡金昊' ||
               this.deptBudgetList.warehouseName == '甘南林峰库' ||
               this.deptBudgetList.warehouseName == '肇东金信库' ||
               this.deptBudgetList.warehouseName == '呼兰大金仓'||

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

@@ -1,35 +1,35 @@
-import Layout from '@/layout/index';
+// import Layout from '@/layout/index';
 
-const financialManagementRouter = {
-  path: '/financialManagement',
-  component: Layout,
-  redirect: '/financialManagement',
-  name: 'financialManagement',
-  alwaysShow: true, // will always show the root menu
-  meta: {
-    title: 'financialManagement',
-    module: 'financial.collection',
-    icon: '-caiwuguanli'
-  },
-  children: [
-      // 收款管理
-    {
-      path: 'collectionManagementList',
-      component: () =>
-        import(/* webpackChunkName: "applDetail" */ '@/views/financialManagement/collectionManagementList'),
-      name: 'collectionManagementList',
-      meta: {
-        title: 'collectionManagementList',
-        shortcutEntrance: 'financialManagement',
-        module: 'financial.collectionInfo',
-        permissicon: [],
-        keepAlive: true,
-        _title:'收款管理'
-        // module: 'procurement.sparepart.applDetail'
-      }
-    },
-  ],
+// const financialManagementRouter = {
+//   path: '/financialManagement',
+//   component: Layout,
+//   redirect: '/financialManagement',
+//   name: 'financialManagement',
+//   alwaysShow: true, // will always show the root menu
+//   meta: {
+//     title: 'financialManagement',
+//     module: 'financial.collection',
+//     icon: '-caiwuguanli'
+//   },
+//   children: [
+//       // 收款管理
+//     {
+//       path: 'collectionManagementList',
+//       component: () =>
+//         import(/* webpackChunkName: "applDetail" */ '@/views/financialManagement/collectionManagementList'),
+//       name: 'collectionManagementList',
+//       meta: {
+//         title: 'collectionManagementList',
+//         shortcutEntrance: 'financialManagement',
+//         module: 'financial.collectionInfo',
+//         permissicon: [],
+//         keepAlive: true,
+//         _title:'收款管理'
+//         // module: 'procurement.sparepart.applDetail'
+//       }
+//     },
+//   ],
 
-};
+// };
 
-export default financialManagementRouter;
+// export default financialManagementRouter;

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -675,12 +675,12 @@ export default {
     // 增加分界
     add(item, item1, index) {
       // let _data = this.detailList;
-      if (item.index > 2) {
-        this.$message({
-          message: '最多插入3个分界值',
-          type: 'warning',
-        })
-      } else {
+      // if (item.index > 2) {
+      //   this.$message({
+      //     message: '最多插入3个分界值',
+      //     type: 'warning',
+      //   })
+      // } else {
         item.index++
         item.detailList.splice(index + 1, 0, {
           name: '分界',
@@ -694,7 +694,7 @@ export default {
           type: 4,
         })
         this.makeSpliceIndex(item, item1, index)
-      }
+      // }
     },
     // 减少分界
     reduce(item, item1, index) {

src/views/platformaudit/grainmerchantreview.vue

@@ -84,6 +84,7 @@
       <el-table-column prop="payTaxesCard" label="纳税人识别号">
       </el-table-column>
       <el-table-column prop="compAddress" label="地址"> </el-table-column>
+      <el-table-column prop="examiner" label="审核人"> </el-table-column>
       <el-table-column prop="updateDate" label="更新时间"> </el-table-column>
       <el-table-column prop="businessLicenseAddressUrl" label="附件">
         <template slot-scope="scope">
@@ -106,7 +107,7 @@
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column prop="address" label="审核">
+      <el-table-column prop="address" label="审核" min-width="150">
         <template slot-scope="scope">
           <el-button size="medium" type="text" class="record" v-if="scope.row.authenticationStatusKey == 1"
             v-hasPermission="
@@ -308,6 +309,7 @@
       adopt(row) {
         this.identityAuthenticationInfo.id = row.id
         this.identityAuthenticationInfo.flag = 1
+        this.identityAuthenticationInfo.examiner = localStorage.getItem('ws-pf_staffName')
         this.$confirm(`确定通过该认证信息？`, '提示', {
             confirmButtonText: '通过',
             cancelButtonText: '取消',
@@ -336,6 +338,7 @@
       reject(row) {
         this.identityAuthenticationInfo.id = row.id
         this.identityAuthenticationInfo.flag = 2
+        this.identityAuthenticationInfo.examiner = localStorage.getItem('ws-pf_staffName')
         this.$confirm(`确定驳回该认证信息？`, '提示', {
             confirmButtonText: '驳回',
             cancelButtonText: '取消',

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -309,7 +309,7 @@
           // console.log(response)
         })
         getstafffind({
-          roles: '499413401da1471fa2e26f2e35d4f018'
+          roles: 'b96299bb5dcf461e916b72b64c6943b0'
         })
         .toPromise()
         .then((response) => {

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -513,7 +513,7 @@
           } else {
             var tmp1 = 'C00'
             this.deptBudgetList.count++
-            if (this.deptBudgetList.tranCarInfoList.length < 10) {
+            if (this.deptBudgetList.tranCarInfoList.length + 1 < 10) {
               this.deptBudgetList.tranCarInfoList.push({
                 driverName: '',
                 driverPhone: '',
@@ -532,7 +532,7 @@
                 tranCarNo: 'C00' + (this.deptBudgetList.tranCarInfoList.length + 1),
                 tranPrice: this.deptBudgetList.tranPrice
               })
-            } else if (this.deptBudgetList.tranCarInfoList.length < 100 && this.deptBudgetList.tranCarInfoList.length >=
+            } else if (this.deptBudgetList.tranCarInfoList.length+ 1 < 100 && this.deptBudgetList.tranCarInfoList.length + 1>=
               10) {
               tmp1 = 'C0'
               this.deptBudgetList.count++
@@ -554,7 +554,7 @@
                 tranCarNo: 'C0' + (this.deptBudgetList.tranCarInfoList.length + 1),
                 tranPrice: this.deptBudgetList.tranPrice
               })
-            } else if (this.deptBudgetList.tranCarInfoList.length < 1000 && this.deptBudgetList.tranCarInfoList.length >=
+            } else if (this.deptBudgetList.tranCarInfoList.length < 1000 && this.deptBudgetList.tranCarInfoList.length+ 1 >=
               100) {
               tmp1 = 'C'
               this.deptBudgetList.count++
@@ -587,7 +587,7 @@
           } else {
             var tmp1 = 'C00'
             this.deptBudgetList.count++
-            if (this.deptBudgetList.tranCarInfoList.length < 10) {
+            if (this.deptBudgetList.tranCarInfoList.length + 1 < 10) {
               this.deptBudgetList.tranCarInfoList.push({
                 driverName: '',
                 driverPhone: '',
@@ -606,7 +606,7 @@
                 tranCarNo: 'C00' + (this.deptBudgetList.tranCarInfoList.length + 1),
                 tranPrice: this.deptBudgetList.tranPrice
               })
-            } else if (this.deptBudgetList.tranCarInfoList.length < 100 && this.deptBudgetList.tranCarInfoList.length >=
+            } else if (this.deptBudgetList.tranCarInfoList.length < 100 && this.deptBudgetList.tranCarInfoList.length+ 1 >=
               10) {
               tmp1 = 'C0'
               this.deptBudgetList.count++
@@ -628,7 +628,7 @@
                 tranCarNo: 'C0' + (this.deptBudgetList.tranCarInfoList.length + 1),
                 tranPrice: this.deptBudgetList.tranPrice
               })
-            } else if (this.deptBudgetList.tranCarInfoList.length < 1000 && this.deptBudgetList.tranCarInfoList.length >=
+            } else if (this.deptBudgetList.tranCarInfoList.length < 1000 && this.deptBudgetList.tranCarInfoList.length+ 1 >=
               100) {
               tmp1 = 'C'
               this.deptBudgetList.count++