平台审核

src/views/platformaudit/component/router/route.js

@@ -1,14 +1,14 @@
 import Layout from '@/layout/index';
 
 const platformauditRouter = {
-    path: '/transportationTask/transportation',
+    path: '/platformaudit',
     component: Layout,
     redirect: '/platformaudit',
     name: 'platformaudit',
     alwaysShow: true, // will always show the root menu
     meta: {
       title: 'platformaudit',
-      module: 'transportationTask.transportation',
+      module: 'warehouseManagement.warehouse.warehouseInfo',
       icon: '-shenhe'
     },
     children: [
@@ -22,7 +22,7 @@ const platformauditRouter = {
         meta: {
           title: 'grainmerchantreview',
           shortcutEntrance: 'grainmerchantreview',
-          module: 'transportationTask.transportation.fireDispatching',
+          module: 'warehouseManagement.warehouse.warehouseInfo',
           permissicon: [],
           keepAlive: true
         },
@@ -37,7 +37,7 @@ const platformauditRouter = {
         meta: {
           title: 'driverreview',
           shortcutEntrance: 'driverreview',
-          module: 'transportationTask.transportation.fireDispatching',
+          module: 'warehouseManagement.warehouse.warehouseInfo',
           permissicon: [],
           keepAlive: true
         },
@@ -52,7 +52,7 @@ const platformauditRouter = {
         meta: {
           title: 'transactioninformationreview',
           shortcutEntrance: 'transactioninformationreview',
-          module: 'transportationTask.transportation.fireDispatching',
+          module: 'warehouseManagement.warehouse.warehouseInfo',
           permissicon: [],
           keepAlive: true
         },

src/views/platformaudit/driverreview.vue

@@ -11,7 +11,7 @@
           v-model="searchTypeText"
           placeholder=""
           class="typeselect"
-          @change="selecttaskType"
+          @change="selectExamineType"
           :value="searchType"
         >
           <ws-option
@@ -184,7 +184,7 @@
             }}{{ scope.row.residentCityMunicipal }}
           </template>
         </el-table-column>
-        <el-table-column prop="carModel" label="更新时间" >
+        <el-table-column prop="undateDate" label="更新时间" >
         </el-table-column>
         <el-table-column prop="addressUrl" label="证件照" >
           <template slot-scope="scope">
@@ -237,6 +237,7 @@
               size="medium"
               type="text"
               class="record"
+              v-if="scope.row.authenticationStatusKey==1"
               @click="reject(scope.row)"
               >驳回</el-button
             >
@@ -244,9 +245,13 @@
               size="medium"
               type="text"
               class="record"
+              v-if="scope.row.authenticationStatusKey==1"
               @click="adopt(scope.row)"
               >通过</el-button
             >
+            <template v-else slot-scope="scope"> 
+            {{ scope.row.authenticationStatus}}
+          </template>
           </template>
         </el-table-column>
       </el-table>
@@ -305,7 +310,6 @@
 <script>
 import {
   driverList,
-  billoperatehis,
   getDriver,
 } from '@/model/platformaudit/index'
 import Pagination from '@/components/Pagination'
@@ -426,12 +430,30 @@ export default {
         query: { id: row.id },
       })
     },
+    //查找
+    lookUp() {
+      this.currentPage = 1
+      this.getList()
+    },
+    handlestatus(status) {
+      this.searchType = status
+      if (status == 1) {
+        this.primary = 1
+      } else if (status == 2) {
+        this.primary = 2
+      } else {
+        this.primary = 3
+      }
+      this.getList()
+    },
     selectcar(e, row) {
       console.log(e, row)
       for (var i = 0; i < row.driverCarInfoList.length; i++) {
         if (e == row.driverCarInfoList[i].carNumber) {
           row.carModel = row.driverCarInfoList[i].carModel
           row.carLength = row.driverCarInfoList[i].carLength
+          row.carLoad = row.driverCarInfoList[i].carLoad
+          row.yearManufacture = row.driverCarInfoList[i].yearManufacture
         }
       }
     },
@@ -525,12 +547,6 @@ export default {
         .then((response) => {
           for (var i = 0; i < response.records.length; i++) {
             response.records[i].expandsStatus = false
-            response.records[i].carNumber =
-              response.records[i].driverCarInfoList[0].carNumber
-            response.records[i].carModel =
-              response.records[i].driverCarInfoList[0].carModel
-            response.records[i].carLength =
-              response.records[i].driverCarInfoList[0].carLength
             if (response.records[i].addressUrl != null) {
               response.records[i].addressUrlArray =
                 response.records[i].addressUrl.split(',')
@@ -546,10 +562,12 @@ export default {
           this.driverList = response
         })
     },
-    selecttaskType(e) {
-      this.residentCityProvincial = CodeToText[e[0]]
-      this.residentCityMunicipal = CodeToText[e[1]]
-      // this.selectedOptions = e
+    selectExamineType(e) {
+      for (var i = 0; i < this.searchTypeList.length; i++) {
+        if (this.searchTypeList[i].value == e) {
+          this.searchType = this.searchTypeList[i].type
+        }
+      }
     },
     fujian(row) {
       if (row.addressUrl === null || row.addressUrl === '') {

src/views/platformaudit/grainmerchantreview.vue

@@ -11,7 +11,7 @@
           v-model="searchTypeText"
           placeholder=""
           class="typeselect"
-          @change="selecttaskType"
+          @change="selectExamineType"
           :value="searchType"
         >
           <ws-option
@@ -59,55 +59,62 @@
         <el-table-column type="expand">
           <template slot-scope="props">
             <ws-form>
-              <div v-for="item in props.row.driverPayeeInfoList">
-                <ws-info-table>
-                  <ws-form-item
-                    :class="item.accountTypeFlag == 1 ? 'personage' : 'company'"
-                    v-if="item.accountTypeFlag == 1"
-                    label="收款人"
-                    span="1"
-                    prop="payeeName"
-                    class="el-car name"
-                  >
-                    <div style="width: 100%">{{ item.payeeName }}</div>
-                  </ws-form-item>
-                  <ws-form-item
-                    :class="item.accountTypeFlag == 1 ? 'personage' : 'company'"
-                    v-if="item.accountTypeFlag == 2"
-                    label="企业名称"
-                    span="1"
-                    prop="compName"
-                    class="el-car"
-                  >
-                    <div style="width: 100%">{{ item.compName }}</div>
-                  </ws-form-item>
-                  <ws-form-item
-                    :class="item.accountTypeFlag == 1 ? 'personage' : 'company'"
-                    v-if="item.accountTypeFlag == 1"
-                    label="身份证"
-                    span="1"
-                    prop="payeeNumberCard"
-                    class="el-car card"
-                  >
-                    <div style="width: 100%">
-                      {{ item.payeeNumberCard }}
-                      <img
-                        width="12"
-                        height="13"
-                        src="../../../public/img/fujian-grey.png"
-                        alt=""
-                        @click="fujian1(item)"
-                      />
-                    </div>
-                  </ws-form-item>
-                  <ws-form-item
-                    :class="item.accountTypeFlag == 1 ? 'personage' : 'company'"
-                    label="开户行"
-                    span="1"
-                    prop="bankDeposit"
-                    class="el-car"
-                  >
-                    <span
+              <ws-info-table>
+                <ws-form-item
+                  :class="
+                    props.row.accountTypeFlag == 1 ? 'personage' : 'company'
+                  "
+                  v-if="props.row.accountTypeFlag == 1"
+                  label="收款人"
+                  span="1"
+                  prop="payeeName"
+                  class="el-car name"
+                >
+                  <div style="width: 100%">{{ props.row.payeeName }}</div>
+                </ws-form-item>
+                <ws-form-item
+                  :class="
+                    props.row.accountTypeFlag == 1 ? 'personage' : 'company'
+                  "
+                  v-if="props.row.accountTypeFlag == 2"
+                  label="企业名称"
+                  span="1"
+                  prop="compName"
+                  class="el-car"
+                >
+                  <div style="width: 100%">{{ props.row.compName }}</div>
+                </ws-form-item>
+                <ws-form-item
+                  :class="
+                    props.row.accountTypeFlag == 1 ? 'personage' : 'company'
+                  "
+                  v-if="props.row.accountTypeFlag == 1"
+                  label="身份证"
+                  span="1"
+                  prop="payeeNumberCard"
+                  class="el-car card"
+                >
+                  <div style="width: 100%">
+                    {{ props.row.payeeNumberCard }}
+                    <img
+                      width="12"
+                      height="13"
+                      src="../../../public/img/fujian-grey.png"
+                      alt=""
+                      @click="fujian1(props.row)"
+                    />
+                  </div>
+                </ws-form-item>
+                <ws-form-item
+                  :class="
+                    props.row.accountTypeFlag == 1 ? 'personage' : 'company'
+                  "
+                  label="开户行"
+                  span="1"
+                  prop="bankDeposit"
+                  class="el-car"
+                >
+                  <!-- <span
                       style="
                         margin: 10px;
                         display: inline-block;
@@ -125,19 +132,20 @@
                         white-space: normal;
                       "
                       >{{ item.bankDepositBranch }}</span
-                    >
-                  </ws-form-item>
-                  <ws-form-item
-                    :class="item.accountTypeFlag == 1 ? 'personage' : 'company'"
-                    label="账号"
-                    span="1"
-                    prop="bankCard"
-                    class="el-car"
-                  >
-                    <div style="width: 100%">{{ item.bankCard }}</div>
-                  </ws-form-item>
-                </ws-info-table>
-              </div>
+                    > -->
+                </ws-form-item>
+                <ws-form-item
+                  :class="
+                    props.row.accountTypeFlag == 1 ? 'personage' : 'company'
+                  "
+                  label="账号"
+                  span="1"
+                  prop="bankCard"
+                  class="el-car"
+                >
+                  <div style="width: 100%">{{ props.row.bankCard }}</div>
+                </ws-form-item>
+              </ws-info-table>
             </ws-form>
           </template>
         </el-table-column>
@@ -147,25 +155,16 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="customerType" label="类型" >
+        <el-table-column prop="customerType" label="类型"> </el-table-column>
+        <el-table-column prop="customerName" label="姓名"> </el-table-column>
+        <el-table-column prop="customerNumberCard" label="身份证号">
         </el-table-column>
-        <el-table-column prop="customerName" label="姓名" >
+        <el-table-column prop="customerPhone" label="手机号"> </el-table-column>
+        <el-table-column prop="payTaxesCard" label="纳税人识别号">
         </el-table-column>
-        <el-table-column prop="customerNumberCard" label="身份证号" >
-        </el-table-column>
-        <el-table-column prop="customerPhone" label="手机号" >
-        </el-table-column>
-        <el-table-column prop="payTaxesCard" label="纳税人识别号" >
-        </el-table-column>
-        <el-table-column prop="compAddress" label="地址" >
-          <template slot-scope="scope">
-            {{ scope.row.residentCityProvincial
-            }}{{ scope.row.residentCityMunicipal }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="updateDate" label="更新时间" >
-        </el-table-column>
-        <el-table-column prop="businessLicenseAddressUrl" label="附件" >
+        <el-table-column prop="compAddress" label="地址"> </el-table-column>
+        <el-table-column prop="updateDate" label="更新时间"> </el-table-column>
+        <el-table-column prop="businessLicenseAddressUrl" label="附件">
           <template slot-scope="scope">
             <img
               width="18"
@@ -180,7 +179,7 @@
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="账户信息" >
+        <el-table-column label="账户信息">
           <template slot-scope="scope">
             <el-button
               v-if="!scope.row.expandsStatus"
@@ -216,6 +215,7 @@
               size="medium"
               type="text"
               class="record"
+              v-if="scope.row.authenticationStatusKey == 1"
               @click="reject(scope.row)"
               >驳回</el-button
             >
@@ -223,13 +223,13 @@
               size="medium"
               type="text"
               class="record"
-              v-hasPermission="
-                `platformaudit.examine.grainmerchant`
-              "
-              v-if="scope.row.authenticationStatus == '审核中'"
+              v-if="scope.row.authenticationStatusKey == 1"
               @click="adopt(scope.row)"
               >通过</el-button
             >
+            <template v-else slot-scope="scope">
+              {{ scope.row.authenticationStatus }}
+            </template>
           </template>
         </el-table-column>
       </el-table>
@@ -352,7 +352,7 @@ export default {
         { value: '已通过', type: 2 },
         { value: '全部', type: '' },
       ],
-      identityAuthenticationInfo:{
+      identityAuthenticationInfo: {
         id: '',
         flag: '',
       },
@@ -368,6 +368,11 @@ export default {
       this.$refs.expandstable.toggleRowExpansion(row)
     },
 
+    //查找
+    lookUp() {
+      this.currentPage = 1
+      this.getList()
+    },
     //查找
     handleLook() {
       if (this.value2) {
@@ -465,12 +470,6 @@ export default {
         .then((response) => {
           for (var i = 0; i < response.records.length; i++) {
             response.records[i].expandsStatus = false
-            response.records[i].carNumber =
-              response.records[i].driverCarInfoList[0].carNumber
-            response.records[i].carModel =
-              response.records[i].driverCarInfoList[0].carModel
-            response.records[i].carLength =
-              response.records[i].driverCarInfoList[0].carLength
             if (response.records[i].addressUrl != null) {
               response.records[i].addressUrlArray =
                 response.records[i].addressUrl.split(',')
@@ -479,7 +478,6 @@ export default {
               response.records[i].addressUrlArray = []
             }
           }
-
           this.deptCircularPage.currentPage = response.current
           this.deptCircularPage.pageSize = response.size
           this.deptBudgetTotal = response.total
@@ -517,10 +515,23 @@ export default {
           return false
         })
     },
-    selecttaskType(e) {
-      this.residentCityProvincial = CodeToText[e[0]]
-      this.residentCityMunicipal = CodeToText[e[1]]
-      // this.selectedOptions = e
+    selectExamineType(e) {
+      for (var i = 0; i < this.searchTypeList.length; i++) {
+        if (this.searchTypeList[i].value == e) {
+          this.searchType = this.searchTypeList[i].type
+        }
+      }
+    },
+    handlestatus(status) {
+      this.searchType = status
+      if (status == 1) {
+        this.primary = 1
+      } else if (status == 2) {
+        this.primary = 2
+      } else {
+        this.primary = 3
+      }
+      this.getList()
     },
     fujian(row) {
       if (row.addressUrl === null || row.addressUrl === '') {

src/views/platformaudit/transactioninformationreview.vue

@@ -11,7 +11,7 @@
           v-model="searchTypeText"
           placeholder=""
           class="typeselect"
-          @change="selecttaskType"
+          @change="selectExamineType"
           :value="searchType"
         >
           <ws-option
@@ -52,7 +52,7 @@
         style="width: 100%"
         height="780"
       >
-        <el-table-column type="index" label="序号" width="80">
+        <el-table-column type="index" label="序号" width="50">
           <template scope="scope">
             <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
             <span v-else>{{ scope.$index + 1 }}</span>
@@ -69,8 +69,8 @@
         <el-table-column prop="basisPrice" label="基差(元/吨)" > </el-table-column>
         <el-table-column prop="unitPrice" label="价格(元/吨)" > </el-table-column>
         <el-table-column prop="buyerPhone" label="电话" > </el-table-column>
-        <el-table-column prop="updateDate" label="更新时间" > </el-table-column>
-        <el-table-column prop="seller" label="操作" >
+        <el-table-column prop="updateDate" label="更新时间" width="140"> </el-table-column>
+        <el-table-column prop="seller" label="操作" width="180">
           <template slot-scope="scope">
             <div
               class="record"
@@ -101,6 +101,7 @@
               size="medium"
               type="text"
               class="record"
+              v-if="scope.row.statusFlag==1"
               @click="reject(scope.row)"
               >驳回</el-button
             >
@@ -108,9 +109,13 @@
               size="medium"
               type="text"
               class="record"
+              v-if="scope.row.statusFlag==1"
               @click="adopt(scope.row)"
               >通过</el-button
             >
+            <template v-else slot-scope="scope"> 
+            {{ scope.row.status}}
+          </template>
           </template>
         </el-table-column>
       </el-table>
@@ -165,7 +170,6 @@ export default {
       deptBudgetTotal: 0,
       searchTypeText: '待审核',
       searchKeyWord: '',
-      tranTypeKey: 2,
       // 提交类型
       submitType: true,
       size: 10,
@@ -252,6 +256,11 @@ export default {
           return false
         })
     },
+    //查找
+    lookUp() {
+      this.currentPage = 1
+      this.getList()
+    },
     //审核通过
     adopt(row) {
       this.procurementPlanInfo.id = row.id
@@ -350,7 +359,6 @@ export default {
         searchType: this.searchType,
         currentPage: this.currentPage,
         pageSize: this.pageSize,
-        tranTypeKey: this.tranTypeKey,
         searchKeyWord: this.searchKeyWord,
       })
         .toPromise()

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -178,7 +178,7 @@
               </div>
             </el-popover>
             <img
-            v-if='scope.row.taskStatus=="执行中"'
+              v-if="scope.row.taskStatus == '执行中'"
               width="17"
               height="18"
               style="vertical-align: text-top; position: relative; top: -1px"
@@ -195,7 +195,8 @@
         ></el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
-            <span class="corles"
+            <span
+              class="corles"
               @click="nocomplete(scope.row)"
               v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.View`
@@ -206,7 +207,8 @@
               direction="vertical"
               v-if="scope.row.taskStatus == '待审核'"
             ></el-divider>
-            <span class="corles"
+            <span
+              class="corles"
               v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.audit`
               "
@@ -218,16 +220,19 @@
               direction="vertical"
               class="divider"
               v-if="
-                scope.row.taskStatus == '待审核'||scope.row.taskStatus == '执行中' ||
+                scope.row.taskStatus == '待审核' ||
+                scope.row.taskStatus == '执行中' ||
                 scope.row.taskStatus == '已驳回'
               "
             ></el-divider>
-            <span class="corles"
+            <span
+              class="corles"
               v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.edit`
               "
               v-if="
-                scope.row.taskStatus == '待审核' ||scope.row.taskStatus == '执行中' ||
+                scope.row.taskStatus == '待审核' ||
+                scope.row.taskStatus == '执行中' ||
                 scope.row.taskStatus == '已驳回'
               "
               @click="delivery(scope.row)"
@@ -237,7 +242,8 @@
               direction="vertical"
               v-if="scope.row.taskId == null"
             ></el-divider>
-            <span class="corles"
+            <span
+              class="corles"
               v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.delete`
               "
@@ -405,8 +411,8 @@ export default {
         query: {
           relevanceId: item.relevanceId,
           taskId: item.taskId,
-          businessKey:item.id,
-          workflowId:item.workflowId
+          businessKey: item.id,
+          workflowId: item.workflowId,
         },
       })
     },
@@ -447,8 +453,8 @@ export default {
         path: 'inOutWarehousetaskEdit',
         query: {
           relevanceId: row.relevanceId,
-          businessKey:row.id,
-          workflowId:row.workflowId
+          businessKey: row.id,
+          workflowId: row.workflowId,
         },
       })
     },
@@ -647,8 +653,8 @@ export default {
 /deep/.typeselect .el-input__inner {
   color: #8890b1;
 }
-.corles{
-  color: #5878E8;
+.corles {
+  color: #5878e8;
   font-size: 14px;
 }
 </style>

src/views/tranManagement/tranManagementDriver.vue

@@ -561,13 +561,15 @@ export default {
         .toPromise()
         .then((response) => {
           for (var i = 0; i < response.records.length; i++) {
-            response.records[i].expandsStatus = false
-            response.records[i].carNumber =
+            if(response.records[i].driverCarInfoList.length>0){
+              response.records[i].carNumber =
               response.records[i].driverCarInfoList[0].carNumber
-            response.records[i].carModel =
+              response.records[i].carModel =
               response.records[i].driverCarInfoList[0].carModel
-            response.records[i].carLength =
+              response.records[i].carLength =
               response.records[i].driverCarInfoList[0].carLength
+            }
+            response.records[i].expandsStatus = false
             if (response.records[i].addressUrl != null) {
               response.records[i].addressUrlArray =
                 response.records[i].addressUrl.split(',')