前端

src/lang/zh.js

@@ -487,6 +487,7 @@ export default {
     salesContract: '现货销售合同',
     salesContractEdit: '现货销售合同  /  编辑',
     salesContractExamine: '现货销售合同  /  查看',
+    salesContractAudit: '现货销售合同  /  审核',
     salesContractAdd: '现货销售合同  /  添加',
     futuresPurchaseContract: '期货采购合同',
     futuresPurchaseContractAdd: '期货采购合同  /  添加',

src/views/contractManagement/purchaseContract.vue

@@ -129,7 +129,9 @@
       </el-table-column>
       <el-table-column prop="status" label="状态">
         <template slot-scope="scope">
+          <span v-if="scope.row.approveStatus">{{scope.row.approveStatus}}</span>
           <el-popover
+           v-else
             placement="left"
             :width="285"
             trigger="click"
@@ -174,6 +176,7 @@
             </div>
           </el-popover>
           <img
+           v-if='!scope.row.approveStatus'
             width="17"
             height="18"
             style="vertical-align: text-top; position: relative; top: -1px"
@@ -215,6 +218,7 @@
             "
             alt=""
           />
+          <div v-if='scope.row.approveStatus!="待决策人审核"&&scope.row.approveStatus||scope.row.status!="执行中"&&scope.row.status' style='display:inline-block;'>
           <img
             width="17"
             height="16"
@@ -226,6 +230,7 @@
             "
             alt=""
           />
+          </div>
           <img
             width="16"
             height="17"

src/views/contractManagement/purchaseContractExamine.vue

@@ -234,7 +234,27 @@
         :editable="false"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
       />
+      <el-table
+        class="wenzi"
+        :data="taskhistories"
+        style="width: 100%"
+      >
+        <el-table-column prop="operatorMajorRoleName" label="审核人">
+          <template scope="scope">
+            {{scope.row.operatorMajorRoleName}}{{scope.row.operatorName}}
+            </template>
+        </el-table-column>
+        <el-table-column prop="inOutTaskNo" label="审核结果">
+          <template scope="scope">
+            <span v-if='scope.row.approved'>通过</span>
+            <span v-if='!scope.row.approved'>驳回</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="endTime" label="审核时间"></el-table-column>
+        <el-table-column prop="auditMind" label="驳回原因"></el-table-column>
+     </el-table>
     </ws-form>
+    
     <div style="text-align: right; padding: 10px">
       <el-button
         class="bg-bottom"
@@ -253,6 +273,9 @@ import {
   examineList,
   billoperatehis,
 } from '@/model/contarct/index'
+import {
+  gettaskhistories
+} from '@/model/tasksport/index'
 export default {
   name: 'viewSpareMoney',
   watch: {
@@ -282,6 +305,7 @@ export default {
       historyList:[],
       tableData: [{ date: 1111, name: 'qqqq', address: 'errrtt' }],
       ruleDeptBudget: [],
+      taskhistories:[],
       deptBudgetList: {
         contractProcessInfo: {},
         contractGoodsInfo: {},
@@ -299,6 +323,10 @@ export default {
   },
   methods: {
     loaddata() {
+      gettaskhistories({businessKey: this.$route.query.id,workflowId: this.$route.query.workflowId}).toPromise()
+          .then((response) => {
+            this.taskhistories=response
+          })
       // 数据
       examineList({ id: this.$route.query.id })
         .toPromise()

src/views/contractManagement/salesContract.vue

@@ -34,8 +34,7 @@
       </template>
       <template slot="right">
         <span style="width: 142px; display: inline-block; color: #8890b1"
-          >状态：</span
-        >
+          >状态：</span>
         <ws-select
           v-model="searchTypeText"
           placeholder=""
@@ -140,7 +139,8 @@
       </el-table-column>
       <el-table-column prop="status" label="状态">
         <template slot-scope="scope">
-          <el-popover
+          <span v-if="scope.row.approveStatus">{{scope.row.approveStatus}}</span>
+          <el-popover v-else
             placement="left"
             :width="285"
             trigger="click"
@@ -180,7 +180,7 @@
               </div>
             </div>
           </el-popover>
-          <img
+          <img v-if='!scope.row.approveStatus'
             width="17"
             height="18"
             style="vertical-align: text-top; position: relative; top: -1px"
@@ -222,7 +222,8 @@
             "
             alt=""
           />
-          <img
+          <div v-if='scope.row.approveStatus!="待决策人审核"&&scope.row.approveStatus||scope.row.status!="执行中"&&scope.row.status' style='display:inline-block;'>
+            <img
             width="17"
             height="16"
             style="vertical-align: text-top; margin: 0 6px"
@@ -233,6 +234,8 @@
             @click="handleEdit(scope.row)"
             alt=""
           />
+          </div>
+          
           <img
             width="16"
             height="17"
@@ -568,7 +571,7 @@ export default {
     handleExamine(row) {
       this.$router.push({
         name: 'salesContractExamine',
-        query: { id: row.id },
+        query: { id: row.id,workflowId:row.workflowId },
       })
     },
     handleAdd() {

src/views/contractManagement/salesContractExamine.vue

@@ -97,7 +97,7 @@
           </ws-form-item>
           <ws-form-item label="交货方式" span="1" prop="deliverType">
             <div class="unchanged">
-              {{ deptBudgetList.deliverType1 }}
+              {{ deptBudgetList.deliverType }}
             </div>
           </ws-form-item>
           <ws-form-item label="买方电话" span="1" prop="buyerPhone">
@@ -324,6 +324,25 @@
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
       />
       </ws-form>
+      <el-table
+        class="wenzi"
+        :data="taskhistories"
+        style="width: 100%"
+      >
+        <el-table-column prop="operatorMajorRoleName" label="审核人">
+          <template scope="scope">
+            {{scope.row.operatorMajorRoleName}}{{scope.row.operatorName}}
+            </template>
+        </el-table-column>
+        <el-table-column prop="inOutTaskNo" label="审核结果">
+          <template scope="scope">
+            <span v-if='scope.row.approved'>通过</span>
+            <span v-if='!scope.row.approved'>驳回</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="endTime" label="审核时间"></el-table-column>
+        <el-table-column prop="auditMind" label="驳回原因"></el-table-column>
+     </el-table>
       <div style="text-align: right; padding: 10px">
         <el-button
           class="bg-bottom"
@@ -344,6 +363,9 @@ import {
   examineList,
   billoperatehis,
 } from '@/model/contarct/index'
+import {
+  gettaskhistories
+} from '@/model/tasksport/index'
 import { dayjs } from 'base-core-lib'
 import WsUpload from '@/components/WsUpload'
 export default {
@@ -364,6 +386,7 @@ export default {
       //弹出框
       dialogViewSpareMoney: false,
       dialogApproveFormVisible: false,
+      taskhistories:[],
       // 船舶类型
       monetaryKey: null,
       // 表格显示数据
@@ -395,6 +418,10 @@ export default {
   },
   methods: {
     loaddata() {
+      gettaskhistories({businessKey: this.$route.query.id,workflowId: this.$route.query.workflowId}).toPromise()
+          .then((response) => {
+            this.taskhistories=response
+          })
       // 数据
       examineList({ id: this.$route.query.id })
         .toPromise()

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

@@ -8,7 +8,7 @@ const tranManagementRouter = {
   alwaysShow: true, // will always show the root menu
   meta: {
     title: 'tranManagement',
-    module: 'transportationTask.transportation',
+    module: 'tranManager',
     icon: '-yunshu2'
   },
   children: [
@@ -22,7 +22,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementTransporTationFire',
         shortcutEntrance: 'transportationTask',
-        module: 'transportationTask.transportation.fireDispatching',
+        module: 'tranManager.fireDispatching',
         permissicon: [],
         keepAlive: true
       },
@@ -36,7 +36,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementTransporTrainNo',
         shortcutEntrance: 'tranManagement',
-        module: 'transportationTask.transportation.fireDispatching.car',
+        module: 'tranManager.fireDispatching.car',
         permissicon: [],
         keepAlive: true
       },
@@ -51,7 +51,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementTransporTrainDetails',
         shortcutEntrance: 'transportationTask',
-        module: 'transportationTask.transportation.fireDispatching.view',
+        module: 'tranManager.fireDispatching.view',
         permissicon: [],
         keepAlive: true
       },
@@ -66,7 +66,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementShippingArrangemen',
         shortcutEntrance: 'tranManagement',
-        module: 'transportationTask.transportation.shippingDispatching.car',
+        module: 'tranManager.shippingDispatching.car',
         permissicon: [],
         keepAlive: true
       },
@@ -82,12 +82,11 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementShippingLook',
         shortcutEntrance: 'tranManagement',
-        module: 'transportationTask.transportation.shippingDispatching.view',
+        module: 'tranManager.shippingDispatching.view',
         permissicon: [],
         keepAlive: true
       },
       hidden: true
-
     },
     //添加司机
     {
@@ -128,7 +127,7 @@ const tranManagementRouter = {
       meta: {
         title: 'tranManagementShipping',
         shortcutEntrance: 'tranManagement',
-        module: 'transportationTask.transportation.shippingDispatching',
+        module: 'tranManager.shippingDispatching',
         permissicon: [],
         keepAlive: true
       },

src/views/tranManagement/tranManagementShipping.vue

@@ -148,8 +148,12 @@
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="200">
           <template slot-scope="scope">
-            <div class="record" @click="handleLook(scope.row)">查看</div>
-            <div class="adjustment" @click="shipping(scope.row)">船次</div>
+            <div v-hasPermission="
+                'tranManager.shippingDispatching.view'
+              " class="record" @click="handleLook(scope.row)">查看</div>
+            <divv-hasPermission="
+                'tranManager.shippingDispatching.car'
+              " class="adjustment" @click="shipping(scope.row)">船次</divv-hasPermission=>
           </template>
         </el-table-column>
       </el-table>

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -152,7 +152,7 @@
               class="record"
               @click="trainSee(scope.row)"
               v-hasPermission="
-                'transportationTask.transportation.fireDispatching.view'
+                'tranManager.fireDispatching.view'
               "
             >
               查看
@@ -161,7 +161,7 @@
               class="adjustment"
               @click="trainNumber(scope.row)"
               v-hasPermission="
-                'transportationTask.transportation.fireDispatching.car'
+                'tranManager.fireDispatching.car'
               "
             >
               车次

src/views/tranManagement/tranManagementTransporTrainNo.vue

@@ -28,30 +28,25 @@
       :model="deptBudgetList"
     >
       <div class="small-title" style="font-size: 16px">任务详情</div>
-      <ws-info-table>
-        <!--任务编号-->
+       <ws-info-table>
+
         <ws-form-item label="任务编号" span="1" prop="processNo">
           {{ deptBudgetList.processNo }}
         </ws-form-item>
-        <!--货名-->
-        <ws-form-item label="货名" span="1" prop="goodsName">
+         <ws-form-item label="货名" span="1" prop="goodsName">
           {{ deptBudgetList.goodsName }}
         </ws-form-item>
-        <!--重量（吨）-->
         <ws-form-item label="重量（吨）" span="1" prop="weight">
           {{ deptBudgetList.weight }}
         </ws-form-item>
-        <!--发货地址-->
         <ws-form-item label="发货地址" span="1" prop="sendDetailedAddress">
           {{ deptBudgetList.sendPrivate }}{{ deptBudgetList.sendCity
           }}{{ deptBudgetList.sendArea
           }}{{ deptBudgetList.sendDetailedAddress }}
         </ws-form-item>
-        <!--发货人-->
         <ws-form-item label="发货人" span="1" prop="sender" class="readonly">
           {{ deptBudgetList.sender }}
         </ws-form-item>
-        <!--发货人电话-->
         <ws-form-item
           label="发货人电话"
           span="1"
@@ -60,36 +55,28 @@
         >
           {{ deptBudgetList.senderPhone }}
         </ws-form-item>
-        <!--收货地址-->
         <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
           {{ deptBudgetList.receivePrivate }}{{ deptBudgetList.receiveCity
-          }}{{ deptBudgetList.receiveArea
-          }}{{ deptBudgetList.receiveDetailedAddress }}
-        </ws-form-item>
-        <!--收货人-->
-        <ws-form-item label="收货人" span="1" prop="receiver">
+          }}{{ deptBudgetList.receiveArea}}{{deptBudgetList.receiveDetailedAddress}}
+       </ws-form-item>
+         <ws-form-item label="收货人" span="1" prop="receiver">
           {{ deptBudgetList.receiver }}
         </ws-form-item>
-        <!--收货人电话-->
         <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
           {{ deptBudgetList.receiverPhone }}
         </ws-form-item>
-        <!--发货日期-->
         <ws-form-item label="发货日期" span="1" prop="deliveryDateStart">
           {{ deptBudgetList.deliveryDateStart }}
         </ws-form-item>
-        <!--最晚到货日期-->
         <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
           {{ deptBudgetList.deliveryDateEnd }}
         </ws-form-item>
-        <!--合同编号-->
         <ws-form-item label="合同编号" span="1" prop="contractNo">
           {{ deptBudgetList.contractNo }}
         </ws-form-item>
       </ws-info-table>
       <div class="small-title" style="font-size: 16px">联络员及车皮信息</div>
       <div class="myTest">
-              <!--当前运输总价-->
             <ws-form-item label="当前运输总价(元/吨):" span="1" prop="tranPrice">
                 <ws-input
                   v-model="deptBudgetList.tranPrice"
@@ -99,7 +86,6 @@
                   style="width:70px"
                 />
             </ws-form-item>
-            <!--审核中的运输总价-->
             <ws-form-item label="审核中的运输总价(元/吨):" span="1" prop="tranPriceIng">
               <ws-input
                   v-if="deptBudgetList.priceStatus=='审核中'"
@@ -118,10 +104,11 @@
                 />
             </ws-form-item>
             <ws-form-item>
+
              <el-button
               v-if="deptBudgetList.priceStatus=='审核中'"
               type="primary"
-              v-hasPermission="`transportationTask.transportation.transportationInfo.trian`" 
+              v-hasPermission="`tranManager.transportationInfo.trian`" 
               size="small"
               @click="examine()"
               >审核中</el-button
@@ -141,7 +128,6 @@
         :key="index"
       >
         <ws-info-table>
-          <!--姓名-->
           <ws-form-item label="姓名" span="1" prop="driver" v-show="index==0">
             <el-select
               v-model="item.driver"
@@ -158,7 +144,6 @@
               />
             </el-select>
           </ws-form-item>
-          <!--电话-->
           <ws-form-item label="电话" span="1" prop="driverPhone"  v-show="index==0">
             <ws-input
               v-model="item.driverPhone"
@@ -169,7 +154,6 @@
               size="small"
             />
           </ws-form-item>
-          <!--发车日期-->
           <ws-form-item label="发车日期" span="1" prop="sendDateStart"  v-show="index==0">
             <ws-date-picker
               v-model="item.sendDateStart"
@@ -178,7 +162,6 @@
               value-format="yyyy-MM-dd"
             />
           </ws-form-item>
-          <!--到站日期-->
           <ws-form-item label="预计到站日期" span="1" prop="receiveDateEnd"  v-show="index==0">
             <ws-date-picker
               v-model="item.receiveDateEnd"
@@ -187,7 +170,6 @@
               value-format="yyyy-MM-dd"
             />
           </ws-form-item>
-          <!--车型-->
           <ws-form-item label="车型" span="1" prop="carModel"  v-show="index==0">
             <el-select
               v-model="item.carModel"
@@ -210,9 +192,7 @@
               size="small"
             />
           </ws-form-item>
-          <!--   -->
         </ws-info-table>
-        <!-- class="del" -->
         <span
           v-if="
             item.status == '未装车' || item.status == '' || item.status == null
@@ -547,7 +527,7 @@ export default {
         .toPromise()
         .then((response) => {
           this.deptBudgetList = response
-          if (response.tranCarInfoList.length == 0)
+          if (response.tranCarInfoList.length == 0){
             this.deptBudgetList.tranCarInfoList = [
               {
                 driver: '',
@@ -559,6 +539,8 @@ export default {
                 tranType: '2',
               },
             ]
+          }
+            
         })
       //司机姓名下拉
       getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })

src/views/tranManagement/tranManagementVehicle.vue

@@ -148,8 +148,12 @@
         <el-table-column prop="createDate" label="接单时间"> </el-table-column>
         <el-table-column prop="seller" label="操作" width="200">
           <template slot-scope="scope">
-            <div class="record" @click="nocomplete(scope.row)">查看</div>
-            <div class="adjustment" @click="warehousing(scope.row)">派车</div>
+            <div v-hasPermission="
+                'transportationTask.transportation.vehicleDispatching.view'
+              " class="record" @click="nocomplete(scope.row)">查看</div>
+            <div v-hasPermission="
+                'transportationTask.transportation.vehicleDispatching.car'
+              " class="adjustment" @click="warehousing(scope.row)">派车</div>
           </template>
         </el-table-column>
       </el-table>

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -129,21 +129,25 @@
                 />
             </ws-form-item>
             <ws-form-item>
-             <el-button
-              v-if="deptBudgetList.priceStatus=='审核中'"
+              <div v-if="deptBudgetList.priceStatus=='审核中'">
+                <el-button
               type="primary"
-              v-hasPermission="`transportationTask.transportation.transportationInfo.exe`"
+              v-hasPermission="`tranManager.transportationInfo.exe`"
               size="small"
               @click="examine()"
               >审核中</el-button
             >
-             <el-button
-              v-else
+              </div>
+             <div v-else>
+                <el-button
+              
               type="primary"
               size="small"
               @click="priceSubmit()"
               >提交</el-button
             >
+             </div>
+            
             </ws-form-item>
           </div>
           <div