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

src/lang/zh.js

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

src/views/contractManagement/purchaseContract.vue

@@ -74,63 +74,116 @@
 					<span style="color: #5473e8; font-weight: 600">{{
             scope.row.completedQuantity
           }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column prop="status" label="状态">
-				<template slot-scope="scope">
-					<el-popover placement="left" :width="285" trigger="click" visible-arrow="false"
-						@show="history(scope.row)">
-						<template>
-							<span slot="reference">
-								<span v-if="scope.row.status == '待执行'" class="executory"></span>
-								<span v-if="scope.row.status == '执行中'" class="inExecution"></span>
-								<span v-if="scope.row.status == '已完成'" class="done"></span>{{ scope.row.status }}
-							</span>
-						</template>
-						<div>
-							<p style="margin-top: 0; padding-left: 10px">操作历史</p>
-							<div v-for="(item, index) in historyList" :key="index" class="flex">
-								<div class="vertical-text vertical-text-left">
-									{{ item.updateDate }}
-								</div>
-								<div>
-									<div class="vertical-circle"></div>
-									<div v-if="index != historyList.length - 1" class="vertical-line"></div>
-								</div>
-								<div class="vertical-text">
-									{{ item.operateUser }}<br />{{ item.dealMsg }}
-								</div>
-							</div>
-						</div>
-					</el-popover>
-					<img width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
-						src="../../../public/img/edit.png" @click="editClick(scope.row)" alt="" />
-					<!-- <i class="el-icon-edit" @click="editClick(scope.row)"></i> -->
-				</template>
-			</el-table-column>
-			<el-table-column prop="signingDate" label="签订日期"> </el-table-column>
-			<el-table-column prop="mildewGrain" label="已付款（元）">
-			</el-table-column>
-			<el-table-column prop="addressUrl" label="附件">
-				<template slot-scope="scope">
-					<img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
-						src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
-					<span v-if="scope.row.addressUrlArray != null">
-						{{scope.row.addressUrlArray.length == 0? "":scope.row.addressUrlArray.length}}
-					</span>
-				</template>
-			</el-table-column>
-			<el-table-column prop="address" label="操作" width="140">
-				<template slot-scope="scope">
-					<img width="16" height="16" style="vertical-align: text-top; margin: 0 6px"
-						src="../../../public/img/chakan.png" @click="handleExamine(scope.row)" v-hasPermission="
+        </template>
+      </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"
+            visible-arrow="false"
+            @show="history(scope.row)"
+          >
+            <template>
+              <span slot="reference">
+                <span
+                  v-if="scope.row.status == '待执行'"
+                  class="executory"
+                ></span>
+                <span
+                  v-if="scope.row.status == '执行中'"
+                  class="inExecution"
+                ></span>
+                <span v-if="scope.row.status == '已完成'" class="done"></span
+                >{{ scope.row.status }}
+              </span>
+            </template>
+            <div>
+              <p style="margin-top: 0; padding-left: 10px">操作历史</p>
+              <div
+                v-for="(item, index) in historyList"
+                :key="index"
+                class="flex"
+              >
+                <div class="vertical-text vertical-text-left">
+                  {{ item.updateDate }}
+                </div>
+                <div>
+                  <div class="vertical-circle"></div>
+                  <div
+                    v-if="index != historyList.length - 1"
+                    class="vertical-line"
+                  ></div>
+                </div>
+                <div class="vertical-text">
+                  {{ item.operateUser }}<br />{{ item.dealMsg }}
+                </div>
+              </div>
+            </div>
+          </el-popover>
+          <img
+           v-if='!scope.row.approveStatus'
+            width="17"
+            height="18"
+            style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/edit.png"
+            @click="editClick(scope.row)"
+            alt=""
+          />
+          <!-- <i class="el-icon-edit" @click="editClick(scope.row)"></i> -->
+        </template>
+      </el-table-column>
+      <el-table-column prop="signingDate" label="签订日期"> </el-table-column>
+      <el-table-column prop="mildewGrain" label="已付款（元）">
+      </el-table-column>
+      <el-table-column prop="addressUrl" label="附件">
+        <template slot-scope="scope">
+          <img
+            width="18"
+            height="20"
+            style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/fujian.png"
+            @click="fujian(scope.row)"
+            alt=""
+          />
+          <span v-if="scope.row.addressUrlArray != null">
+            {{scope.row.addressUrlArray.length == 0? "":scope.row.addressUrlArray.length}}
+            </span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="address" label="操作" width="200">
+        <template slot-scope="scope">
+          <img
+            width="16"
+            height="16"
+            style="vertical-align: text-top; margin: 0 6px"
+            src="../../../public/img/chakan.png"
+            @click="handleExamine(scope.row)"
+            v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.view`
-            " alt="" />
-					<img width="17" height="16" style="vertical-align: text-top; margin: 0 6px"
-						src="../../../public/img/bianji.png" @click="handleEdit(scope.row)" v-hasPermission="
+            "
+            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"
+            style="vertical-align: text-top; margin: 0 6px"
+            src="../../../public/img/bianji.png"
+            @click="handleEdit(scope.row)"
+            v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.edit`
-            " alt="" />
-					<img width="16" height="17" style="
+            "
+            alt=""
+          />
+          </div>
+          <img
+            width="16"
+            height="17"
+            style="
               vertical-align: text-top;
               position: relative;
               top: -1px;

src/views/contractManagement/purchaseContractAdd.vue

@@ -331,7 +331,7 @@
       <ws-input v-model="deptBudgetList.remarks" type="textarea" row="3" placeholder="请输入备注信息，不超过3000字"
         maxlength="3000" />
       <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
-        @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+        @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" v-hasPermission="`contractManagement.buyContract.buyContractInfo.appl`"/>
     </ws-form>
     <div v-if="dialogVisible" class="map">
       <map-drag @marker="marker" :isShowaddress='true' v-on:addressListen='getAddress' :type="type"></map-drag>

src/views/contractManagement/purchaseContractEdit.vue

@@ -493,6 +493,7 @@
         :size-limit="size"
         @onChange="onChange"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
+        v-hasPermission="`contractManagement.buyContract.buyContractInfo.appl`"
       />
       </base-card>
     </ws-form>

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

@@ -13,23 +13,53 @@
               left: -4px;
             " src="../../../public/img/header-add.png" alt="" />添加</ws-button>
 				<ws-button @click="exportlist()" v-hasPermission="
-            `contractManagement.salesContract.salesContractInfo.view`
-          ">导出</ws-button>
-			</template>
-			<template slot="right">
-				<span style="width: 142px; display: inline-block; color: #8890b1">状态：</span>
-				<ws-select v-model="searchTypeText" placeholder="" class="typeselect" @change="selecttaskType"
-					:value="searchType">
-					<ws-option v-for="item in taskTypeList" :key="item.value" :label="item.value" :value="item.value"
-						style="color: #8890b1" />
-				</ws-select>
-
-				<el-date-picker v-model="value2" type="daterange" align="right" unlink-panels range-separator="至"
-					start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions">
-				</el-date-picker>
-				<ws-input v-model="searchKeyWord" placeholder="可按照合同编号、买方名称、卖方名称进行查找" clearable maxlength="500"
-					type="input" class="findValue"></ws-input>
-				<ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
+            `contractManagement.salesContract.salesContractInfo.view`"
+          >导出</ws-button
+        >
+      </template>
+      <template slot="right">
+        <span style="width: 142px; display: inline-block; color: #8890b1"
+          >状态：</span>
+        <ws-select
+          v-model="searchTypeText"
+          placeholder=""
+          class="typeselect"
+          @change="selecttaskType"
+          :value="searchType"
+        >
+          <ws-option
+            v-for="item in taskTypeList"
+            :key="item.value"
+            :label="item.value"
+            :value="item.value"
+            style="color: #8890b1"
+          />
+        </ws-select>
+
+        <el-date-picker
+          v-model="value2"
+          type="daterange"
+          align="right"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :picker-options="pickerOptions"
+        >
+        </el-date-picker>
+        <ws-input
+          v-model="searchKeyWord"
+          placeholder="可按照合同编号、买方名称、卖方名称进行查找"
+          clearable
+          maxlength="500"
+          type="input"
+          class="findValue"
+        ></ws-input>
+        <ws-button class="find" type="primary" @click="find()"
+          ><img
+            width="16"
+            height="16"
+            style="
               vertical-align: text-top;
               position: relative;
               top: 0px;
@@ -62,61 +92,95 @@
 					<span v-if="scope.row.grade == '等外'" class="substandard">{{
             scope.row.grade
           }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column prop="weight" label="重量（吨）"> </el-table-column>
-			<el-table-column prop="unitContractPrice" label="合同单价（元）">
-			</el-table-column>
-			<el-table-column prop="packingMethod" label="包装方式"> </el-table-column>
-			<el-table-column prop="buyer" label="买方"> </el-table-column>
-			<el-table-column prop="seller" label="卖方"> </el-table-column>
-			<el-table-column prop="completedQuantity" label="已完成（吨）">
-				<template slot-scope="scope">
-					<span v-if="scope.row.proportion < 90"
-						style="color: #5473e8; font-weight: 600">{{ scope.row.completedQuantity }}</span>
-					<span v-if="scope.row.proportion > 90"
-						style="color: red; font-weight: 600">{{ scope.row.completedQuantity }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column prop="status" label="状态">
-				<template slot-scope="scope">
-					<el-popover placement="left" :width="285" trigger="click" visible-arrow="false"
-						@show="history(scope.row)">
-						<template>
-							<span slot="reference">
-								<span v-if="scope.row.status == '待执行'" class="executory"></span>
-								<span v-if="scope.row.status == '执行中'" class="inExecution"></span>
-								<span v-if="scope.row.status == '已完成'" class="done"></span>{{ scope.row.status }}
-							</span>
-						</template>
-						<div>
-							<p style="margin-top: 0; padding-left: 10px">操作历史</p>
-							<div v-for="(item, index) in historyList" class="flex">
-								<div class="vertical-text vertical-text-left">
-									{{ item.updateDate }}
-								</div>
-								<div>
-									<div class="vertical-circle"></div>
-									<div v-if="index != historyList.length - 1" class="vertical-line"></div>
-								</div>
-								<div class="vertical-text">
-									{{ item.operateUser }}<br />{{ item.dealMsg }}
-								</div>
-							</div>
-						</div>
-					</el-popover>
-					<img width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
-						src="../../../public/img/edit.png" @click="editClick(scope.row)" alt="" />
-				</template>
-			</el-table-column>
-			<el-table-column prop="signingDate" label="签订日期"> </el-table-column>
-			<el-table-column prop="mildewGrain" label="未回款（元）">
-			</el-table-column>
-			<el-table-column prop="addressUrl" label="附件">
-				<template slot-scope="scope">
-					<img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
-						src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
-					<span v-if="scope.row.addressUrlArray != null">{{
+        </template>
+      </el-table-column>
+      <el-table-column prop="weight" label="重量（吨）"> </el-table-column>
+      <el-table-column prop="unitContractPrice" label="合同单价（元）">
+      </el-table-column>
+      <el-table-column prop="packingMethod" label="包装方式"> </el-table-column>
+      <el-table-column prop="buyer" label="买方"> </el-table-column>
+      <el-table-column prop="seller" label="卖方"> </el-table-column>
+      <el-table-column prop="completedQuantity" label="已完成（吨）">
+        <template slot-scope="scope">
+          <span
+            v-if="scope.row.proportion < 90"
+            style="color: #5473e8; font-weight: 600"
+            >{{ scope.row.completedQuantity }}</span
+          >
+          <span
+            v-if="scope.row.proportion > 90"
+            style="color: red; font-weight: 600"
+            >{{ scope.row.completedQuantity }}</span
+          >
+        </template>
+      </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"
+            visible-arrow="false"
+            @show="history(scope.row)"
+          >
+            <template>
+              <span slot="reference">
+                <span
+                  v-if="scope.row.status == '待执行'"
+                  class="executory"
+                ></span>
+                <span
+                  v-if="scope.row.status == '执行中'"
+                  class="inExecution"
+                ></span>
+                <span v-if="scope.row.status == '已完成'" class="done"></span
+                >{{ scope.row.status }}
+              </span>
+            </template>
+            <div>
+              <p style="margin-top: 0; padding-left: 10px">操作历史</p>
+              <div v-for="(item, index) in historyList" class="flex">
+                <div class="vertical-text vertical-text-left">
+                  {{ item.updateDate }}
+                </div>
+                <div>
+                  <div class="vertical-circle"></div>
+                  <div
+                    v-if="index != historyList.length - 1"
+                    class="vertical-line"
+                  ></div>
+                </div>
+                <div class="vertical-text">
+                  {{ item.operateUser }}<br />{{ item.dealMsg }}
+                </div>
+              </div>
+            </div>
+          </el-popover>
+          <img v-if='!scope.row.approveStatus'
+            width="17"
+            height="18"
+            style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/edit.png"
+            @click="editClick(scope.row)"
+            alt=""
+          />
+        </template>
+      </el-table-column>
+      <el-table-column prop="signingDate" label="签订日期"> </el-table-column>
+      <el-table-column prop="mildewGrain" label="未回款（元）">
+      </el-table-column>
+      <el-table-column prop="addressUrl" label="附件">
+        <template slot-scope="scope">
+          <img
+            width="18"
+            height="20"
+            style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/fujian.png"
+            @click="fujian(scope.row)"
+            alt=""
+          />
+          <span v-if="scope.row.addressUrlArray != null">{{
             scope.row.addressUrlArray.length == 0 ? "":scope.row.addressUrlArray.length
           }}</span>
 					<!-- <i @click="fujian(scope.row)" class="el-icon-paperclip iconCss"></i> -->
@@ -127,12 +191,27 @@
 					<img width="16" height="16" style="vertical-align: text-top; margin: 0 6px"
 						src="../../../public/img/chakan.png" @click="handleExamine(scope.row)" v-hasPermission="
               `contractManagement.salesContract.salesContractInfo.view`
-            " alt="" />
-					<img width="17" height="16" style="vertical-align: text-top; margin: 0 6px"
-						src="../../../public/img/bianji.png" v-hasPermission="
+            "
+            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"
+            style="vertical-align: text-top; margin: 0 6px"
+            src="../../../public/img/bianji.png"
+            v-hasPermission="
               `contractManagement.salesContract.salesContractInfo.edit`
-            " @click="handleEdit(scope.row)" alt="" />
-					<img width="16" height="17" style="
+            "
+            @click="handleEdit(scope.row)"
+            alt=""
+          />
+          </div>
+          
+          <img
+            width="16"
+            height="17"
+            style="
               vertical-align: text-top;
               position: relative;
               top: -1px;

src/views/contractManagement/salesContractAdd.vue

@@ -332,8 +332,13 @@
         <!--备注信息-->
         <ws-input v-model="deptBudgetList.remarks" type="textarea" row="3" placeholder="请输入备注信息，不超过200字"
           maxlength="3000" />
-        <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
-          @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+        <ws-upload ref="upload" 
+        :comp-id="compId" 
+        :appendix-ids="deptBudgetList.addressUrl" 
+        :size-limit="size"
+        @onChange="onChange" 
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" 
+        v-hasPermission="`contractManagement.salesContractsalesContractInfo.appl`"/>
       </ws-form>
       <div v-if="dialogVisible" class="map">
         <map-drag @marker="marker" :isShowaddress="true" v-on:addressListen="getAddress" :type="type">

src/views/contractManagement/salesContractEdit.vue

@@ -341,7 +341,8 @@
         <ws-input v-model="deptBudgetList.remarks" type="textarea" row="3" placeholder="请输入备注信息，不超过200字"
           maxlength="200" />
         <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
-          @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+          @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" v-hasPermission="
+            `contractManagement.salesContractsalesContractInfo.appl`"/>
       </ws-form>
     </div>
     <div v-if="dialogVisible" class="map">

src/views/contractManagement/salesContractExamine.vue

@@ -112,7 +112,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">
@@ -339,6 +339,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"
@@ -359,6 +378,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 {
@@ -379,6 +401,7 @@ export default {
       //弹出框
       dialogViewSpareMoney: false,
       dialogApproveFormVisible: false,
+      taskhistories:[],
       // 船舶类型
       monetaryKey: null,
       // 表格显示数据
@@ -410,6 +433,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/tranManagementFireFeedback.vue

@@ -119,7 +119,6 @@
                 </el-upload>
                 <span v-if="item.imgCount > 0">{{item.imgCount}}</span>
                 <span v-if="item.imgCount == 0">未上传</span>
-              <!-- <el-button class="bg-bottom-preview" type="primary" size="small" @click="preview(item)"  v-if="item.imgCount != null ">预览</el-button> -->
               <el-button v-if="item.imgCount>0" class="bg-bottom-preview" type="primary" size="small" :data-img="item.loadPoundImg" @click="$imgPreview">预览</el-button>
               </template>
             </ws-form-item>

src/views/tranManagement/tranManagementFireFeedbackLook.vue

@@ -145,10 +145,10 @@
                     top: -1px;
                   "
                   src="../../../public/img/fujian.png"
-                  @click="fujian(index)"
+                  :data-img="item.loadPoundImg"
+                  @click="$imgPreview"
                   alt=""
                 />
-
                 <span
                   v-if="
                     deptBudgetList.tranCarInfoList[index].loadPoundImgArr
@@ -165,6 +165,7 @@
                   "
                   >无</span
                 >
+                <!-- <el-button v-if="item.loadPoundImg != null" class="bg-bottom-preview" type="primary" size="small" :data-img="item.loadPoundImg" @click="$imgPreview">预览</el-button> -->
               </template>
             </ws-form-item>
             <!--装车日期-->

src/views/tranManagement/tranManagementFireReceivingFeedback.vue

@@ -197,8 +197,9 @@
                     alt=""
                   />
                 </el-upload>
-                <span v-if="item.unloadPoundImg != null">1</span>
-                <span v-if="item.unloadPoundImg == null">未上传</span>
+                <span v-if="item.imgCount > 0">{{item.imgCount}}</span>
+                <span v-if="item.imgCount == 0">未上传</span>
+                <el-button v-if="item.imgCount>0" class="bg-bottom-preview" type="primary" size="small" :data-img="item.unloadPoundImg" @click="$imgPreview">预览</el-button>
               </template>
             </ws-form-item>
             <!--卸车日期-->
@@ -395,10 +396,10 @@ export default {
         {
           boxNo: '',
           unloadNetWeight: '',
-          unloadPoundImg: null,
+          unloadPoundImg: '',
           unloadingDate: '',
+          imgCount: 0
         },
-        // {loadPoundImg:{}},
       ],
       name: '',
       staffList: [],
@@ -537,20 +538,20 @@ export default {
               ) {
                 _this.freightspace[k] = _this.excelFreightspace[i]
                 if (
-                  _this.excelFreightspace[i].loadPoundImg.split(',').length > 0
+                  _this.excelFreightspace[i].unloadPoundImg.split(',').length > 0
                 ) {
                   _this.freightspace[k].imgCount =
-                    _this.excelFreightspace[i].loadPoundImg.split(',').length
+                    _this.excelFreightspace[i].unloadPoundImg.split(',').length
                 }
                 _ispushData = false
               }
             }
             if (_ispushData) {
               if (
-                _this.excelFreightspace[i].loadPoundImg.split(',').length > 0
+                _this.excelFreightspace[i].unloadPoundImg.split(',').length > 0
               ) {
                 _this.excelFreightspace[i].imgCount =
-                  _this.excelFreightspace[i].loadPoundImg.split(',').length
+                  _this.excelFreightspace[i].unloadPoundImg.split(',').length
               }
               _this.freightspace.push(_this.excelFreightspace[i])
 
@@ -739,11 +740,22 @@ export default {
             if (!this.freightspace[i].loadNetWeight) {
               this.freightspace[i].loadNetWeight = 0
             }
+            if (this.freightspace[i].unloadPoundImg) {
+                this.freightspace[i].imgCount = this.freightspace[i].unloadPoundImg.split(",").length
+              } else {
+                this.freightspace[i].unloadPoundImg = ""
+                this.freightspace[i].imgCount = 0
+              }
           }
         })
     },
     uploadSuccessHandle1(e, index) {
-      this.freightspace[index].unloadPoundImg = e.url
+      this.index = index
+        let that = this;
+        that.$forceUpdate();
+        that.freightspace[that.index].imgCount++
+        console.log(that.freightspace[that.index].imgCount)
+        that.freightspace[that.index].unloadPoundImg += e.url + ","
     },
   },
 }

src/views/tranManagement/tranManagementFireReceivingFeedbackLook.vue

@@ -154,7 +154,8 @@
                     top: -1px;
                   "
                   src="../../../public/img/fujian.png"
-                  @click="fujian(index)"
+                  :data-img="item.unloadPoundImg"
+                  @click="$imgPreview"
                   alt=""
                 />
 
@@ -264,6 +265,7 @@
 import { regionData } from 'element-china-area-data'
 import WsUpload from '@/components/WsUpload'
 import mapDrag from '@/components/mapdrag/mapdrag'
+import { seeCat} from '@/model/transport/index'
 export default {
   name: 'viewSpareMoney',
   components: {

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -294,6 +294,9 @@
                     "
                     >未上传</span
                   >
+                  <el-button v-if="deptBudgetList.tranCarInfoList[index].unloadPoundImg !=null"  
+                  class="bg-bottom-preview" type="primary" size="small" :data-img="deptBudgetList.tranCarInfoList[index].unloadPoundImg" @click="$imgPreview">
+                  <span style="margin-left: -7px;">预览</span></el-button>
                 </template>
               </ws-form-item>
               <!--箱号-->
@@ -1000,4 +1003,7 @@ export default {
   // width: 120px;
   // line-height: 40px;
 }
+.bg-bottom-preview{
+    margin: 0 8px;
+  }
 </style>

src/views/tranManagement/tranManagementReceivingloadingLook.vue

@@ -155,7 +155,8 @@
                     top: -1px;
                   "
                   src="../../../public/img/fujian.png"
-                  @click="fujian(index)"
+                  @click="$imgPreview"
+                  :data-img="deptBudgetList.tranCarInfoList[index].unloadPoundImg"
                   alt=""
                 />
                 <span

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>
+            <div v-hasPermission="
+                'tranManager.shippingDispatching.car'
+              " class="adjustment" @click="shipping(scope.row)">船次</div>
           </template>
         </el-table-column>
       </el-table>

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -112,7 +112,7 @@
              <el-button
               v-if="deptBudgetList.priceStatus=='审核中'"
               type="primary"
-              v-hasPermission="`transportationTask.transportation.transportationInfo.ship`" 
+              v-hasPermission="`tranManager.transportationInfo.ship`" 
               size="small"
               @click="examine()"
               >审核中</el-button

src/views/tranManagement/tranManagementShippingFeedback.vue

@@ -348,6 +348,8 @@
                 >未上传</span
               >
             </div>
+            <el-button v-if="deptBudgetList.tranCarInfoList.length>0&&deptBudgetList.tranCarInfoList[0].loadPoundImg != null" 
+               class="bg-bottom-preview" type="primary" size="small" :data-img="deptBudgetList.tranCarInfoList[0].loadPoundImg" @click="$imgPreview">预览</el-button>
           </template>
         </ws-form-item>
 
@@ -901,8 +903,7 @@ export default {
             this.deptBudgetList.shipName = response.tranCarInfoList[0].shipName
             this.deptBudgetList.shipNo = response.tranCarInfoList[0].shipNo
             this.deptBudgetList.shipType = response.tranCarInfoList[0].shipType
-            this.deptBudgetList.boxNumber =
-              response.tranCarInfoList[0].boxNumber
+            this.deptBudgetList.boxNumber = response.tranCarInfoList[0].boxNumber
             //上传附件计数
             if (this.deptBudgetList.tranCarInfoList[0].loadPoundImg) {
               this.pictureTotal =

src/views/tranManagement/tranManagementShippingFeedbackLook.vue

@@ -135,7 +135,9 @@
                     vertical-align: text-top;
                     position: relative;
                     top: -1px;
-                  " src="../../../public/img/fujian.png" @click="fujian()" alt />
+                  " src="../../../public/img/fujian.png" 
+                  :data-img="deptBudgetList.tranCarInfoList[0].loadPoundImg"
+                  @click="$imgPreview" alt />
           <span v-if="deptBudgetList.tranCarInfoList.length>0&&deptBudgetList.tranCarInfoList[0].loadPoundImgArr.length > 0">
             {{ deptBudgetList.tranCarInfoList[0].loadPoundImgArr.length}}
           </span>

src/views/tranManagement/tranManagementTransporFeedback.vue

@@ -154,12 +154,9 @@
                 <span v-if="
                     item.loadPoundImg == null
                   ">未上传</span>
+                  <el-button v-if="item.loadPoundImg != null" class="bg-bottom-preview" type="primary" size="small" :data-img="item.loadPoundImg" @click="$imgPreview">预览</el-button>
               </template>
             </ws-form-item>
-            <!--预览-->
-            <div>
-              <el-button class="bg-bottom" type="primary" size="small" @click="preview(item)"  v-if="item.loadPoundImg != null ">预览</el-button>
-            </div>
             <!--箱号-->
             <ws-form-item label="箱号:" span="1" prop="caseNo">
               <span>{{ item.caseNo }}</span>
@@ -197,11 +194,6 @@
       <el-button class="bg-bottom" type="primary" size="small" @click="submit(deptBudgetList)">提交</el-button>
       <el-button class="bg-bottom" type="primary" size="small" @click="finished (deptBudgetList)">完货</el-button>
     </div>
-    <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
-			@on-cancel="handleClose">
-			<ws-upload ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
-				accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
-		</WinseaContentModal>
   </div>
 </template>
 <script>
@@ -345,11 +337,6 @@
       }
     },
     methods: {
-      preview(item) {
-				this.accessoryTFs = true
-				this.appendixIdss = item.loadPoundImg
-			},
-
       uploadHandle(response, file, fileList) {
         this.localFile = file.raw // 或者 this.localFile=file.raw
         let Base64 = require('js-base64').Base64
@@ -1251,4 +1238,7 @@
   /deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
     padding: 0px;
   }
+  .bg-bottom-preview{
+    margin: 0 8px;
+  }
 </style>

src/views/tranManagement/tranManagementTransporFeedbackLook.vue

@@ -150,7 +150,8 @@
                     top: -1px;
                   "
                   src="../../../public/img/fujian.png"
-                  @click="fujian(index)"
+                  :data-img="item.loadPoundImg"
+                  @click="$imgPreview"
                   alt=""
                 />
 
@@ -169,6 +170,7 @@
                       .length == 0
                   "
                   >无</span>
+                  <!-- <el-button v-if="item.loadPoundImg != null" class="bg-bottom-preview" type="primary" size="small" :data-img="item.loadPoundImg" @click="$imgPreview">预览</el-button> -->
               </template>
             </ws-form-item>
              <!--箱号-->

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
@@ -555,7 +535,7 @@ export default {
         .toPromise()
         .then((response) => {
           this.deptBudgetList = response
-          if (response.tranCarInfoList.length == 0)
+          if (response.tranCarInfoList.length == 0){
             this.deptBudgetList.tranCarInfoList = [
               {
                 driver: '',
@@ -567,6 +547,8 @@ export default {
                 tranType: '2',
               },
             ]
+          }
+            
         })
       //司机姓名下拉
       getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })

src/views/tranManagement/tranManagementUnShippingFeedback.vue

@@ -293,7 +293,7 @@
         >
       </div>
       <!--运单-->
-      <ws-form-item label="运单：" span="1" prop="loadPoundImg">
+      <ws-form-item label="运单：" span="1" prop="unloadPoundImg">
         <!-- slot-scope="scope" -->
         <template>
           <el-upload
@@ -317,19 +317,21 @@
           <div class="tupian">
             <span
               v-if="
-                deptBudgetList.tranCarInfoList[0] &&
-                deptBudgetList.tranCarInfoList[0].loadPoundImg != null
+                deptBudgetList.tranCarInfoList.length > 0 &&
+                  deptBudgetList.tranCarInfoList[0].unloadPoundImg != null
               "
-              >1</span
+              >{{ pictureTotal }}</span
             >
             <span
               v-if="
-                deptBudgetList.tranCarInfoList[0] &&
-                deptBudgetList.tranCarInfoList[0].loadPoundImg == null
+                deptBudgetList.tranCarInfoList.length > 0 &&
+                  deptBudgetList.tranCarInfoList[0].unloadPoundImg == null
               "
               >未上传</span
             >
           </div>
+          <el-button v-if="deptBudgetList.tranCarInfoList.length>0&&deptBudgetList.tranCarInfoList[0].unloadPoundImg != null" 
+               class="bg-bottom-preview" type="primary" size="small" :data-img="deptBudgetList.tranCarInfoList[0].unloadPoundImg" @click="$imgPreview">预览</el-button>
         </template>
       </ws-form-item>
     </ws-form>
@@ -374,6 +376,7 @@ export default {
   },
   data() {
     return {
+      pictureTotal: 0,
       deptBudgetList: {
         totalStorage: 0,
       },
@@ -431,16 +434,15 @@ export default {
           driverPhone: '',
           carNo: '',
           loadNetWeight: '',
-          loadPoundImg: '',
+          unloadPoundImg: '',
         },
-        // {loadPoundImg:{}},
       ],
       name: '',
       staffList: [],
       options: [],
       carModel: [],
       tranCarInfoList: {
-        loadPoundImg: '',
+        unloadPoundImg: '',
       },
       excelFreightspace:[],
       //上传
@@ -783,7 +785,8 @@ export default {
         .toPromise()
         .then((response) => {
           this.deptBudgetList = response
-          this.deptBudgetList.driver = response.tranCarInfoList[0].driver
+          if(response.tranCarInfoList.length > 0){
+            this.deptBudgetList.driver = response.tranCarInfoList[0].driver
           this.deptBudgetList.driverPhone =
             response.tranCarInfoList[0].driverPhone
           this.$set(
@@ -797,8 +800,17 @@ export default {
           this.deptBudgetList.shipNo = response.tranCarInfoList[0].shipNo
           this.deptBudgetList.shipType = response.tranCarInfoList[0].shipType
           this.deptBudgetList.boxNumber = response.tranCarInfoList[0].boxNumber
-          //  this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
+          //上传附件计数
+            if (this.deptBudgetList.tranCarInfoList[0].unloadPoundImg) {
+              this.pictureTotal =
+                this.deptBudgetList.tranCarInfoList[0].unloadPoundImg.split(
+                  ','
+                ).length
+            }
+
           this.freightspace = response.tranCarInfoList
+          }
+          
           for (var i = 0; i < this.freightspace.length; i++) {
             if (!this.freightspace[i].loadNetWeight) {
               this.freightspace[i].loadNetWeight = 0
@@ -857,7 +869,15 @@ export default {
       }
     },
     uploadSuccessHandle1(e, index) {
-      this.deptBudgetList.tranCarInfoList[0].loadPoundImg = e.url
+      this.pictureTotal++
+      if (this.deptBudgetList.tranCarInfoList[0].unloadPoundImg) {
+        this.deptBudgetList.tranCarInfoList[0].unloadPoundImg += ',' + e.url
+      } else {
+        this.deptBudgetList.tranCarInfoList[0].unloadPoundImg = e.url
+      }
+      feedback(this.deptBudgetList)
+        .toPromise()
+        .then((response) => {})
     },
   },
 }

src/views/tranManagement/tranManagementUnShippingFeedbackLook.vue

@@ -211,7 +211,7 @@
         }}</span>
       </div>
       <!--运单-->
-            <ws-form-item label="运单：" span="1" prop="loadPoundImg">
+            <ws-form-item label="运单：" span="1" prop="unloadPoundImg"> 
               <template>
                 <img
                   width="18"
@@ -222,21 +222,22 @@
                     top: -1px;
                   "
                   src="../../../public/img/fujian.png"
-                  @click="fujian()"
+                  :data-img="deptBudgetList.tranCarInfoList[0].unloadPoundImg"
+                  @click="$imgPreview"
                   alt=""
                 />
                 <span
                   v-if="deptBudgetList.tranCarInfoList[0]&&
-                    deptBudgetList.tranCarInfoList[0].loadPoundImgArr
+                    deptBudgetList.tranCarInfoList[0].unloadPoundImgArr
                       .length > 0
                   "
                   >{{
-                    deptBudgetList.tranCarInfoList[0].loadPoundImgArr.length
+                    deptBudgetList.tranCarInfoList[0].unloadPoundImgArr.length
                   }}</span
                 >
                  <span
                   v-if="deptBudgetList.tranCarInfoList[0]&&
-                    deptBudgetList.tranCarInfoList[0].loadPoundImgArr
+                    deptBudgetList.tranCarInfoList[0].unloadPoundImgArr
                       .length == 0
                   "
                   >无</span>
@@ -457,12 +458,12 @@ export default {
               this.freightspace[i].loadNetWeight = 0
             }
             if (this.deptBudgetList.tranCarInfoList[i]&&this.deptBudgetList.tranCarInfoList[i].loadPoundImg != null) {
-              this.deptBudgetList.tranCarInfoList[i].loadPoundImgArr =
-              this.deptBudgetList.tranCarInfoList[i].loadPoundImg.split(',')
+              this.deptBudgetList.tranCarInfoList[i].unloadPoundImgArr =
+              this.deptBudgetList.tranCarInfoList[i].unloadPoundImg.split(',')
               this.fileList[i] =
-              this.deptBudgetList.tranCarInfoList[i].loadPoundImg.split(',')
+              this.deptBudgetList.tranCarInfoList[i].unloadPoundImg.split(',')
             } else {
-              this.deptBudgetList.tranCarInfoList[i].loadPoundImgArr = []
+              this.deptBudgetList.tranCarInfoList[i].unloadPoundImgArr = []
             }
           }
         })
@@ -505,8 +506,8 @@ export default {
     //上传
     fujian(e) {
       if (
-        this.deptBudgetList.tranCarInfoList[0].loadPoundImg === null ||
-        this.deptBudgetList.tranCarInfoList[0].loadPoundImg === ''
+        this.deptBudgetList.tranCarInfoList[0].unloadPoundImg === null ||
+        this.deptBudgetList.tranCarInfoList[0].unloadPoundImg === ''
       ) {
         this.$message({
           message: '暂无附件！',
@@ -517,7 +518,7 @@ export default {
         this.accessoryTFs = true
       }
       this.appendixIdss =
-        this.deptBudgetList.tranCarInfoList[0].loadPoundImgArr
+        this.deptBudgetList.tranCarInfoList[0].unloadPoundImgArr
     },
   },
 }

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

@@ -26,15 +26,12 @@
         <div class="basicInformation">
           <div class="small-title" style="font-size: 16px">任务详情</div>
           <ws-info-table>
-            <!-- 任务编号 -->
-            <ws-form-item label="任务编号" span="1" prop="processNo">
+          <ws-form-item label="任务编号" span="1" prop="processNo">
               {{ deptBudgetList.processNo }}
             </ws-form-item>
-            <!-- 货名 -->
             <ws-form-item label="货名" span="1">
               {{ deptBudgetList.goodsName }}
             </ws-form-item>
-            <!--重量（吨）-->
             <ws-form-item
               label="重量（吨）"
               span="1"
@@ -43,38 +40,28 @@
             >
               {{ deptBudgetList.weight }}
             </ws-form-item>
-
-            <!--发货地址-->
             <ws-form-item label="发货地址" span="1" prop="netWeight">
               {{ deptBudgetList.sendPrivate }}{{ deptBudgetList.sendCity
               }}{{ deptBudgetList.sendArea
               }}{{ deptBudgetList.sendDetailedAddress }}
             </ws-form-item>
-            <!--发货人-->
             <ws-form-item label="发货人" span="1" prop="agent">
               {{ deptBudgetList.sender }}
             </ws-form-item>
-
-            <!--发货人电话-->
             <ws-form-item label="发货人电话" span="1" prop="agent">
               {{ deptBudgetList.senderPhone }}
             </ws-form-item>
-            <!--收货地址-->
             <ws-form-item label="收货地址" span="1" prop="netWeight">
               {{ deptBudgetList.receivePrivate }}{{ deptBudgetList.receiveCity
               }}{{ deptBudgetList.receiveArea
               }}{{ deptBudgetList.receiveDetailedAddress }}
             </ws-form-item>
-            <!--收货人-->
-            <ws-form-item label="收货人" span="1" prop="receiver">
+             <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"
@@ -83,7 +70,6 @@
             >
               {{ deptBudgetList.deliveryDateStart }}
             </ws-form-item>
-            <!--最晚发货日期-->
             <ws-form-item
               label="最晚发货日期"
               span="1"
@@ -92,7 +78,6 @@
             >
               {{ deptBudgetList.deliveryDateEnd }}
             </ws-form-item>
-            <!--合同编号-->
             <ws-form-item label="合同编号" span="1" prop="contractNo">
               {{ deptBudgetList.contractNo }}
             </ws-form-item>
@@ -100,7 +85,6 @@
 
           <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"
@@ -110,7 +94,6 @@
                   style="width:70px"
                 />
             </ws-form-item>
-            <!--审核中的运输单价-->
             <ws-form-item label="审核中的运输单价(元/吨):" span="1" prop="tranPriceIng">
               <ws-input
                   v-if="deptBudgetList.priceStatus=='审核中'"
@@ -128,23 +111,26 @@
                   style="width:70px"
                 />
             </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
@@ -165,7 +151,6 @@
                   item.status
                 }}</span>
               </div>
-              <!--司机-->
               <ws-form-item
                 label="姓名："
                 span="1"
@@ -198,7 +183,6 @@
                   >{{ item.driver }}</span
                 >
               </ws-form-item>
-              <!--司机电话-->
               <ws-form-item
                 label="司机电话："
                 span="1"
@@ -231,7 +215,6 @@
                   >{{ item.driverPhone }}</span
                 >
               </ws-form-item>
-              <!--车牌号-->
               <ws-form-item label="车牌号：" span="1" prop="carNo" class="siji">
                 <ws-input
                   :disabled="readonly"
@@ -241,7 +224,6 @@
                   size="small"
                 />
               </ws-form-item>
-             <!--派车编号-->
               <ws-form-item
                 label="派车编号："
                 span="1"
@@ -256,7 +238,6 @@
                   size="small"
                 />
               </ws-form-item>
-              <!--箱号-->
               <ws-form-item
                 label="箱号："
                 span="1"
@@ -278,7 +259,6 @@
                   size="small"
                 />
               </ws-form-item>
-              <!--封号-->
               <ws-form-item
                 label="封号："
                 span="1"
@@ -301,7 +281,6 @@
                   size="small"
                 />
               </ws-form-item>
-              <!--车型-->
               <ws-form-item
                 label="车型："
                 span="1"
@@ -316,7 +295,6 @@
                   size="small"
                 />
               </ws-form-item>
-              <!--车长-->
               <ws-form-item
                 label="车长："
                 span="1"
@@ -331,7 +309,6 @@
                   size="small"
                 />
               </ws-form-item>
-              <!--载重吨-->
               <ws-form-item
                 label="载重(吨):"
                 span="1"
@@ -346,7 +323,6 @@
                   size="small"
                 />
               </ws-form-item>
-               <!--运输单价-->
               <ws-form-item
                 label="运输单价(元/吨):"
                 span="1"
@@ -372,7 +348,7 @@
               alt=""
               >×</span
             >
-          </div>
+          </div> 
           <div style="text-align: right; color: #8890b1; font-size: 16px">
            共{{ total }}/{{ deptBudgetList.weight }}
           </div>
@@ -597,7 +573,7 @@ export default {
         }).then(({ value }) => {
               var tranProcessInfo = {}
               tranProcessInfo.reviewer = sessionStorage.getItem('ws-pf_roleName') +
-               sessionStorage.getItem('ws-pf_staffName')
+        sessionStorage.getItem('ws-pf_staffName')
               tranProcessInfo.id = this.deptBudgetList.id
               tranProcessInfo.flag = "2"
               tranProcessInfo.tranPriceIng = value
@@ -621,6 +597,7 @@ export default {
         type: 'warning',
       })
         .then(() => {
+          // debugger
               var tranProcessInfo = {}
               tranProcessInfo.id = this.deptBudgetList.id
               tranProcessInfo.flag = "1"
@@ -674,6 +651,8 @@ export default {
               if (valid) {
                 var tranCarInfo = {}
                 tranCarInfo.id = this.deptBudgetList.id
+                tranCarInfo.processNo=this.deptBudgetList.processNo
+                tranCarInfo.tranPrice=this.deptBudgetList.tranPrice
                 tranCarInfo.infoId = this.deptBudgetList.infoId
                 tranCarInfo.tranCarInfoList = this.deptBudgetList.tranCarInfoList
                 dispatchCat(tranCarInfo)