Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/api/V2/purchasingManagement/index.js

@@ -29,4 +29,7 @@ export const API_POST_DELETEPURCHASE = '/purchaseOrder/api/deletePurchaseOrder'
 // 测试
 export const API_POST_SUBMIT = '/purchaseOrder/api/submitPurchaseOrder'
 // 审核通过不通过接口
-export const API_POST_WORKFLOW_API_HANDLE = `/workflow/api/handle`
+export const API_POST_WORKFLOW_API_HANDLE = `/workflow/api/handle`
+// export const API_POST_WORKFLOW_API_HANDLE ='/newWorkflow/api/handle'
+// 审核接口调用之后
+export const API_POST_QUERY_WORKFLOWINFO ='/newWorkflow/query/workflowInfo'

src/api/V2/taskspost/index.js

@@ -19,7 +19,8 @@ export const API_GET_TRAN_EXAMINE = '/tranTaskInfo/getTranTask'
 // 运输任务-编辑
 export const API_GET_TRAN_EDIT = '/tranTaskInfo/api/editTranTask'
 // 审核通过不通过接口
-export const API_POST_WORKFLOW_API_HANDLE = `/workflow/api/handle`
+// export const API_POST_WORKFLOW_API_HANDLE = `/workflow/api/handle`
+export const API_POST_WORKFLOW_API_HANDLE ='/newWorkflow/api/handle'
 // 审核编辑
 export const API_POST_INOUTWAREHOUSETASK = `/inOutWarehouseTask/api/checkOrUpdateInOutTask`
 // 出入库任务-新增（编辑）

src/api/common/index.js

@@ -58,6 +58,8 @@ export const API_GET_PROGRESS_PERCENTAGE = '/tbInitializationData/query/getProgr
 // 是否弹出 true/false
 export const API_GET_IS_SHOW_DIALOG = '/tbInitializationData/query/getVesselList'
 
+// 获取运输结算统计信息
+export const API_GET_INFO ='/tranSettlementReport/getInfo'
 
 // 通过手机号获取公司
 export const API_GET_COMP = '/commonUser/getCompList'

src/layout/index/top/index.vue

@@ -21,7 +21,7 @@
       <!-- 使用租户 -->
       
       <div class="hidden-content">
-        <el-input ref="hiddenFocus" type="password" class="input-Style" readonly v-model="barCode" size="small" @focus="focus" @blur="blur" autocomplete="off" 
+        <el-input ref="hiddenFocus" type="password" class="input-Style" v-model="barCode" size="small" @focus="focus" @blur="blur" autocomplete="off" auto-complete="new-password"
           @keyup.enter.native="payCode" placeholder="扫码枪内容"></el-input>
         <div v-show="isOpenCodeGun" class="code-scan-text">扫码枪已连接</div>
         <div v-show="!isOpenCodeGun" @click="setCodeGun" class="code-scan-text">点我扫码</div>
@@ -51,7 +51,7 @@
       </div>
       <div class="compName-row">
         <!-- <span class="compName">{{compName}}</span> -->
-        <el-select style='width:260px;' @change='compNameChange' v-model="compName" placeholder="请选择" filterable clearable>
+        <el-select style='width:260px;' @change='compNameChange' v-model="compName" placeholder="请选择">
         <el-option
           v-for="item in compNameoptions"
           :key="item"

src/model/indexRx.js

@@ -51,7 +51,7 @@ import {
 } from '@/api/index'
 import { API_POST_REGISTER } from '@/api/V2/operation'
 import { API_GET_SUMMARY_FINANCEPARAMETER } from '@/api/V2/finance'
-import { API_GET_START_INIT_DB, API_GET_PROGRESS_PERCENTAGE, API_GET_IS_SHOW_DIALOG } from '@/api/common'
+import { API_GET_START_INIT_DB, API_GET_PROGRESS_PERCENTAGE, API_GET_IS_SHOW_DIALOG,API_GET_INFO } from '@/api/common'
 import {
   API_GET_EXPORT_PROCUREMENT,
   API_GET_EXPORT_INQUIRYSHEET,
@@ -147,7 +147,7 @@ export const sendRegisterCode = appRx.post(API_POST_SENDREGISTERCODE)
 export const saveFiles = appRx.post(API_POST_SAVEFILES, errorCatcher, errorHandle, filter)
 
 export const testWinsea = appRx.get('/pb/company/query/companyInfoByDomainName', errorCatcher, errorHandle, filter)
-
+export const gettaskInfo= appRx.get(API_GET_INFO, errorCatcher, errorHandle, filter)
 
 export const findVesselSysVersion = appRx.get(API_GET_FINDVESSELSYSVERSION, errorCatcher, errorHandle, filter)
 export const getAccountLoginHistoryCount = appRx.get(API_GET_ACCOUNTLOGINHISTORYCOUNT, errorCatcher, errorHandle, filter)

src/model/purchasingManagement/index.js

@@ -16,7 +16,8 @@ import {
     API_POST_DELETEPURCHASE,
     API_GET_PRICE_PURCHASE,
     API_POST_SUBMIT,
-    API_POST_WORKFLOW_API_HANDLE
+    API_POST_WORKFLOW_API_HANDLE,
+    API_POST_QUERY_WORKFLOWINFO
 } from '@/api/V2/purchasingManagement'
 // import { API_GET_PROCUREMENT_LOOK } from '../../api/V2/purchasingManagement'
 //采购详情列表
@@ -51,3 +52,5 @@ export const getTransactionPriceList = appRx.get(API_GET_PRICE_PURCHASE, errorCa
 export const postsubmit = appRx.post(API_POST_SUBMIT, errorCatcher,errorHandle,filter)
 // 审核通过不通过
 export const posthandle = appRx.post(API_POST_WORKFLOW_API_HANDLE, errorCatcher,errorHandle,filter)
+// 审核之后调用
+export const postqueryhandle = appRx.post(API_POST_QUERY_WORKFLOWINFO, errorCatcher,errorHandle,filter)

src/utils/util.js

@@ -1,4 +1,6 @@
-import { validatenull } from './validate'
+import {
+  validatenull
+} from './validate'
 /**
  * 动态插入css
  */
@@ -46,11 +48,11 @@ const isInclude = (name) => {
 }
 const addCallback = (obj, callback) => {
   if (obj.addEventListener) {
-    obj.addEventListener('load', function () {
+    obj.addEventListener('load', function() {
       callback && callback();
     }, false);
   } else if (obj.attachEvent) {
-    obj.attachEvent('onreadystatechange', function () {
+    obj.attachEvent('onreadystatechange', function() {
       var target = window.event.srcElement;
       if (target.readyState == 'loaded') {
         callback && callback();
@@ -172,16 +174,16 @@ export const listenfullscreen = (callback) => {
   function listen() {
     callback()
   }
-  document.addEventListener('fullscreenchange', function () {
+  document.addEventListener('fullscreenchange', function() {
     listen();
   });
-  document.addEventListener('mozfullscreenchange', function () {
+  document.addEventListener('mozfullscreenchange', function() {
     listen();
   });
-  document.addEventListener('webkitfullscreenchange', function () {
+  document.addEventListener('webkitfullscreenchange', function() {
     listen();
   });
-  document.addEventListener('msfullscreenchange', function () {
+  document.addEventListener('msfullscreenchange', function() {
     listen();
   });
 };
@@ -244,7 +246,8 @@ export const diff = (obj1, obj2) => {
   delete obj1.close;
   var o1 = obj1 instanceof Object;
   var o2 = obj2 instanceof Object;
-  if (!o1 || !o2) { /*  判断不是对象  */
+  if (!o1 || !o2) {
+    /*  判断不是对象  */
     return obj1 === obj2;
   }
 
@@ -270,7 +273,7 @@ export const diff = (obj1, obj2) => {
 export const findByvalue = (dic, value) => {
   let result = '';
   if (validatenull(dic)) return value;
-  if (typeof (value) == 'string' || typeof (value) == 'number' || typeof (value) == 'boolean') {
+  if (typeof(value) == 'string' || typeof(value) == 'number' || typeof(value) == 'boolean') {
     let index = 0;
     index = findArray(dic, value);
     if (index != -1) {
@@ -321,12 +324,16 @@ export const openWindow = (url, title, w, h) => {
   const dualScreenLeft = window.screenLeft !== undefined ? window.screenLeft : screen.left
   const dualScreenTop = window.screenTop !== undefined ? window.screenTop : screen.top
 
-  const width = window.innerWidth ? window.innerWidth : document.documentElement.clientWidth ? document.documentElement.clientWidth : screen.width
-  const height = window.innerHeight ? window.innerHeight : document.documentElement.clientHeight ? document.documentElement.clientHeight : screen.height
+  const width = window.innerWidth ? window.innerWidth : document.documentElement.clientWidth ? document
+    .documentElement.clientWidth : screen.width
+  const height = window.innerHeight ? window.innerHeight : document.documentElement.clientHeight ? document
+    .documentElement.clientHeight : screen.height
 
   const left = ((width / 2) - (w / 2)) + dualScreenLeft
   const top = ((height / 2) - (h / 2)) + dualScreenTop
-  const newWindow = window.open(url, title, 'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=no, resizable=yes, copyhistory=no, width=' + w + ', height=' + h + ', top=' + top + ', left=' + left)
+  const newWindow = window.open(url, title,
+    'toolbar=no, location=no, directories=no, status=no, menubar=no, scrollbars=no, resizable=yes, copyhistory=no, width=' +
+    w + ', height=' + h + ', top=' + top + ', left=' + left)
 
   // Puts focus on the newWindow
   if (window.focus) {
@@ -371,7 +378,9 @@ export const generateTitle = (title, key, _this) => {
 }
 //处理路由
 export const getPath = (params) => {
-  let { src } = params;
+  let {
+    src
+  } = params;
   let result = src || '/';
   if (src.includes('http') || src.includes('https')) {
     result = `/myiframe/urlPath?${objToform(params)}`;
@@ -390,3 +399,13 @@ export const getValue = (route) => {
   return value;
 }
 // 路由处理 结束
+
+// null赋值空字符串
+export const nullToString = (obj) => {
+  Object.keys(obj).forEach(function(key) {
+    console.log(key, obj[key])
+    if (obj[key] === null) {
+      obj[key] = ''
+    }
+  })
+}

src/views/contractManagement/futuresPurchaseContract.vue

@@ -406,6 +406,7 @@
         for (var i = 0; i < this.taskTypeList.length; i++) {
           if (this.taskTypeList[i].value == e) {
             this.searchType = this.taskTypeList[i].type
+            this.find()
           }
         }
       },

src/views/contractManagement/futuresSalesContract.vue

@@ -1,111 +1,111 @@
 <!--期货销售合同-->
 <template>
-	<div>
-		<BaseHeaderLayout :leftSpan="8">
-			<template slot="left">
-				<ws-button type="primary" @click="handleAdd()"
-					v-hasPermission="`contractManagement.buyContract.buyContractInfo.add`">添加</ws-button>
-				<ws-button @click="exportlist()" v-hasPermission="
+  <div>
+    <BaseHeaderLayout :leftSpan="8">
+      <template slot="left">
+        <ws-button type="primary" @click="handleAdd()"
+          v-hasPermission="`contractManagement.buyContract.buyContractInfo.add`">添加</ws-button>
+        <ws-button @click="exportlist()" v-hasPermission="
             `contractManagement.buyContract.buyContractInfo.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>
-				<el-input @keyup.enter.native="find()" v-model="searchKeyWord" placeholder="可按照合同编号、买方名称、卖方名称进行查找" clearable maxlength="500"
-					type="input" class="findValue"></el-input>
-				<!-- v-hasPermission="'procurement.sparepart.directShip'" -->
-				<ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
+      </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>
+        <el-input @keyup.enter.native="find()" v-model="searchKeyWord" placeholder="可按照合同编号、买方名称、卖方名称进行查找" clearable
+          maxlength="500" type="input" class="findValue"></el-input>
+        <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
+        <ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
               vertical-align: text-top;
               position: relative;
               top: 0px;
               left: -8px;
             " src="../../../public/img/sousuo.png" alt="" /></ws-button>
-			</template>
-		</BaseHeaderLayout>
-		<el-table class="wenzi" :data="contractList.records" style="width: 100%; margin-top: 10px" height="calc(100% - 110px)">
-			<el-table-column type="index" label="序号">
-				<template scope="scope">
-					<span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
-					<span v-else>{{ scope.$index + 1 }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column prop="contractNo" label="合同编号" width="150">
-			</el-table-column>
-			<el-table-column prop="goodsName" label="货名" width="80">
-			</el-table-column>
-			<el-table-column prop="weight" label="重量（吨）"> </el-table-column>
-			<el-table-column prop="pointPrice" label="暂定点价（元/吨）">
-			</el-table-column>
-			<el-table-column prop="basisPrice" 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="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.length > 0">{{
+      </template>
+    </BaseHeaderLayout>
+    <el-table class="wenzi" :data="contractList.records" style="width: 100%; margin-top: 10px"
+      height="calc(100% - 110px)">
+      <el-table-column type="index" label="序号">
+        <template scope="scope">
+          <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+          <span v-else>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="contractNo" label="合同编号" width="150">
+      </el-table-column>
+      <el-table-column prop="goodsName" label="货名" width="80">
+      </el-table-column>
+      <el-table-column prop="weight" label="重量（吨）"> </el-table-column>
+      <el-table-column prop="pointPrice" label="暂定点价（元/吨）">
+      </el-table-column>
+      <el-table-column prop="basisPrice" 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="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.length > 0">{{
             scope.row.addressUrlArray.length
           }}</span>
-					<!-- <i @click="fujian(scope.row)" class="el-icon-paperclip iconCss"></i> -->
-				</template>
-			</el-table-column>
-			<el-table-column prop="confirmCount" label="确认单">
-			</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="
+          <!-- <i @click="fujian(scope.row)" class="el-icon-paperclip iconCss"></i> -->
+        </template>
+      </el-table-column>
+      <el-table-column prop="confirmCount" label="确认单">
+      </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="
               `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="
+          <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"  v-if="scope.row.status != '执行中'&&scope.row.status != '已完成'" height="17" style="
+          <img width="16" v-if="scope.row.status != '执行中'&&scope.row.status != '已完成'" height="17" style="
               vertical-align: text-top;
               position: relative;
               top: -1px;
@@ -113,782 +113,780 @@
             " src="../../../public/img/shanchu.png" v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.delete`
             " @click="handleDelete(scope.row)" alt="" />
-				</template>
-			</el-table-column>
-		</el-table>
-		<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-			:page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper"
-			:total="deptBudgetTotal">
-		</el-pagination>
-		<WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
-			@on-cancel="handleClose">
-			<ws-upload ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" 
-			:size-limit="size"
-        	@onChange="onChange"
-				accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
-		</WinseaContentModal>
-	</div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+      :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+    </el-pagination>
+    <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
+      @on-cancel="handleClose">
+      <ws-upload ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :size-limit="size" @onChange="onChange"
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+    </WinseaContentModal>
+  </div>
 </template>
 <script>
-	import {
-		getList,
-		export1,
-		editstatus,
-		billoperatehis,
-		deletecontract,
-		editInfo
-	} from '@/model/contarct/index'
-	import {
-		downloadFile
-	} from '@/utils/batchDown'
-	import Pagination from '@/components/Pagination'
-	import WsUpload from '@/components/WsUpload'
-	import {
-		dayjs,
-		EventBus
-	} from 'base-core-lib'
-	export default {
-		name: 'viewSpareMoney',
-		components: {
-			WsUpload,
-			Pagination,
-		},
-		watch: {
-			vesselId(val) {
-				this.getList()
-			},
-			isShow(val) {
-				this.showType = val
-			},
-		},
-		data() {
-			return {
-				//弹出框
-				dialogViewSpareMoney: false,
-				dialogApproveFormVisible: false,
-				// 船舶类型
-				monetaryKey: null,
-				// 表格显示数据
-				tableDate: [],
-				size: 10,
-				id:'',
-				// 是否显示
-				showType: true,
-				// 年
-				year: '',
-				deliver_type: 1,
-				deptBudgetTotal: 0,
-				currentPage: 1,
-				pageSize: 10,
-				appendixIdsAdd: '',
-				searchType: 1,
-				searchTypeText: '未完成',
-				searchKeyWord: '',
-				contractType: 1,
-				goodsType: 2,
-				startDate: null,
-				endDate: null,
-				addressUrls: [],
-				accessurl: '',
-				accesscard: false,
-				// 提交类型
-				submitType: true,
-				deptCircularPage: {},
-				date: {
-					year: dayjs().format('YYYY'),
-					month: dayjs().format('MM'),
-				},
-				contractList: [],
-				deptBudgetList: {},
-				historyList: [],
-				appendixIdss: [],
-				fileList: [],
-				compId: localStorage.getItem('ws-pf_compId'),
-				pickerBeginDateBefore: {
-					disabledDate: (time) => {
-						return time.getTime() > Date.now()
-					},
-				},
-				accessoryTFs: false,
-				taskTypeList: [{
-						value: '未完成',
-						type: 1
-					},
-					{
-						value: '已完成',
-						type: 2
-					},
-					{
-						value: '全部合同',
-						type: ''
-					},
-				],
-				pickerOptions: {
-					shortcuts: [{
-							text: '本周',
-							onClick(picker) {
-								const end = new Date()
-								const start = new Date()
-								var thisDay = start.getDay()
-								var thisDate = start.getDate()
-								if (thisDay != 0) {
-									start.setDate(thisDate - thisDay)
-								}
-								picker.$emit('pick', [start, end])
-							},
-						},
-						{
-							text: '本月',
-							onClick(picker) {
-								const end = new Date()
-								const start = new Date()
-								start.setDate(1)
-								picker.$emit('pick', [start, end])
-							},
-						},
-						{
-							text: '本季度',
-							onClick(picker) {
-								var oDate = new Date()
-
-								var thisYear = oDate.getFullYear()
-								var thisMonth = oDate.getMonth() + 1
-
-								var n = Math.ceil(thisMonth / 3) // 季度
-
-								var Month = n * 3 - 1
-
-								var start = new Date(thisYear, Month - 2, 1)
-								var end = new Date()
-
-								picker.$emit('pick', [start, end])
-							},
-						},
-					],
-				},
-				value1: '',
-				value2: '',
-			}
-		},
-		activated() {
-			//cg.viewBudget
-			//cg.viewSpareMoney
-			// this.getVesselData();
-			this.getList()
-			this.showType = this.isShow
-		},
-		methods: {
-		onChange () {
-			this.$refs.upload
-				.handleSaveBill()
-				.then(async response => {
-				this.deptBudgetList.addressUrl = response
-				this.deptBudgetList.id=this.id
-				this.deptBudgetList.flag=1
-				 editInfo(this.deptBudgetList)
-				.toPromise()
-				.then((response) => {
-					this.accessoryTFs = false
-					this.$message.success('上传成功')
-					this.getList()
-				})
-				})
-				.catch(res => {
-				EventBus.$emit('error', (JSON.parse(res) || {}).message)
-				this.$refs.upload.clearFiles()
-				})
-			},
-			dateFormat(fmt, date) {
-				let ret
-				const opt = {
-					'Y+': date.getFullYear().toString(), // 年
-					'm+': (date.getMonth() + 1).toString(), // 月
-					'd+': date.getDate().toString(), // 日
-					'H+': date.getHours().toString(), // 时
-					// "M+": date.getMinutes().toString(),         // 分
-					// "S+": date.getSeconds().toString()          // 秒
-					// 有其他格式化字符需求可以继续添加，必须转化成字符串
-				}
-				for (let k in opt) {
-					ret = new RegExp('(' + k + ')').exec(fmt)
-					if (ret) {
-						fmt = fmt.replace(
-							ret[1],
-							ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
-						)
-					}
-				}
-				return fmt
-			},
-
-			handleClose() {
-				this.dialogViewSpareMoney = false
-			},
-			handleClose1() {
-				this.accesscard = false
-			},
-			handleSizeChange(val) {
-				console.log(`每页 ${val} 条`)
-				this.pageSize = val
-				this.getList()
-			},
-			handleCurrentChange(val) {
-				this.currentPage = val
-				console.log(`当前页: ${val}`)
-				this.getList()
-			},
-			getList() {
-				getList({
-						compId: localStorage.getItem('ws-pf_compId'),
-						contractType: this.contractType,
-						goodsType: this.goodsType,
-						currentPage: this.currentPage,
-						pageSize: this.pageSize,
-						searchType: this.searchType,
-						searchKeyWord: this.searchKeyWord,
-						startDate: this.startDate,
-						endDate: this.endDate,
-						contrPage: this.contrPage,
-					})
-					.toPromise()
-					.then((response) => {
-						for (var i = 0; i < response.records.length; i++) {
-							if (response.records[i].addressUrl != null && response.records[i].addressUrl != '') {
-								response.records[i].addressUrlArray =
-									response.records[i].addressUrl.split(',')
-							} else {
-								response.records[i].addressUrlArray = []
-							}
-						}
-						this.deptCircularPage.currentPage = response.current
-						this.deptCircularPage.pageSize = response.size
-						this.deptBudgetTotal = response.total
-						this.contractList = response
-						for (var i = 0; i < response.records.length; i++) {
-							var arr = new Array()
-							this.addressUrls[i] = new Array()
-							if (this.contractList.records[i].addressUrl != null) {
-								arr = this.contractList.records[i].addressUrl.split(',')
-								this.addressUrls[i] = arr
-							}
-							this.contractList.records[i].basisPrice = '+' + this.contractList.records[i].basisPrice
-						}
-					})
-			},
-			// 上传附件
-			uploadSuccess(data, files, url) {
-				console.log(data, files, url)
-
-				// this.deptBudgetList.
-				// this.formData.append('files', files)
-				// this.feedbackObj.uploadNameAttachment = data.appendixName
-				// this.feedbackObj.pathUploadAttachment = data.appendixPath
-				// // this.newAppendixs = files
-				// this.onChangeFlag = true
-			},
-			editClick(row) {
-				var status = ''
-				if (row.status == '待执行' || row.status == '已完成') {
-					status = '执行中'
-				} else if (row.status == '执行中') {
-					status = '已完成'
-				}
-				this.$confirm(`是否将状态改为${status}`, '提示', {
-						confirmButtonText: '确定',
-						cancelButtonText: '取消',
-						type: 'warning',
-					})
-					.then(() => {
-						editstatus({
-								id: row.id
-							})
-							.toPromise()
-							.then((response) => {
-								this.$notify.success({
-									title: '成功',
-									message: '状态修改成功',
-								})
-								this.getList()
-							})
-							.catch((response) => {
-								// EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-							})
-					})
-					.catch(() => {
-						return false
-					})
-			},
-			selecttaskType(e) {
-				for (var i = 0; i < this.taskTypeList.length; i++) {
-					if (this.taskTypeList[i].value == e) {
-						this.searchType = this.taskTypeList[i].type
-					}
-				}
-			},
-			fujian(row) {
-				this.id=row.id
-				this.accessoryTFs = true
-				this.appendixIdss = row.addressUrl
-			},
-			handleExamine(row) {
-				console.log(row)
-				this.$router.push({
-					name: 'futuresSalesContractExamine',
-					query: {
-						id: row.id,
-						status: row.status
-					},
-				})
-			},
-			handleAdd() {
-				this.$router.push({
-					path: 'futuresSalesContractAdd'
-				})
-			},
-			handleEdit(row) {
-				this.$router.push({
-					name: 'futuresSalesContractEdit',
-					query: {
-						id: row.id
-					},
-				})
-			},
-			// 关闭 dialog时 处理文件url 初始化upload组件
-			handleCloe() {
-				this.dialogViewSpareMoney = false
-			},
-			history(row) {
-				console.log(row)
-				billoperatehis({
-						id: row.id
-					})
-					.toPromise()
-					.then((response) => {
-						this.historyList = response
-					})
-			},
-			find() {
-				if (this.value2) {
-					this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
-					this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
-				} else {
-					this.startDate = ''
-					this.endDate = ''
-				}
-				this.currentPage = 1
-				this.getList()
-			},
-			async exportlist() {
-				const {
-					data
-				} = await export1({
-					compId: localStorage.getItem('ws-pf_compId'),
-					contractType: this.contractType,
-					goodsType: this.goodsType,
-					currentPage: this.currentPage,
-					pageSize: this.pageSize,
-					searchType: this.searchType,
-					searchKeyWord: this.searchKeyWord,
-					startDate: this.startDate,
-					endDate: this.endDate,
-				}, {}, {
-					responseType: 'blob'
-				}).toPromise()
-				downloadFile({
-					res: data,
-					fileName: `${
+  import {
+    getList,
+    export1,
+    editstatus,
+    billoperatehis,
+    deletecontract,
+    editInfo
+  } from '@/model/contarct/index'
+  import {
+    downloadFile
+  } from '@/utils/batchDown'
+  import Pagination from '@/components/Pagination'
+  import WsUpload from '@/components/WsUpload'
+  import {
+    dayjs,
+    EventBus
+  } from 'base-core-lib'
+  export default {
+    name: 'viewSpareMoney',
+    components: {
+      WsUpload,
+      Pagination,
+    },
+    watch: {
+      vesselId(val) {
+        this.getList()
+      },
+      isShow(val) {
+        this.showType = val
+      },
+    },
+    data() {
+      return {
+        //弹出框
+        dialogViewSpareMoney: false,
+        dialogApproveFormVisible: false,
+        // 船舶类型
+        monetaryKey: null,
+        // 表格显示数据
+        tableDate: [],
+        size: 10,
+        id: '',
+        // 是否显示
+        showType: true,
+        // 年
+        year: '',
+        deliver_type: 1,
+        deptBudgetTotal: 0,
+        currentPage: 1,
+        pageSize: 10,
+        appendixIdsAdd: '',
+        searchType: 1,
+        searchTypeText: '未完成',
+        searchKeyWord: '',
+        contractType: 1,
+        goodsType: 2,
+        startDate: null,
+        endDate: null,
+        addressUrls: [],
+        accessurl: '',
+        accesscard: false,
+        // 提交类型
+        submitType: true,
+        deptCircularPage: {},
+        date: {
+          year: dayjs().format('YYYY'),
+          month: dayjs().format('MM'),
+        },
+        contractList: [],
+        deptBudgetList: {},
+        historyList: [],
+        appendixIdss: [],
+        fileList: [],
+        compId: localStorage.getItem('ws-pf_compId'),
+        pickerBeginDateBefore: {
+          disabledDate: (time) => {
+            return time.getTime() > Date.now()
+          },
+        },
+        accessoryTFs: false,
+        taskTypeList: [{
+            value: '未完成',
+            type: 1
+          },
+          {
+            value: '已完成',
+            type: 2
+          },
+          {
+            value: '全部合同',
+            type: ''
+          },
+        ],
+        pickerOptions: {
+          shortcuts: [{
+              text: '本周',
+              onClick(picker) {
+                const end = new Date()
+                const start = new Date()
+                var thisDay = start.getDay()
+                var thisDate = start.getDate()
+                if (thisDay != 0) {
+                  start.setDate(thisDate - thisDay)
+                }
+                picker.$emit('pick', [start, end])
+              },
+            },
+            {
+              text: '本月',
+              onClick(picker) {
+                const end = new Date()
+                const start = new Date()
+                start.setDate(1)
+                picker.$emit('pick', [start, end])
+              },
+            },
+            {
+              text: '本季度',
+              onClick(picker) {
+                var oDate = new Date()
+
+                var thisYear = oDate.getFullYear()
+                var thisMonth = oDate.getMonth() + 1
+
+                var n = Math.ceil(thisMonth / 3) // 季度
+
+                var Month = n * 3 - 1
+
+                var start = new Date(thisYear, Month - 2, 1)
+                var end = new Date()
+
+                picker.$emit('pick', [start, end])
+              },
+            },
+          ],
+        },
+        value1: '',
+        value2: '',
+      }
+    },
+    activated() {
+      //cg.viewBudget
+      //cg.viewSpareMoney
+      // this.getVesselData();
+      this.getList()
+      this.showType = this.isShow
+    },
+    methods: {
+      onChange() {
+        this.$refs.upload
+          .handleSaveBill()
+          .then(async response => {
+            this.deptBudgetList.addressUrl = response
+            this.deptBudgetList.id = this.id
+            this.deptBudgetList.flag = 1
+            editInfo(this.deptBudgetList)
+              .toPromise()
+              .then((response) => {
+                this.accessoryTFs = false
+                this.$message.success('上传成功')
+                this.getList()
+              })
+          })
+          .catch(res => {
+            EventBus.$emit('error', (JSON.parse(res) || {}).message)
+            this.$refs.upload.clearFiles()
+          })
+      },
+      dateFormat(fmt, date) {
+        let ret
+        const opt = {
+          'Y+': date.getFullYear().toString(), // 年
+          'm+': (date.getMonth() + 1).toString(), // 月
+          'd+': date.getDate().toString(), // 日
+          'H+': date.getHours().toString(), // 时
+          // "M+": date.getMinutes().toString(),         // 分
+          // "S+": date.getSeconds().toString()          // 秒
+          // 有其他格式化字符需求可以继续添加，必须转化成字符串
+        }
+        for (let k in opt) {
+          ret = new RegExp('(' + k + ')').exec(fmt)
+          if (ret) {
+            fmt = fmt.replace(
+              ret[1],
+              ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
+            )
+          }
+        }
+        return fmt
+      },
+
+      handleClose() {
+        this.dialogViewSpareMoney = false
+      },
+      handleClose1() {
+        this.accesscard = false
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+      getList() {
+        getList({
+            compId: localStorage.getItem('ws-pf_compId'),
+            contractType: this.contractType,
+            goodsType: this.goodsType,
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            searchType: this.searchType,
+            searchKeyWord: this.searchKeyWord,
+            startDate: this.startDate,
+            endDate: this.endDate,
+            contrPage: this.contrPage,
+          })
+          .toPromise()
+          .then((response) => {
+            for (var i = 0; i < response.records.length; i++) {
+              if (response.records[i].addressUrl != null && response.records[i].addressUrl != '') {
+                response.records[i].addressUrlArray =
+                  response.records[i].addressUrl.split(',')
+              } else {
+                response.records[i].addressUrlArray = []
+              }
+            }
+            this.deptCircularPage.currentPage = response.current
+            this.deptCircularPage.pageSize = response.size
+            this.deptBudgetTotal = response.total
+            this.contractList = response
+            for (var i = 0; i < response.records.length; i++) {
+              var arr = new Array()
+              this.addressUrls[i] = new Array()
+              if (this.contractList.records[i].addressUrl != null) {
+                arr = this.contractList.records[i].addressUrl.split(',')
+                this.addressUrls[i] = arr
+              }
+              this.contractList.records[i].basisPrice = '+' + this.contractList.records[i].basisPrice
+            }
+          })
+      },
+      // 上传附件
+      uploadSuccess(data, files, url) {
+        console.log(data, files, url)
+
+        // this.deptBudgetList.
+        // this.formData.append('files', files)
+        // this.feedbackObj.uploadNameAttachment = data.appendixName
+        // this.feedbackObj.pathUploadAttachment = data.appendixPath
+        // // this.newAppendixs = files
+        // this.onChangeFlag = true
+      },
+      editClick(row) {
+        var status = ''
+        if (row.status == '待执行' || row.status == '已完成') {
+          status = '执行中'
+        } else if (row.status == '执行中') {
+          status = '已完成'
+        }
+        this.$confirm(`是否将状态改为${status}`, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            editstatus({
+                id: row.id
+              })
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '状态修改成功',
+                })
+                this.getList()
+              })
+              .catch((response) => {
+                // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              })
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      selecttaskType(e) {
+        for (var i = 0; i < this.taskTypeList.length; i++) {
+          if (this.taskTypeList[i].value == e) {
+            this.searchType = this.taskTypeList[i].type
+            this.find()
+          }
+        }
+      },
+      fujian(row) {
+        this.id = row.id
+        this.accessoryTFs = true
+        this.appendixIdss = row.addressUrl
+      },
+      handleExamine(row) {
+        console.log(row)
+        this.$router.push({
+          name: 'futuresSalesContractExamine',
+          query: {
+            id: row.id,
+            status: row.status
+          },
+        })
+      },
+      handleAdd() {
+        this.$router.push({
+          path: 'futuresSalesContractAdd'
+        })
+      },
+      handleEdit(row) {
+        this.$router.push({
+          name: 'futuresSalesContractEdit',
+          query: {
+            id: row.id
+          },
+        })
+      },
+      // 关闭 dialog时 处理文件url 初始化upload组件
+      handleCloe() {
+        this.dialogViewSpareMoney = false
+      },
+      history(row) {
+        console.log(row)
+        billoperatehis({
+            id: row.id
+          })
+          .toPromise()
+          .then((response) => {
+            this.historyList = response
+          })
+      },
+      find() {
+        if (this.value2) {
+          this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
+          this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
+        } else {
+          this.startDate = ''
+          this.endDate = ''
+        }
+        this.currentPage = 1
+        this.getList()
+      },
+      async exportlist() {
+        const {
+          data
+        } = await export1({
+          compId: localStorage.getItem('ws-pf_compId'),
+          contractType: this.contractType,
+          goodsType: this.goodsType,
+          currentPage: this.currentPage,
+          pageSize: this.pageSize,
+          searchType: this.searchType,
+          searchKeyWord: this.searchKeyWord,
+          startDate: this.startDate,
+          endDate: this.endDate,
+        }, {}, {
+          responseType: 'blob'
+        }).toPromise()
+        downloadFile({
+          res: data,
+          fileName: `${
           this.date.year + (this.date.month ? `-${this.date.month}` : '')
         }_采购合同`,
-					type: 'xls',
-				})
-			},
-			// deletecontract(){},
-			//删除
-			handleDelete(row) {
-				var text = ''
-				//   if (row.deliverType == 1) {
-				//     text =
-				//       '删除该合同将同时永久删除合同对应的临时仓库相关数据，是否确定删除？'
-				//   } else {
-				//     text = '合同删除后不可恢复，是否继续删除？'
-				//   }
-				this.$confirm('合同删除后不可恢复，是否继续删除？', '提示', {
-						confirmButtonText: '确定',
-						cancelButtonText: '取消',
-						type: 'warning',
-					})
-					.then(() => {
-						deletecontract({
-								id: row.id
-							})
-							.toPromise()
-							.then((response) => {
-								this.$notify.success({
-									title: '成功',
-									message: '删除成功',
-								})
-								this.getList()
-							})
-							.catch((response) => {})
-					})
-					.catch(() => {
-						return false
-					})
-			},
-		},
-	}
+          type: 'xls',
+        })
+      },
+      // deletecontract(){},
+      //删除
+      handleDelete(row) {
+        var text = ''
+        //   if (row.deliverType == 1) {
+        //     text =
+        //       '删除该合同将同时永久删除合同对应的临时仓库相关数据，是否确定删除？'
+        //   } else {
+        //     text = '合同删除后不可恢复，是否继续删除？'
+        //   }
+        this.$confirm('合同删除后不可恢复，是否继续删除？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            deletecontract({
+                id: row.id
+              })
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '删除成功',
+                })
+                this.getList()
+              })
+              .catch((response) => {})
+          })
+          .catch(() => {
+            return false
+          })
+      },
+    },
+  }
 </script>
 <style lang="scss" scoped>
-	.vertical-text-left {
-		width: 62px;
-		text-align: right;
-	}
-
-	.flex {
-		display: flex;
-	}
-
-	.el-range-editor.el-input__inner {
-		margin-left: 10px;
-	}
-
-	/deep/.base_header_layout .grid-content.right .find.el-button--primary {
-		width: 30px;
-		margin-left: -10px;
-		border-top-left-radius: 0px;
-		border-bottom-left-radius: 0px;
-	}
-
-	.el-button--primary {
-		background-color: #5878e8;
-		border-color: #5878e8;
-	}
-
-	.el-button--default {
-		border: 1px solid #5473e8;
-		color: #5473e8;
-	}
-
-	.warning {
-		width: 100%;
-		height: 2px;
-		background: red;
-	}
-
-	.executory,
-	.inExecution,
-	.done {
-		width: 6px;
-		height: 6px;
-		display: inline-block;
-		border-radius: 50%;
-		position: relative;
-		top: -1px;
-	}
-
-	.executory {
-		background: #ff9f24;
-	}
-
-	.inExecution {
-		background: #5878e8;
-	}
-
-	.done {
-		background: #50cad4;
-	}
-
-	.top-grade {
-		background: linear-gradient(90deg, #5678e9, #7993f6);
-		color: #fff;
-		padding: 3px;
-		border-radius: 2px;
-	}
-
-	.second-class {
-		background: linear-gradient(90deg, #50cdd9, #82e2ea);
-		color: #fff;
-		padding: 3px;
-		border-radius: 2px;
-	}
-
-	.third-class {
-		background: linear-gradient(90deg, #ffa735, #ffbf70);
-		color: #fff;
-		padding: 3px;
-		border-radius: 2px;
-	}
-
-	.substandard {
-		background: linear-gradient(90deg, #b2b4bb, #ced0d5);
-		color: #fff;
-		padding: 3px;
-		border-radius: 2px;
-	}
-
-	.wrap {
-		width: 400px;
-		position: absolute;
-		top: 131px;
-		left: 794px;
-		transform-origin: right center;
-		z-index: 2005;
-	}
-
-	.vertical-line {
-		height: 64px;
-		border-left: 2px solid #e9ecf7;
-		margin-left: 4px;
-		padding: 0 3px;
-		// border-image: -webkit-linear-gradient(#00eba7, #08b8e6) 30 30;
-		// border-image: -moz-linear-gradient(#00eba7, #08b8e6) 30 30;
-		// border-image: linear-gradient(#00eba7, #08b8e6) 30 30;
-	}
-
-	.el-pagination {
-		padding: 10px 15px;
-		margin-bottom: 0;
-		text-align: center;
-	}
-
-	/deep/.el-pager li.active {
-		color: #5878e8;
-		cursor: default;
-	}
-
-	/deep/.el-pager li:hover {
-		color: #5878e8;
-		cursor: default;
-	}
-
-	.vertical-circle {
-		width: 10px;
-		height: 10px;
-		border: 2px solid #5878e8;
-		background-color: #ffffff;
-		-webkit-border-radius: 100px;
-	}
-
-	.vertical-circle:first-child {
-		color: red;
-	}
-
-	.vertical-text {
-		margin: 0 10px;
-		color: #8890b1;
-		font-size: 12px;
-		margin-top: -4px;
-	}
-
-	/deep/.el-table .el-table__header .cell,
-	/deep/.el-table .el-table__body .cell {
-		text-align: center;
-	}
-
-	.typeselect {
-		width: 500px;
-	}
-
-	.padding-xs {
-		padding: 15px;
-		text-align: right;
-	}
-
-	.clearfix:after {
-		content: '';
-		display: block;
-		clear: both;
-	}
-
-	.el-table {
-		font-size: 16px;
-	}
-
-	.taskType {
-		width: 100%;
-		background-color: #fff;
-		margin-top: 2px;
-		margin-bottom: 10px;
-		list-style: none;
-
-		// padding-bottom: 20px;
-		li {
-			float: left;
-			border: 1px solid #6ea0f3;
-			border-radius: 5px;
-			max-width: 190px;
-			padding: 0 5px;
-			text-align: center;
-			margin: 10px 20px;
-			cursor: pointer;
-			font-size: 14px;
-
-			p {
-				margin: 8px 0px;
-
-				span {
-					color: #e74c3c;
-				}
-			}
-		}
-
-		li:hover {
-			background-color: #e4eeff;
-			color: #1d6ced;
-		}
-	}
-
-	.el-date-editor--date {
-		margin: 0 10px;
-	}
-
-	.findValue {
-		margin: 0 10px;
-	}
-
-	/deep/.findValue .el-input__inner {
-		border-top-right-radius: 0px;
-		border-bottom-right-radius: 0px;
-	}
-
-	.button-container {
-		display: flex;
-		flex-wrap: nowrap;
-		justify-content: space-between;
-		align-items: center;
-		background-color: #fff;
-		width: 100%;
-		height: 50px;
-		padding: 0 10px;
-
-		&>div {
-			margin-left: 10px;
-			display: flex;
-			flex-wrap: nowrap;
-			flex-direction: row;
-
-			&>span {
-				line-height: 50px;
-			}
-		}
-
-		/deep/.auditFlow-box {
-			position: unset;
-			margin-left: 10px;
-
-			&/deep/.auditFlow-icon {
-				width: auto;
-				padding-right: 30px;
-			}
-
-			&/deep/.auditFlow-main {
-				position: absolute;
-			}
-		}
-	}
-
-	.box-app {
-		display: inline-block;
-		float: left;
-		margin-left: 30px;
-		line-height: 50px;
-	}
-
-	/deep/.el-dialog {
-		.el-form-item {
-			margin-bottom: 0 !important;
-
-			.el-input--medium {
-				textarea {
-					min-height: 100px !important;
-				}
-			}
-		}
-	}
-
-	.collapse-bottom {
-		margin-bottom: 20px;
-	}
-
-	.input-main .textarea .el-textarea__inner {
-		width: 100%;
-		z-index: 1;
-	}
-
-	/*.crt-main .textarea /deep/ .el-form-item__label {*/
-	/*  height: 82px;*/
-	/*}*/
-	// 控制select为只读的时候显示样式
-
-	.hide-sel {
-		.el-input__inner {
-			border: 0px;
-		}
-
-		.el-icon-arrow-up {
-			display: none;
-		}
-
-		.el-textarea__inner {
-			background-color: #fff !important;
-			border: 0;
-		}
-
-		.el-date-editor {
-			i {
-				display: none;
-			}
-		}
-
-		.is-disabled {
-			.el-input__inner:hover {
-				background-color: #fff !important;
-				border: 0;
-			}
-
-			color: #606266;
-
-			.el-input__inner {
-				background-color: #fff !important;
-				border: 0;
-				color: #606266;
-			}
-
-			.el-textarea__inner {
-				background-color: #fff !important;
-				border: 0;
-				color: #606266;
-			}
-		}
-	}
-
-	// 控制select为只读的时候显示样式
-	/deep/.ws-class-table-col {
-		height: auto;
-		padding: 0px 2px;
-
-		/deep/.el-input__inner {
-			padding: 0px 2px;
-		}
-	}
-
-	/deep/.is-disabled {
-		.el-input__prefix,
-		.el-input__suffix {
-			display: none;
-		}
-
-		.el-input__inner {
-			background-color: #fff;
-			border-color: #fff !important;
-			color: #000 !important;
-			font-size: 14px;
-			cursor: text;
-			padding: 0 !important;
-		}
-	}
-
-	/deep/.typeselect .el-input__inner {
-		color: #8890b1;
-	}
+  .vertical-text-left {
+    width: 62px;
+    text-align: right;
+  }
+
+  .flex {
+    display: flex;
+  }
+
+  .el-range-editor.el-input__inner {
+    margin-left: 10px;
+  }
+
+  /deep/.base_header_layout .grid-content.right .find.el-button--primary {
+    width: 30px;
+    margin-left: -10px;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+  }
+
+  .el-button--default {
+    border: 1px solid #5473e8;
+    color: #5473e8;
+  }
+
+  .warning {
+    width: 100%;
+    height: 2px;
+    background: red;
+  }
+
+  .executory,
+  .inExecution,
+  .done {
+    width: 6px;
+    height: 6px;
+    display: inline-block;
+    border-radius: 50%;
+    position: relative;
+    top: -1px;
+  }
+
+  .executory {
+    background: #ff9f24;
+  }
+
+  .inExecution {
+    background: #5878e8;
+  }
+
+  .done {
+    background: #50cad4;
+  }
+
+  .top-grade {
+    background: linear-gradient(90deg, #5678e9, #7993f6);
+    color: #fff;
+    padding: 3px;
+    border-radius: 2px;
+  }
+
+  .second-class {
+    background: linear-gradient(90deg, #50cdd9, #82e2ea);
+    color: #fff;
+    padding: 3px;
+    border-radius: 2px;
+  }
+
+  .third-class {
+    background: linear-gradient(90deg, #ffa735, #ffbf70);
+    color: #fff;
+    padding: 3px;
+    border-radius: 2px;
+  }
+
+  .substandard {
+    background: linear-gradient(90deg, #b2b4bb, #ced0d5);
+    color: #fff;
+    padding: 3px;
+    border-radius: 2px;
+  }
+
+  .wrap {
+    width: 400px;
+    position: absolute;
+    top: 131px;
+    left: 794px;
+    transform-origin: right center;
+    z-index: 2005;
+  }
+
+  .vertical-line {
+    height: 64px;
+    border-left: 2px solid #e9ecf7;
+    margin-left: 4px;
+    padding: 0 3px;
+    // border-image: -webkit-linear-gradient(#00eba7, #08b8e6) 30 30;
+    // border-image: -moz-linear-gradient(#00eba7, #08b8e6) 30 30;
+    // border-image: linear-gradient(#00eba7, #08b8e6) 30 30;
+  }
+
+  .el-pagination {
+    padding: 10px 15px;
+    margin-bottom: 0;
+    text-align: center;
+  }
+
+  /deep/.el-pager li.active {
+    color: #5878e8;
+    cursor: default;
+  }
+
+  /deep/.el-pager li:hover {
+    color: #5878e8;
+    cursor: default;
+  }
+
+  .vertical-circle {
+    width: 10px;
+    height: 10px;
+    border: 2px solid #5878e8;
+    background-color: #ffffff;
+    -webkit-border-radius: 100px;
+  }
+
+  .vertical-circle:first-child {
+    color: red;
+  }
+
+  .vertical-text {
+    margin: 0 10px;
+    color: #8890b1;
+    font-size: 12px;
+    margin-top: -4px;
+  }
+
+  /deep/.el-table .el-table__header .cell,
+  /deep/.el-table .el-table__body .cell {
+    text-align: center;
+  }
+
+  .typeselect {
+    width: 500px;
+  }
+
+  .padding-xs {
+    padding: 15px;
+    text-align: right;
+  }
+
+  .clearfix:after {
+    content: '';
+    display: block;
+    clear: both;
+  }
+
+  .el-table {
+    font-size: 16px;
+  }
+
+  .taskType {
+    width: 100%;
+    background-color: #fff;
+    margin-top: 2px;
+    margin-bottom: 10px;
+    list-style: none;
+
+    // padding-bottom: 20px;
+    li {
+      float: left;
+      border: 1px solid #6ea0f3;
+      border-radius: 5px;
+      max-width: 190px;
+      padding: 0 5px;
+      text-align: center;
+      margin: 10px 20px;
+      cursor: pointer;
+      font-size: 14px;
+
+      p {
+        margin: 8px 0px;
+
+        span {
+          color: #e74c3c;
+        }
+      }
+    }
+
+    li:hover {
+      background-color: #e4eeff;
+      color: #1d6ced;
+    }
+  }
+
+  .el-date-editor--date {
+    margin: 0 10px;
+  }
+
+  .findValue {
+    margin: 0 10px;
+  }
+
+  /deep/.findValue .el-input__inner {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
+
+  .button-container {
+    display: flex;
+    flex-wrap: nowrap;
+    justify-content: space-between;
+    align-items: center;
+    background-color: #fff;
+    width: 100%;
+    height: 50px;
+    padding: 0 10px;
+
+    &>div {
+      margin-left: 10px;
+      display: flex;
+      flex-wrap: nowrap;
+      flex-direction: row;
+
+      &>span {
+        line-height: 50px;
+      }
+    }
+
+    /deep/.auditFlow-box {
+      position: unset;
+      margin-left: 10px;
+
+      &/deep/.auditFlow-icon {
+        width: auto;
+        padding-right: 30px;
+      }
+
+      &/deep/.auditFlow-main {
+        position: absolute;
+      }
+    }
+  }
+
+  .box-app {
+    display: inline-block;
+    float: left;
+    margin-left: 30px;
+    line-height: 50px;
+  }
+
+  /deep/.el-dialog {
+    .el-form-item {
+      margin-bottom: 0 !important;
+
+      .el-input--medium {
+        textarea {
+          min-height: 100px !important;
+        }
+      }
+    }
+  }
+
+  .collapse-bottom {
+    margin-bottom: 20px;
+  }
+
+  .input-main .textarea .el-textarea__inner {
+    width: 100%;
+    z-index: 1;
+  }
+
+  /*.crt-main .textarea /deep/ .el-form-item__label {*/
+  /*  height: 82px;*/
+  /*}*/
+  // 控制select为只读的时候显示样式
+
+  .hide-sel {
+    .el-input__inner {
+      border: 0px;
+    }
+
+    .el-icon-arrow-up {
+      display: none;
+    }
+
+    .el-textarea__inner {
+      background-color: #fff !important;
+      border: 0;
+    }
+
+    .el-date-editor {
+      i {
+        display: none;
+      }
+    }
+
+    .is-disabled {
+      .el-input__inner:hover {
+        background-color: #fff !important;
+        border: 0;
+      }
+
+      color: #606266;
+
+      .el-input__inner {
+        background-color: #fff !important;
+        border: 0;
+        color: #606266;
+      }
+
+      .el-textarea__inner {
+        background-color: #fff !important;
+        border: 0;
+        color: #606266;
+      }
+    }
+  }
+
+  // 控制select为只读的时候显示样式
+  /deep/.ws-class-table-col {
+    height: auto;
+    padding: 0px 2px;
+
+    /deep/.el-input__inner {
+      padding: 0px 2px;
+    }
+  }
+
+  /deep/.is-disabled {
+    .el-input__prefix,
+    .el-input__suffix {
+      display: none;
+    }
+
+    .el-input__inner {
+      background-color: #fff;
+      border-color: #fff !important;
+      color: #000 !important;
+      font-size: 14px;
+      cursor: text;
+      padding: 0 !important;
+    }
+  }
+
+  /deep/.typeselect .el-input__inner {
+    color: #8890b1;
+  }
 </style>

src/views/contractManagement/purchaseContract.vue

@@ -30,7 +30,8 @@
             " src="../../../public/img/sousuo.png" alt="" /></ws-button>
       </template>
     </BaseHeaderLayout>
-    <el-table class="wenzi" :data="contractList.records" style="width: 100%; margin-top: 10px" height="calc(100% - 105px)">
+    <el-table class="wenzi" :data="contractList.records" style="width: 100%; margin-top: 10px"
+      height="calc(100% - 105px)">
       <el-table-column type="index" label="序号">
         <template scope="scope">
           <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
@@ -132,7 +133,7 @@
             " alt="" />
           <div v-if="
               (scope.row.approveStatus != '待决策人审核' &&
-                !scope.row.approveStatus) 
+                !scope.row.approveStatus)
             " 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="
@@ -456,6 +457,7 @@
         for (var i = 0; i < this.taskTypeList.length; i++) {
           if (this.taskTypeList[i].value == e) {
             this.searchType = this.taskTypeList[i].type
+            this.find()
           }
         }
       },

src/views/contractManagement/salesContract.vue

@@ -32,7 +32,8 @@
             " src="../../../public/img/sousuo.png" alt="" /></ws-button>
       </template>
     </BaseHeaderLayout>
-    <el-table class="wenzi" :data="contractList.records" style="width: 100%; margin-top: 10px" height="calc(100% - 110px)">
+    <el-table class="wenzi" :data="contractList.records" style="width: 100%; margin-top: 10px"
+      height="calc(100% - 110px)">
       <el-table-column type="index" label="序号">
         <template scope="scope">
           <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
@@ -481,6 +482,7 @@
         for (var i = 0; i < this.taskTypeList.length; i++) {
           if (this.taskTypeList[i].value == e) {
             this.searchType = this.taskTypeList[i].type
+            this.find()
           }
         }
       },

src/views/financialManagement/collectionManagementList.vue

@@ -814,6 +814,7 @@
         for (var i = 0; i < this.taskTypeList.length; i++) {
           if (this.taskTypeList[i].value == e) {
             this.searchType = this.taskTypeList[i].type
+            this.find()
           }
         }
         this.getList()

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -218,6 +218,7 @@
               } else {
                 this.checked = false
               }
+              localStorage.setItem('houseSelfCollect_house', JSON.stringify(this.warehouseList[0]))
             }
 
             // this.tableData = response.records
@@ -248,14 +249,13 @@
           })
           .toPromise()
           .then(response => {
-            let _data = localStorage.getItem('houseSelfCollect_house1')
-            _data = JSON.parse(localStorage.getItem('houseSelfCollect_house1'))
+            let _data = JSON.parse(localStorage.getItem('houseSelfCollect_house'))
             if (_data.allowEdit == 0) {
               _data.allowEdit = 1
             } else {
               _data.allowEdit = 0
             }
-            localStorage.setItem('houseSelfCollect_house1', JSON.stringify(_data))
+            localStorage.setItem('houseSelfCollect_house', JSON.stringify(_data))
             this.getWarehouseSelf()
             // this.tableData = response.records
           })

src/views/houseSelfCollect/paymentManagement.vue

@@ -335,7 +335,8 @@
     settlementEdit
   } from '@/model/houseSelfCollect/index'
   import {
-    posthandle
+    posthandle,
+    postqueryhandle
   } from '@/model/purchasingManagement/index'
   import paymentPrint from './component/paymentPrint.vue'
   import {
@@ -364,6 +365,7 @@
         customerlist: {
           payeeAddressUrls: [],
         },
+        
         ruleForm: {
           type: [
             '打印身份证（正反面）',
@@ -1235,6 +1237,8 @@
               })
               .toPromise()
               .then((response) => {
+                // postqueryhandle({workflowId:item.workflowId}).toPromise()
+                // .then((response) => {
                 this.audit(
                   this.modification[index + 1],
                   index + 1,
@@ -1242,6 +1246,7 @@
                   status2,
                   reason
                 )
+              // })
               })
               .catch((req) => {
                 this.$message.warning(req.message)

src/views/newTask/listPage.vue

@@ -166,6 +166,7 @@ import {
   noticeTasks,
   noticeReminds,
   noticeOverdues,
+  gettaskInfo
 } from '@/model/indexRx'
 import { EventBus, formatDate, dayjs } from 'base-core-lib'
 import * as utils from '@/views/workNotification/utils/index.js'
@@ -384,12 +385,33 @@ export default {
     goPath (data) {
       if (data.businessCode === 'PURCHASE-MA-APPL-REMIND') {
         this.$router.push({ name: 'sparepartMa' })
+      }
+      if (data.businessType === 'TRANSPORTATION') {
+        var url=''
+        if(data.businessCode=='TRANSPORTATION-SETTLEMENT-REPORT'){
+          gettaskInfo({id:data.businessId}).toPromise().then((res)=>{
+            console.log(res.tranType)
+            if(res.tranType=='汽运'){
+              url = 'autoSettlementList'
+            }
+            if(res.tranType=='火运'){
+              url = 'huoyunList'
+            }
+            if(res.tranType=='船运'){
+              url = 'shippingList'
+            }
+            console.log(url)
+            this.$router.push({ name: url })
+          })
+        }
       } else {
         const url = utils.code2Url(
           data.businessType,
           data.businessCode,
           data.noticeTaskStatus,
-          this.typeShow
+          this.typeShow,
+          data.messageContent,
+          data.businessId
         )
         console.log(url)
         if (!url) {

src/views/outboundManagement/weighingManagement.vue

@@ -14,7 +14,6 @@
           <ws-option v-for="item in warehouseList" :key="item.value" :label="item.value" :value="item.value"
             style="color: #8890b1" />
         </ws-select>
-        <div></div>
         <ws-input class='findinput' @keyup.enter.native="find()" v-model="searchKeyWord" placeholder="可按合同编号、车牌号查找"
           clearable maxlength="500" type="input">
         </ws-input>
@@ -315,7 +314,9 @@
     border-top-left-radius: 0px;
     border-bottom-left-radius: 0px;
   }
-
+.findinput{
+  margin-left: 20px;
+}
   /deep/.base_header_layout .findinput input {
     border-top-right-radius: 0px;
     border-bottom-right-radius: 0px;

src/views/purchasingManagement/purchaseOrderList.vue

@@ -1536,6 +1536,7 @@
         for (var i = 0; i < this.taskTypeList.length; i++) {
           if (this.taskTypeList[i].value == e) {
             this.searchType = this.taskTypeList[i].type
+            this.find()
           }
         }
       },

src/views/salesManagement/salesPlanOrderList.vue

@@ -694,6 +694,7 @@
         for (var i = 0; i < this.searchTypeList.length; i++) {
           if (this.searchTypeList[i].value == e) {
             this.searchType = this.searchTypeList[i].type
+            this.find()
           }
         }
       },

src/views/statisticalReport/purchaseClosingCashierList.vue

@@ -395,19 +395,33 @@
                 }
               }, 0)
             } else {
-              sums[index] = '元'
+              sums[index] = '--'
             }
           } else {
             sums[index] = '--'
           }
         })
-        sums[sums.length - 5] = sums[sums.length - 5].toFixed(2)
-        sums[sums.length - 6] = sums[sums.length - 6].toFixed(2)
-        sums[sums.length - 7] = sums[sums.length - 7].toFixed(2)
-        sums[sums.length - 9] = sums[sums.length - 9].toFixed(2)
-        sums[sums.length - 10] = sums[sums.length - 10].toFixed(2)
-        sums[sums.length - 11] = sums[sums.length - 11].toFixed(2)
-        sums[sums.length - 15] = sums[sums.length - 15].toFixed(2)
+        if(typeof sums[sums.length - 5] =='number'){
+          sums[sums.length - 5] = sums[sums.length - 5].toFixed(2)
+        }
+        if(typeof sums[sums.length - 6] =='number'){
+          sums[sums.length - 6] = sums[sums.length - 6].toFixed(2)
+        }
+        if(typeof sums[sums.length - 7] =='number'){
+          sums[sums.length - 7] = sums[sums.length - 7].toFixed(2)
+        }
+        if(typeof sums[sums.length - 9] =='number'){
+          sums[sums.length - 9] = sums[sums.length - 9].toFixed(2)
+        }
+        if(typeof sums[sums.length - 10] =='number'){
+          sums[sums.length - 10] = sums[sums.length - 10].toFixed(2)
+        }
+        if(typeof sums[sums.length - 11] =='number'){
+          sums[sums.length - 11] = sums[sums.length - 11].toFixed(2)
+        }
+        if(typeof sums[sums.length - 15] =='number'){
+          sums[sums.length - 15] = sums[sums.length - 15].toFixed(2)
+        }
         return sums
       },
       //付款

src/views/statisticalReport/purchaseReceiptStatisticsList.vue

@@ -360,7 +360,7 @@
       }
     },
     activated() {
-      this.getList()
+      // this.getList()
       this.showType = this.isShow
     },
     methods: {
@@ -848,17 +848,28 @@
                 }
               }, 0)
             } else {
-              sums[index] = '元'
+              sums[index] = '--'
             }
           } else {
             sums[index] = '--'
           }
         })
-        sums[sums.length - 2] = sums[sums.length - 2].toFixed(2)
-        sums[sums.length - 9] = sums[sums.length - 9].toFixed(2)
-        sums[sums.length - 10] = sums[sums.length - 10].toFixed(2)
-        sums[sums.length - 11] = sums[sums.length - 11].toFixed(2)
-        sums[sums.length - 12] = sums[sums.length - 12].toFixed(2)
+        console.log(sums)
+        if(typeof sums[sums.length - 2] =='number'){
+          sums[sums.length - 2] = sums[sums.length - 2].toFixed(2)
+        }
+        if(typeof sums[sums.length - 9] =='number'){
+          sums[sums.length - 9] = sums[sums.length - 9].toFixed(2)
+        }
+        if(typeof sums[sums.length - 10] =='number'){
+          sums[sums.length - 10] = sums[sums.length - 10].toFixed(2)
+        }
+        if(typeof sums[sums.length - 11] =='number'){
+          sums[sums.length - 11] = sums[sums.length - 11].toFixed(2)
+        }
+        if(typeof sums[sums.length - 2] =='number'){
+          sums[sums.length - 12] = sums[sums.length - 12].toFixed(2)
+        }
         return sums
       },
       //成交

src/views/taskManagement/moveWarehouseTask.vue

@@ -22,80 +22,80 @@
         <!-- </div> -->
       </template>
     </BaseHeaderLayout>
-      <el-table class="wenzi" :data="gainList.records" style="width: 100%" height="calc(100% - 110px)">
-        <el-table-column type="index" label="序号">
-          <template scope="scope">
-            <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
-            <span v-else>{{ scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="moveTaskNo" label="移库任务编号"></el-table-column>
-        <el-table-column prop="warehouseName" label="发货库"> </el-table-column>
-        <el-table-column prop="warehouseNameIn" label="收货库">
-        </el-table-column>
-        <el-table-column prop="goodsName" label="货名"> </el-table-column>
-        <el-table-column prop="weight" label="重量（吨）"> </el-table-column>
-        <el-table-column prop="deliveryVolume" label="出库量（吨）">
-          <template slot-scope="scope">
-            {{scope.row.deliveryVolume> 0 ? Number(scope.row.deliveryVolume).toFixed(3):""}}
-          </template>
-        </el-table-column>
-        <el-table-column prop="storageVolume" label="入库量（吨）">
-          <template
-            slot-scope="scope">{{scope.row.storageVolume > 0 ? Number(scope.row.storageVolume).toFixed(3):""}}</template>
-        </el-table-column>
-        <el-table-column prop="stockReturnCount" label="退库量（吨）">
-          <template slot-scope="scope">
-            <el-popover placement="top" :width="160" trigger="hover" visible-arrow="false">
-              <template>
-                <span slot="reference">
-                  <!-- <span class="executory"> -->
-                  {{ scope.row.stockReturnCount }}
-                  <!-- </span>  -->
-                </span>
-              </template>
-              <div v-for="(item,index) in scope.row.inOutWarehouseTaskList" :key="index">
-                <span style="margin-left:6px;">{{ item.warehouseName }}</span>
-                <span style="margin-left:20px;">{{ item.weight }}吨</span>
-              </div>
-            </el-popover>
-          </template>
-        </el-table-column>
-        <el-table-column prop="transportLoss" label="运输损耗（吨）">
-          <template scope="scope">
-            <div v-show="scope.row.taskStatus == '已完成'">
-              {{ scope.row.weight - scope.row.weightIn - scope.row.stockReturnCount}}
+    <el-table class="wenzi" :data="gainList.records" style="width: 100%" height="calc(100% - 110px)">
+      <el-table-column type="index" label="序号">
+        <template scope="scope">
+          <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+          <span v-else>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="moveTaskNo" label="移库任务编号"></el-table-column>
+      <el-table-column prop="warehouseName" label="发货库"> </el-table-column>
+      <el-table-column prop="warehouseNameIn" label="收货库">
+      </el-table-column>
+      <el-table-column prop="goodsName" label="货名"> </el-table-column>
+      <el-table-column prop="weight" label="重量（吨）"> </el-table-column>
+      <el-table-column prop="deliveryVolume" label="出库量（吨）">
+        <template slot-scope="scope">
+          {{scope.row.deliveryVolume> 0 ? Number(scope.row.deliveryVolume).toFixed(3):""}}
+        </template>
+      </el-table-column>
+      <el-table-column prop="storageVolume" label="入库量（吨）">
+        <template
+          slot-scope="scope">{{scope.row.storageVolume > 0 ? Number(scope.row.storageVolume).toFixed(3):""}}</template>
+      </el-table-column>
+      <el-table-column prop="stockReturnCount" label="退库量（吨）">
+        <template slot-scope="scope">
+          <el-popover placement="top" :width="160" trigger="hover" visible-arrow="false">
+            <template>
+              <span slot="reference">
+                <!-- <span class="executory"> -->
+                {{ scope.row.stockReturnCount }}
+                <!-- </span>  -->
+              </span>
+            </template>
+            <div v-for="(item,index) in scope.row.inOutWarehouseTaskList" :key="index">
+              <span style="margin-left:6px;">{{ item.warehouseName }}</span>
+              <span style="margin-left:20px;">{{ item.weight }}吨</span>
             </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="publisher" label="发布者"> </el-table-column>
-        <el-table-column prop="taskStatus" 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.taskStatus == '待审核'" class="executory"></span>
-                  <span v-if="scope.row.taskStatus == '执行中'" class="inExecution"></span>
-                  <span v-if="scope.row.taskStatus == '已完成'" class="done"></span>{{ scope.row.taskStatus }}
-                </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>
+          </el-popover>
+        </template>
+      </el-table-column>
+      <el-table-column prop="transportLoss" label="运输损耗（吨）">
+        <template scope="scope">
+          <div v-show="scope.row.taskStatus == '已完成'">
+            {{ scope.row.weight - scope.row.weightIn - scope.row.stockReturnCount}}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="publisher" label="发布者"> </el-table-column>
+      <el-table-column prop="taskStatus" 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.taskStatus == '待审核'" class="executory"></span>
+                <span v-if="scope.row.taskStatus == '执行中'" class="inExecution"></span>
+                <span v-if="scope.row.taskStatus == '已完成'" class="done"></span>{{ scope.row.taskStatus }}
+              </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>
-            </el-popover>
-            <!-- <img
+            </div>
+          </el-popover>
+          <!-- <img
               width="17"
               height="18"
               style="vertical-align: text-top; position: relative; top: -1px"
@@ -103,21 +103,21 @@
               @click="editClick(scope.row)"
               alt=""
             /> -->
-          </template>
-        </el-table-column>
-        <el-table-column prop="establishDate" label="发布时间" width="150">
-        </el-table-column>
-        <el-table-column prop="seller" label="详情">
-          <template slot-scope="scope">
-            <div class="record" @click="see(scope.row)">
-              查看
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
-      </el-pagination>
+        </template>
+      </el-table-column>
+      <el-table-column prop="establishDate" label="发布时间" width="150">
+      </el-table-column>
+      <el-table-column prop="seller" label="详情">
+        <template slot-scope="scope">
+          <div class="record" @click="see(scope.row)">
+            查看
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+      :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+    </el-pagination>
   </div>
 </template>
 <script>
@@ -243,6 +243,7 @@
         for (var i = 0; i < this.taskTypeList.length; i++) {
           if (this.taskTypeList[i].value == e) {
             this.searchType = this.taskTypeList[i].type
+            this.lookUp()
           }
         }
         this.getList()

src/views/taskManagement/tranManagementTransporTationFire.vue

@@ -3,9 +3,8 @@
   <div>
     <BaseHeaderLayout :leftSpan="20">
       <template slot="left">
-        <ws-button class="but" type="primary" @click="handleAdd()" v-hasPermission="
-            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-          ">
+        <ws-button class="but" type="primary" @click="handleAdd()"
+          v-hasPermission="`${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`">
           执行中</ws-button>
         <ws-button class="but" @click="handleLook()" v-hasPermission="
             `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`

src/views/taskManagement/tranManagementTransport.vue

@@ -32,81 +32,81 @@
         </div>
       </template>
     </BaseHeaderLayout>
-      <el-table class="wenzi" :data="gainList.records" style="width: 100%; " height="calc(100% - 110px)">
-        <el-table-column type="index" label="序号">
-          <template scope="scope">
-            <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
-            <span v-else>{{ scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="taskNo" label="运输任务编号" width="140"></el-table-column>
-        <el-table-column prop="contractNo" label="合同编号" width="160"></el-table-column>
-        <el-table-column prop=" weight" class="table_td" label="货物（吨数）" width="130">
-          <template slot-scope="scope">{{ scope.row.goodsName }}({{ scope.row.weight }})</template>
-        </el-table-column>
-        <el-table-column prop="tranType" class="table_td" label="运输方式" width="120"></el-table-column>
-        <el-table-column prop class="table_td" label="起点">
-          <template slot-scope="scope">
-            {{ scope.row.startPrivate }}{{ scope.row.startCity
+    <el-table class="wenzi" :data="gainList.records" style="width: 100%; " height="calc(100% - 110px)">
+      <el-table-column type="index" label="序号">
+        <template scope="scope">
+          <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+          <span v-else>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="taskNo" label="运输任务编号" width="140"></el-table-column>
+      <el-table-column prop="contractNo" label="合同编号" width="160"></el-table-column>
+      <el-table-column prop=" weight" class="table_td" label="货物（吨数）" width="130">
+        <template slot-scope="scope">{{ scope.row.goodsName }}({{ scope.row.weight }})</template>
+      </el-table-column>
+      <el-table-column prop="tranType" class="table_td" label="运输方式" width="120"></el-table-column>
+      <el-table-column prop class="table_td" label="起点">
+        <template slot-scope="scope">
+          {{ scope.row.startPrivate }}{{ scope.row.startCity
             }}{{ scope.row.startArea }}{{ scope.row.startDetailedAddress }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="currentTransferAddress" class="table_td" label="当前中转">
-        </el-table-column>
-        <el-table-column prop="end" class="table_td" label="终点">
-          <template slot-scope="scope">
-            {{ scope.row.endPrivate }}{{ scope.row.endCity
+        </template>
+      </el-table-column>
+      <el-table-column prop="currentTransferAddress" class="table_td" label="当前中转">
+      </el-table-column>
+      <el-table-column prop="end" class="table_td" label="终点">
+        <template slot-scope="scope">
+          {{ scope.row.endPrivate }}{{ scope.row.endCity
             }}{{ scope.row.endArea }}{{ scope.row.endDetailedAddress }}{{scope.row.receiveWarehouse}}
-          </template>
-        </el-table-column>
-
-        <el-table-column prop="status" label="状态" width="100">
-          <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>
+        </template>
+      </el-table-column>
+
+      <el-table-column prop="status" label="状态" width="100">
+        <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>
-            </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="seller" label="操作" width="160">
-          <template slot-scope="scope">
-            <div class="record" @click="nocomplete(scope.row)" v-hasPermission="
+            </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="seller" label="操作" width="160">
+        <template slot-scope="scope">
+          <div class="record" @click="nocomplete(scope.row)" v-hasPermission="
            `transportationTask.transportation.transportationInfo.view`
           ">查看</div>
-            <div class="record" @click="delivery(scope.row)" v-hasPermission="
+          <div class="record" @click="delivery(scope.row)" v-hasPermission="
            `transportationTask.transportation.transportationInfo.edit`
           ">编辑</div>
-            <div class="record1" @click="deleteclick(scope.row)" v-hasPermission="
+          <div class="record1" @click="deleteclick(scope.row)" v-hasPermission="
            `transportationTask.transportation.transportationInfo.delete`
           ">删除</div>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal"></el-pagination>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+      :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal"></el-pagination>
   </div>
 </template>
 <script>
@@ -421,6 +421,7 @@
         for (var i = 0; i < this.taskTypeList.length; i++) {
           if (this.taskTypeList[i].value == e) {
             this.searchType = this.taskTypeList[i].type
+            this.find()
           }
         }
       },

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -342,7 +342,7 @@
 			</div>
 		</div>
 		<!-- 提交 -->
-		<div style="text-align: right; padding: 10px" class="center">
+		<div style="text-align: center; padding: 10px">
 			<el-button class="bg-bottom" type="primary" size="small" @click="submit()">提交</el-button>
 		</div>
 	</div>
@@ -1738,15 +1738,6 @@
 		left: 0;
 	}
 
-	.el-form {
-		padding: 0 15%;
-		display: flex;
-		flex-wrap: wrap;
-		margin-left: -50px;
-		margin-top: 15px;
-		width: 110%;
-	}
-
 	.el-button--primary {
 		background-color: #5878e8;
 		border-color: #5878e8;
@@ -1825,23 +1816,9 @@
 	.huom {
 		width: 100%;
 	}
-
-	.el-form {
-		font-size: 14px;
-		font-family: PingFangSC-Regular, PingFang SC;
-		font-weight: 400;
-		color: #8890b1;
-		line-height: 16px;
-	}
-
 	.a {
 		margin-left: -32px;
 	}
-
-	.el-radio-group {
-		margin-left: 251px;
-	}
-
 	.ding {
 		height: 23px;
 		background: #e8ecf6;
@@ -1850,6 +1827,7 @@
 	.el-radio-group {
 		font-size: 0;
 		margin-top: 20px;
+		margin-left: 251px;
 	}
 
 	/deep/.el-form {
@@ -1861,6 +1839,11 @@
 		flex-wrap: wrap;
 		margin-left: 130px;
 		margin-top: 15px;
-		width: 110%;
+		width: 100%;
+		font-size: 14px;
+		font-family: PingFangSC-Regular, PingFang SC;
+		font-weight: 400;
+		color: #8890b1;
+		line-height: 16px;
 	}
 </style>

src/views/tranManagement/tranManagementDriver.vue

@@ -26,34 +26,34 @@
         </ws-button>
       </template>
     </BaseHeaderLayout>
-      <el-table class="wenzi" :data="driverList.records" style="width: 100%; margin-top: 20px" fit ref="expandstable"
-        :expand-row-keys="expands" :row-key="getRowKeys" height="calc(100% - 110px)">
-        <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 style="
+    <el-table class="wenzi" :data="driverList.records" style="width: 100%; margin-top: 20px" fit ref="expandstable"
+      :expand-row-keys="expands" :row-key="getRowKeys" height="calc(100% - 110px)">
+      <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 style="
                         margin: 10px;
                         display: inline-block;
                         border-right: 1px solid #e9ecf7;
@@ -66,91 +66,90 @@
                         line-height: 20px;
                         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>
-          </template>
-        </el-table-column>
-        <el-table-column type="index" label="序号" width="80">
-          <template scope="scope">
-            <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
-            <span v-else>{{ scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="driverName" label="姓名" width="100">
-        </el-table-column>
-        <el-table-column prop="numberCard" label="身份证号" width="200">
-        </el-table-column>
-        <el-table-column prop="driverPhone" label="手机号" width="160">
-        </el-table-column>
-        <el-table-column prop="carNumber" label="车牌号" width="160">
-          <template scope="scope">
-            <ws-select v-model="scope.row.carNumber" placeholder="" class="typeselect"
-              @change="selectcar($event, scope.row)">
-              <ws-option v-for="item in scope.row.driverCarInfoList" :key="item.constKey" :label="item.carNumber"
-                :value="item.carNumber" />
-            </ws-select>
-          </template>
-        </el-table-column>
-        <el-table-column prop="binNumber" label="常驻城市" width="160">
-          <template slot-scope="scope">
-            {{ scope.row.residentCityProvincial
+                </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>
+        </template>
+      </el-table-column>
+      <el-table-column type="index" label="序号" width="80">
+        <template scope="scope">
+          <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+          <span v-else>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="driverName" label="姓名" width="100">
+      </el-table-column>
+      <el-table-column prop="numberCard" label="身份证号" width="200">
+      </el-table-column>
+      <el-table-column prop="driverPhone" label="手机号" width="160">
+      </el-table-column>
+      <el-table-column prop="carNumber" label="车牌号" width="160">
+        <template scope="scope">
+          <ws-select v-model="scope.row.carNumber" placeholder="" class="typeselect"
+            @change="selectcar($event, scope.row)">
+            <ws-option v-for="item in scope.row.driverCarInfoList" :key="item.constKey" :label="item.carNumber"
+              :value="item.carNumber" />
+          </ws-select>
+        </template>
+      </el-table-column>
+      <el-table-column prop="binNumber" label="常驻城市" width="160">
+        <template slot-scope="scope">
+          {{ scope.row.residentCityProvincial
             }}{{ scope.row.residentCityMunicipal }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="carModel" label="车型" width="120">
-        </el-table-column>
-        <el-table-column prop="carLength" label="车长" width="120">
-        </el-table-column>
-        <el-table-column label="结款账户" width="120">
-          <template slot-scope="scope">
-            <el-button v-if="!scope.row.expandsStatus" size="medium" type="text" class="fs-16"
-              @click="expandsHandle(scope.row)">展开<img width="9" height="6"
-                style="vertical-align: middle; margin-left: 3px" src="../../../public/img/zhankai.png" alt="" />
-            </el-button>
-            <el-button v-if="scope.row.expandsStatus" size="medium" type="text" class="fs-16"
-              @click="expandsHandle(scope.row)">收起<img width="9" height="6"
-                style="vertical-align: middle; margin-left: 3px" src="../../../public/img/shouqi.png" alt="" />
-            </el-button>
-          </template>
-        </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.length > 0">{{
+        </template>
+      </el-table-column>
+      <el-table-column prop="carModel" label="车型" width="120">
+      </el-table-column>
+      <el-table-column prop="carLength" label="车长" width="120">
+      </el-table-column>
+      <el-table-column label="结款账户" width="120">
+        <template slot-scope="scope">
+          <el-button v-if="!scope.row.expandsStatus" size="medium" type="text" class="fs-16"
+            @click="expandsHandle(scope.row)">展开<img width="9" height="6"
+              style="vertical-align: middle; margin-left: 3px" src="../../../public/img/zhankai.png" alt="" />
+          </el-button>
+          <el-button v-if="scope.row.expandsStatus" size="medium" type="text" class="fs-16"
+            @click="expandsHandle(scope.row)">收起<img width="9" height="6"
+              style="vertical-align: middle; margin-left: 3px" src="../../../public/img/shouqi.png" alt="" />
+          </el-button>
+        </template>
+      </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.length > 0">{{
               scope.row.addressUrlArray.length
             }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="address" label="操作" width="300">
-          <template slot-scope="scope">
-            <el-button size="medium" type="text" class="record" @click="look(scope.row)">查看</el-button>
-            <el-button size="medium" type="text" class="record" @click="edit(scope.row)">编辑</el-button>
-            <el-button size="medium" type="text" class="record" @click="deletes(scope.row)">删除</el-button>
-            <el-button v-if="scope.row.disableStatusFlag != 1" class="record1" size="medium" type="text"
-              @click="stop(scope.row)">禁用</el-button>
-            <!-- <el-tooltip
+        </template>
+      </el-table-column>
+      <el-table-column prop="address" label="操作" width="300">
+        <template slot-scope="scope">
+          <el-button size="medium" type="text" class="record" @click="look(scope.row)">查看</el-button>
+          <el-button size="medium" type="text" class="record" @click="edit(scope.row)">编辑</el-button>
+          <el-button size="medium" type="text" class="record" @click="deletes(scope.row)">删除</el-button>
+          <el-button v-if="scope.row.disableStatusFlag != 1" class="record1" size="medium" type="text"
+            @click="stop(scope.row)">禁用</el-button>
+          <!-- <el-tooltip
               class="item record"
               effect="dark"
               :content="scope.row.disableReasons"
               placement="right-start"
             > -->
-            <el-button v-if="scope.row.disableStatusFlag == 1" class="record1" size="medium" type="text"
-              style="font-size:14px;color:#F83535;" @click="relieve(scope.row)">已禁用</el-button>
-            <!-- </el-tooltip> -->
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper"
-        :total="deptBudgetTotal">
-      </el-pagination>
+          <el-button v-if="scope.row.disableStatusFlag == 1" class="record1" size="medium" type="text"
+            style="font-size:14px;color:#F83535;" @click="relieve(scope.row)">已禁用</el-button>
+          <!-- </el-tooltip> -->
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+      :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+    </el-pagination>
     <!-- <el-dialog v-model="outerVisible">
       <el-input
         type="textarea"
@@ -485,6 +484,7 @@
         this.residentCityProvincial = CodeToText[e[0]]
         this.residentCityMunicipal = CodeToText[e[1]]
         // this.selectedOptions = e
+        this.handleLook()
       },
       fujian(row) {
         if (row.addressUrl === null || row.addressUrl === '') {

src/views/tranManagement/tranManagementDriverAdd.vue

@@ -220,7 +220,7 @@
         style="width: 100%"
         class="flex position"
         v-for="(item, index) in freightspace1"
-      >
+      :key="index">
         <div class="gathering">
           <div class="driver">
             收款人账户信息-{{ index + 1 }}
@@ -377,10 +377,12 @@
               span="1"
               prop="bankDepositBranch"
             >
-              <ws-select
+              <el-select
                 v-model="item.bankDepositBranch"
-                placeholder=""
+                placeholder="请输入开户支行"
+                filterable
                 class="typeselect"
+                :allow-create = "allow"
                 @change="
                   (value) => {
                     selectbankDepositBranch(value, index)
@@ -393,7 +395,7 @@
                   :label="items"
                   :value="items"
                 />
-              </ws-select>
+              </el-select>
             </ws-form-item>
           </ws-info-table>
         </div>
@@ -603,6 +605,7 @@ export default {
       ],
       name: '',
       age: '',
+      allow:true
     }
   },
   activated() {
@@ -863,67 +866,67 @@ export default {
         //   return
         // }
       }
-      // for (var i = 0; i < this.freightspace1.length; i++) {
-      //   if (this.freightspace1[i].bankCard == '') {
-      //     EventBus.$emit('error', '银行卡账号不能为空')
-      //     return
-      //   }
-      //   if (this.freightspace1[i].bankDeposit == '') {
-      //     EventBus.$emit('error', '开户行不能为空')
-      //     return
-      //   }
-      //   if (this.freightspace1[i].bankDepositBranch == '') {
-      //     EventBus.$emit('error', '开户支行不能为空')
-      //     return
-      //   }
-      //   if (
-      //     this.freightspace1[i].accountTypeFlag == 1 &&
-      //     this.freightspace1[i].payeeName == ''
-      //   ) {
-      //     EventBus.$emit('error', '收款人姓名不能为空')
-      //     return
-      //   }
-      //   if (
-      //     this.freightspace1[i].accountTypeFlag == 1 &&
-      //     this.freightspace1[i].payeeNumberCard == ''
-      //   ) {
-      //     EventBus.$emit('error', '收款人身份证号码不能为空')
-      //     return
-      //   }
-      //   if (
-      //     (this.freightspace1[i].accountTypeFlag == 1 &&
-      //       this.freightspace1[i].payeeName.length < 2) ||
-      //     (this.freightspace1[i].accountTypeFlag == 1 &&
-      //       this.freightspace1[i].payeeName.length > 10)
-      //   ) {
-      //     EventBus.$emit('error', '收款人姓名输入错误')
-      //     return
-      //   }
-      //   console.log(this.freightspace1[i].payeeNumberCard != 18)
-      //   if (
-      //     this.freightspace1[i].accountTypeFlag == 1 &&
-      //     this.freightspace1[i].payeeNumberCard.length != 18
-      //   ) {
-      //     EventBus.$emit('error', '收款人身份证号输入错误')
-      //     return
-      //   }
-      //   if (
-      //     this.freightspace1[i].accountTypeFlag == 2 &&
-      //     this.freightspace1[i].compName == ''
-      //   ) {
-      //     EventBus.$emit('error', '企业名称不能为空')
-      //     return
-      //   }
-      //   if (
-      //     (this.freightspace1[i].accountTypeFlag == 2 &&
-      //       this.freightspace1[i].compName.length < 2) ||
-      //     (this.freightspace1[i].accountTypeFlag == 2 &&
-      //       this.freightspace1[i].compName.length > 30)
-      //   ) {
-      //     EventBus.$emit('error', '企业名称输入有误')
-      //     return
-      //   }
-      // }
+      for (var i = 0; i < this.freightspace1.length; i++) {
+        if (!this.freightspace1[i].bankCard) {
+          EventBus.$emit('error', '银行卡账号不能为空')
+          return
+        }
+        if (!this.freightspace1[i].bankDeposit) {
+          EventBus.$emit('error', '开户行不能为空')
+          return
+        }
+        if (!this.freightspace1[i].bankDepositBranch) {
+          EventBus.$emit('error', '开户支行不能为空')
+          return
+        }
+        if (
+          this.freightspace1[i].accountTypeFlag == 1 &&
+          this.freightspace1[i].payeeName == ''
+        ) {
+          EventBus.$emit('error', '收款人姓名不能为空')
+          return
+        }
+        if (
+          this.freightspace1[i].accountTypeFlag == 1 &&
+          this.freightspace1[i].payeeNumberCard == ''
+        ) {
+          EventBus.$emit('error', '收款人身份证号码不能为空')
+          return
+        }
+        if (
+          (this.freightspace1[i].accountTypeFlag == 1 &&
+            this.freightspace1[i].payeeName.length < 2) ||
+          (this.freightspace1[i].accountTypeFlag == 1 &&
+            this.freightspace1[i].payeeName.length > 10)
+        ) {
+          EventBus.$emit('error', '收款人姓名输入错误')
+          return
+        }
+        console.log(this.freightspace1[i].payeeNumberCard != 18)
+        if (
+          this.freightspace1[i].accountTypeFlag == 1 &&
+          this.freightspace1[i].payeeNumberCard.length != 18
+        ) {
+          EventBus.$emit('error', '收款人身份证号输入错误')
+          return
+        }
+        if (
+          this.freightspace1[i].accountTypeFlag == 2 &&
+          this.freightspace1[i].compName == ''
+        ) {
+          EventBus.$emit('error', '企业名称不能为空')
+          return
+        }
+        if (
+          (this.freightspace1[i].accountTypeFlag == 2 &&
+            this.freightspace1[i].compName.length < 2) ||
+          (this.freightspace1[i].accountTypeFlag == 2 &&
+            this.freightspace1[i].compName.length > 30)
+        ) {
+          EventBus.$emit('error', '企业名称输入有误')
+          return
+        }
+      }
       // if (!this.addressUrls.travel) {
       //   EventBus.$emit('error', '行驶证不能为空')
       //   return

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -33,90 +33,90 @@
             " src="../../../public/img/sousuo.png" alt="" /></ws-button>
       </template>
     </BaseHeaderLayout>
-      <el-table class="wenzi" :data="warehouseList.records" style="width: 100%" height="calc(100% - 110px)">
-        <el-table-column type="index" label="序号" width="80">
-          <template scope="scope">
-            <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
-            <span v-else>{{ scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column class="table_td" prop="processNo" label="运输任务编号/合同编号" width="150">
-          <template scope="scope">
-            <span v-if='scope.row.processNo'>{{scope.row.processNo}}</span>
-            <span v-else>{{scope.row.contractNo}}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="tranType" label="运输方式"> </el-table-column>
-        <el-table-column class="table_td" prop="goodsName" label="货名">
-        </el-table-column>
-        <el-table-column class="table_td" label="重量（吨）" prop="weight">
-        </el-table-column>
-        <el-table-column class="table_td" label="发货" prop="send" width="300">
-          <template scope="scope">
-            <span style='white-space :pre-wrap;' v-html="scope.row.send"></span>
-          </template>
-        </el-table-column>
-        <el-table-column class="table_td" label="收货" prop="receive" width="300">
-          <template scope="scope">
-            <span style='white-space :pre-wrap;' v-html="scope.row.receive"></span>
-          </template>
-        </el-table-column>
-        <el-table-column class="table_td" label="运输周期" prop="tranCycle" width="160">
-          <template scope="scope">
-            {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
-          </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.receivingStatus == '待执行'" class="executory"></span>
-                  <span v-if="scope.row.receivingStatus == '执行中'" class="inExecution"></span>
-                  <span v-if="scope.row.receivingStatus == '已完货'" class="done"></span>{{ scope.row.receivingStatus }}
-                </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>
+    <el-table class="wenzi" :data="warehouseList.records" style="width: 100%" height="calc(100% - 110px)">
+      <el-table-column type="index" label="序号" width="80">
+        <template scope="scope">
+          <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+          <span v-else>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column class="table_td" prop="processNo" label="运输任务编号/合同编号" width="150">
+        <template scope="scope">
+          <span v-if='scope.row.processNo'>{{scope.row.processNo}}</span>
+          <span v-else>{{scope.row.contractNo}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="tranType" label="运输方式"> </el-table-column>
+      <el-table-column class="table_td" prop="goodsName" label="货名">
+      </el-table-column>
+      <el-table-column class="table_td" label="重量（吨）" prop="weight">
+      </el-table-column>
+      <el-table-column class="table_td" label="发货" prop="send" width="300">
+        <template scope="scope">
+          <span style='white-space :pre-wrap;' v-html="scope.row.send"></span>
+        </template>
+      </el-table-column>
+      <el-table-column class="table_td" label="收货" prop="receive" width="300">
+        <template scope="scope">
+          <span style='white-space :pre-wrap;' v-html="scope.row.receive"></span>
+        </template>
+      </el-table-column>
+      <el-table-column class="table_td" label="运输周期" prop="tranCycle" width="160">
+        <template scope="scope">
+          {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
+        </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.receivingStatus == '待执行'" class="executory"></span>
+                <span v-if="scope.row.receivingStatus == '执行中'" class="inExecution"></span>
+                <span v-if="scope.row.receivingStatus == '已完货'" class="done"></span>{{ scope.row.receivingStatus }}
+              </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>
-            </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="" />
+            </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 class="table_td" label="接单时间" prop="createDate" width="90">
+      </el-table-column>
+      <el-table-column prop="seller" label="操作" width="160">
+        <template slot-scope="scope">
+          <template v-if="scope.row.receivingStatus != '已完货'">
+            <div class="record" @click="trainSee(scope.row)">查看</div>
+            <div class="adjustment" @click="feedback(scope.row)">反馈</div>
           </template>
-        </el-table-column>
-        <el-table-column class="table_td" label="接单时间" prop="createDate" width="90">
-        </el-table-column>
-        <el-table-column prop="seller" label="操作" width="160">
-          <template slot-scope="scope">
-            <template v-if="scope.row.receivingStatus != '已完货'">
-              <div class="record" @click="trainSee(scope.row)">查看</div>
-              <div class="adjustment" @click="feedback(scope.row)">反馈</div>
-            </template>
-            <template v-else>
-              <div class="record1" @click="trainSee(scope.row)">查看</div>
-            </template>
+          <template v-else>
+            <div class="record1" @click="trainSee(scope.row)">查看</div>
           </template>
-        </el-table-column>
-      </el-table>
-      <div>
-        <!-- 分页 -->
-        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-          :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper"
-          :total="deptBudgetTotal">
-        </el-pagination>
-      </div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div>
+      <!-- 分页 -->
+      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper"
+        :total="deptBudgetTotal">
+      </el-pagination>
+    </div>
   </div>
 </template>
 <script>
@@ -444,6 +444,7 @@
         for (var i = 0; i < this.taskTypeList.length; i++) {
           if (this.taskTypeList[i].value == e) {
             this.feedbackFlag = this.taskTypeList[i].type
+            this.find()
           }
         }
         this.getList()
@@ -452,6 +453,7 @@
         for (var i = 0; i < this.tranTypeList.length; i++) {
           if (this.tranTypeList[i].value == e) {
             this.tranTypeKey = this.tranTypeList[i].type
+            this.find()
           }
         }
         this.getList()

src/views/tranManagement/tranManagementShipping.vue

@@ -27,78 +27,77 @@
             " src="../../../public/img/sousuo.png" alt="" /></ws-button>
       </template>
     </BaseHeaderLayout>
-      <el-table class="wenzi" :data="warehouseList.records" style="width: 100%" height="calc(100% - 110px)">
-        <el-table-column type="index" label="序号" width="80">
-        </el-table-column>
-        <el-table-column class="table_td" prop="processNo" label="运输任务编号">
-        </el-table-column>
-        <el-table-column class="table_td" prop="goodsName" label="货名">
-        </el-table-column>
-        <el-table-column class="table_td" label="重量（吨）" prop="weight">
-        </el-table-column>
-        <el-table-column class="table_td" label="发货" prop="send" width="300">
-          <template scope="scope">
-            <span style='white-space :pre-wrap;' v-html="scope.row.send"></span>
-          </template>
-        </el-table-column>
-        <el-table-column class="table_td" label="收货" prop="receive" width="300">
-          <template scope="scope">
-            <span style='white-space :pre-wrap;' v-html="scope.row.receive"></span>
-          </template>
-        </el-table-column>
-        <el-table-column class="table_td" label="运输周期" prop="tranCycle" width="160">
-          <template scope="scope">
-            {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
-          </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.processStatus == '待执行'" class="executory"></span>
-                  <span v-if="scope.row.processStatus == '执行中'" class="inExecution"></span>
-                  <span v-if="scope.row.processStatus == '已完成'" class="done"></span>{{ scope.row.processStatus }}
-                </span>
-              </template>
-              <div>
-                <p style="margin-top: 0; padding-left: 10px">历史记录</p>
-                <div v-for="(item, index) in historyList" class="flex" :key="index">
-                  <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>
+    <el-table class="wenzi" :data="warehouseList.records" style="width: 100%" height="calc(100% - 110px)">
+      <el-table-column type="index" label="序号" width="80">
+      </el-table-column>
+      <el-table-column class="table_td" prop="processNo" label="运输任务编号">
+      </el-table-column>
+      <el-table-column class="table_td" prop="goodsName" label="货名">
+      </el-table-column>
+      <el-table-column class="table_td" label="重量（吨）" prop="weight">
+      </el-table-column>
+      <el-table-column class="table_td" label="发货" prop="send" width="300">
+        <template scope="scope">
+          <span style='white-space :pre-wrap;' v-html="scope.row.send"></span>
+        </template>
+      </el-table-column>
+      <el-table-column class="table_td" label="收货" prop="receive" width="300">
+        <template scope="scope">
+          <span style='white-space :pre-wrap;' v-html="scope.row.receive"></span>
+        </template>
+      </el-table-column>
+      <el-table-column class="table_td" label="运输周期" prop="tranCycle" width="160">
+        <template scope="scope">
+          {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
+        </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.processStatus == '待执行'" class="executory"></span>
+                <span v-if="scope.row.processStatus == '执行中'" class="inExecution"></span>
+                <span v-if="scope.row.processStatus == '已完成'" class="done"></span>{{ scope.row.processStatus }}
+              </span>
+            </template>
+            <div>
+              <p style="margin-top: 0; padding-left: 10px">历史记录</p>
+              <div v-for="(item, index) in historyList" class="flex" :key="index">
+                <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>
-            </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 class="table_td" label="接单时间" prop="createDate">
-        </el-table-column>
-        <el-table-column prop="seller" label="操作" width="200">
-          <template slot-scope="scope">
-            <div v-hasPermission="
+            </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 class="table_td" label="接单时间" prop="createDate">
+      </el-table-column>
+      <el-table-column prop="seller" label="操作" width="200">
+        <template slot-scope="scope">
+          <div v-hasPermission="
                 'tranManager.shippingDispatching.view'
               " class="record" @click="handleLook(scope.row)">查看</div>
-            <div v-hasPermission="
+          <div v-hasPermission="
                 'tranManager.shippingDispatching.car'
               " class="adjustment" @click="shipping(scope.row)">船次</div>
-          </template>
-        </el-table-column>
-      </el-table>
-      <!-- 页数 -->
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper"
-        :total="deptBudgetTotal">
-      </el-pagination>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 页数 -->
+    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+      :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+    </el-pagination>
   </div>
 </template>
 <script>
@@ -345,6 +344,7 @@
         for (var i = 0; i < this.taskTypeList.length; i++) {
           if (this.taskTypeList[i].value == e) {
             this.searchType = this.taskTypeList[i].type
+            this.find()
           }
         }
       },

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -33,85 +33,85 @@
             " src="../../../public/img/sousuo.png" alt="" /></ws-button>
       </template>
     </BaseHeaderLayout>
-      <el-table class="wenzi" :data="tranManagementList.records" style="width: 100%; margin-top: 20px" height="calc(100% - 110px)">
-        <el-table-column type="index" label="序号" width="80">
-          <template scope="scope">
-            <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
-            <span v-else>{{ scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="processNo" label="运输任务编号/合同编号" width="140">
-          <template scope="scope">
-            <span v-if="scope.row.processNo">{{ scope.row.processNo }}</span>
-            <span v-else>{{ scope.row.contractNo }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="tranType" label="运输方式"> </el-table-column>
-        <el-table-column prop="goodsName" label="货名"> </el-table-column>
-        <el-table-column prop="weight" label="重量（吨）"> </el-table-column>
-        <el-table-column prop="send" label="发货" width="300">
-          <template scope="scope">
-            <span style='white-space :pre-wrap;' v-html="scope.row.send"></span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="receive" label="收货" width="300">
-          <template scope="scope">
-            <span style='white-space :pre-wrap;' v-html="scope.row.receive"></span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="tranCycle" label="运输周期" width="160">
-          <template scope="scope">
-            {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="feedbackStatus" 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.feedbackStatus == '待执行'" class="executory"></span>
-                  <span v-if="scope.row.feedbackStatus == '执行中'" class="inExecution"></span>
-                  <span v-if="scope.row.feedbackStatus == '已完货'" class="done"></span>{{ scope.row.feedbackStatus }}
-                </span>
-              </template>
-              <div>
-                <p style="margin-top: 0; padding-left: 10px">XXXXX</p>
-                <div v-for="(item, index) in historyList" class="flex" :key="index">
-                  <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>
+    <el-table class="wenzi" :data="tranManagementList.records" style="width: 100%; margin-top: 20px"
+      height="calc(100% - 110px)">
+      <el-table-column type="index" label="序号" width="80">
+        <template scope="scope">
+          <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+          <span v-else>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="processNo" label="运输任务编号/合同编号" width="140">
+        <template scope="scope">
+          <span v-if="scope.row.processNo">{{ scope.row.processNo }}</span>
+          <span v-else>{{ scope.row.contractNo }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="tranType" label="运输方式"> </el-table-column>
+      <el-table-column prop="goodsName" label="货名"> </el-table-column>
+      <el-table-column prop="weight" label="重量（吨）"> </el-table-column>
+      <el-table-column prop="send" label="发货" width="300">
+        <template scope="scope">
+          <span style='white-space :pre-wrap;' v-html="scope.row.send"></span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="receive" label="收货" width="300">
+        <template scope="scope">
+          <span style='white-space :pre-wrap;' v-html="scope.row.receive"></span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="tranCycle" label="运输周期" width="160">
+        <template scope="scope">
+          {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="feedbackStatus" 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.feedbackStatus == '待执行'" class="executory"></span>
+                <span v-if="scope.row.feedbackStatus == '执行中'" class="inExecution"></span>
+                <span v-if="scope.row.feedbackStatus == '已完货'" class="done"></span>{{ scope.row.feedbackStatus }}
+              </span>
+            </template>
+            <div>
+              <p style="margin-top: 0; padding-left: 10px">XXXXX</p>
+              <div v-for="(item, index) in historyList" class="flex" :key="index">
+                <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>
-            </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="" />
+            </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="createDate" class="table_td" label="接单时间" width="90">
+      </el-table-column>
+      <el-table-column prop="seller" label="操作" width="160">
+        <template slot-scope="scope">
+          <template v-if="scope.row.feedbackStatus != '已完货'">
+            <div class="record" @click="trainSee(scope.row)">查看</div>
+            <div class="adjustment" @click="feedback(scope.row)">反馈</div>
           </template>
-        </el-table-column>
-        <el-table-column prop="createDate" class="table_td" label="接单时间" width="90">
-        </el-table-column>
-        <el-table-column prop="seller" label="操作" width="160">
-          <template slot-scope="scope">
-            <template v-if="scope.row.feedbackStatus != '已完货'">
-              <div class="record" @click="trainSee(scope.row)">查看</div>
-              <div class="adjustment" @click="feedback(scope.row)">反馈</div>
-            </template>
-            <template v-else>
-              <div class="record1" @click="trainSee(scope.row)">查看</div>
-            </template>
+          <template v-else>
+            <div class="record1" @click="trainSee(scope.row)">查看</div>
           </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper"
-        :total="deptBudgetTotal">
-      </el-pagination>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+      :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+    </el-pagination>
   </div>
 </template>
 <script>
@@ -420,6 +420,7 @@
         for (var i = 0; i < this.taskTypeList.length; i++) {
           if (this.taskTypeList[i].value == e) {
             this.feedbackFlag = this.taskTypeList[i].type
+            this.find()
           }
         }
         this.getList()
@@ -428,6 +429,7 @@
         for (var i = 0; i < this.tranTypeList.length; i++) {
           if (this.tranTypeList[i].value == e) {
             this.tranTypeKey = this.tranTypeList[i].type
+            this.find()
           }
         }
         this.getList()

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -330,6 +330,7 @@
         for (var i = 0; i < this.taskTypeList.length; i++) {
           if (this.taskTypeList[i].value == e) {
             this.searchType = this.taskTypeList[i].type
+            this.find()
           }
         }
       },

src/views/tranManagement/tranManagementVehicle.vue

@@ -300,6 +300,7 @@
         for (var i = 0; i < this.taskTypeList.length; i++) {
           if (this.taskTypeList[i].value == e) {
             this.searchType = this.taskTypeList[i].type
+            this.find()
           }
         }
       },

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -12,7 +12,7 @@
       </el-col>
     </el-row>
     <div class="center">
-      <el-form ref="deptBudgetList" :model="deptBudgetList"  label-width="110px">
+      <el-form ref="deptBudgetList" :model="deptBudgetList" label-width="110px">
         <div class="basicInformation">
           <div class="small-title" style="font-size: 16px">任务详情</div>
           <el-row>
@@ -77,8 +77,9 @@
                 <el-input type="text" class="row-item" v-model="deptBudgetList.contractNo" disabled></el-input>
               </el-form-item>
             </el-col>
-             <el-col :span="8">
-              <el-form-item label="关联合同" v-if="deptBudgetList.relatedContract" span="1" prop="inOutDate" class="relatedContract">
+            <el-col :span="8">
+              <el-form-item label="关联合同" v-if="deptBudgetList.relatedContract" span="1" prop="inOutDate"
+                class="relatedContract">
                 <el-input type="text" class="row-item" v-model="deptBudgetList.relatedContract" disabled></el-input>
               </el-form-item>
             </el-col>
@@ -95,9 +96,9 @@
             </el-form-item>
             <div class="input-item-margin">
               <div v-if="deptBudgetList.priceStatus=='审核中'">
-                <el-button type="primary"
-                v-hasPermission="`tranManager.vehicleDispatching.reprice`" size="small" @click="examine()">审核中
-              </el-button>
+                <el-button type="primary" v-hasPermission="`tranManager.vehicleDispatching.reprice`" size="small"
+                  @click="examine()">审核中
+                </el-button>
               </div>
               <el-button v-else type="primary" @click="priceSubmit()">提交</el-button>
             </div>
@@ -121,8 +122,8 @@
               <el-col :span="8">
 
                 <el-form-item label="姓名：" span="1" prop="driverName" label-width="125px">
-                  <el-select v-show="!item.temporaryDriverFlag" v-model="item.driver" filterable clearable placeholder="请选择司机"
-                    class="row-item" @change="
+                  <el-select ref="driverSelect" v-show="!item.temporaryDriverFlag" @visible-change="clearBlur"
+                    v-model="item.driver" filterable clearable placeholder="请选择司机" class="row-item" @change="
                              (val) => {
                                carchange(val, index)
                              }
@@ -138,8 +139,8 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="司机电话：" span="1" prop="impurity" label-width="125px">
-                  <el-select v-show="!item.temporaryDriverFlag" v-model="item.driverPhone" placeholder="请选择司机电话" filterable clearable
-                    class="row-item" @change="
+                  <el-select v-show="!item.temporaryDriverFlag" v-model="item.driverPhone" placeholder="请选择司机电话"
+                    filterable clearable class="row-item" @change="
                                (val) => {
                                  phonechange(val, index)
                                }
@@ -155,8 +156,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="车牌号：" span="1" prop="carNo" label-width="125px">
-                  <el-input :disabled="readonly" v-model="item.carNo" placeholder="" maxlength="120"
-                    size="small" />
+                  <el-input :disabled="readonly" v-model="item.carNo" placeholder="" maxlength="120" size="small" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -180,15 +180,13 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="车型：" span="1" prop="carModel" label-width="125px">
-                  <el-input :disabled="readonly" v-model="item.carModel" placeholder="" maxlength="120"
-                    size="small" />
+                  <el-input :disabled="readonly" v-model="item.carModel" placeholder="" maxlength="120" size="small" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
 
                 <el-form-item label="车长：" span="1" prop="carLength" label-width="125px">
-                  <el-input :disabled="readonly" v-model="item.carLength" placeholder="" maxlength="120"
-                    size="small" />
+                  <el-input :disabled="readonly" v-model="item.carLength" placeholder="" maxlength="120" size="small" />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -304,6 +302,14 @@
       },
     },
     methods: {
+      clearBlur(e) {
+        let k = this.$refs.driverSelect
+        if (!e) {
+          for (let i = 0; i < k.length; i++) {
+            k[i].blur()
+          }
+        }
+      },
       //返回按钮
       revert() {
         this.$router.go(-1)
@@ -957,6 +963,7 @@
       margin-top: 20px;
     }
   }
+
   .content4 {
     background: #F5F7FA;
     display: flex;

src/views/warehouse/tranManagementWarehouseInOutTask.vue

@@ -222,7 +222,8 @@
 import {
   getwarehousetask,
   postcheckorupdate,
-  getstaff
+  getstaff,
+  getsponsible,
 } from '@/model/warehouse/index'
 import { getoreditoutput, outdelete, movestates } from '@/model/tasksport/index'
 import { downloadFile } from '@/utils/batchDown'
@@ -255,6 +256,7 @@ export default {
       tableDate: [],
       options:[],
       staffList:[],
+      list:[],
       // 是否显示
       showType: true,
       // 年
@@ -371,13 +373,25 @@ export default {
     },
     getList() {
       console.log(this.$route)
-      getwarehousetask({
+      var stringList=''
+        var arr=[]
+         getsponsible({
+            compId: localStorage.getItem('ws-pf_compId')
+          }).toPromise()
+          .then((response) => {
+
+            this.list = response
+            for (let i = 0; i < this.list.length; i++) {
+            arr.push(this.list[i].warehouseName)
+          }
+          console.log(arr)
+           getwarehousetask({
         compId: localStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         searchType: this.searchType,
         searchKeyWord: this.searchKeyWord,
-        stringList:this.$route.query.stringList.toString()
+        stringList:arr.toString()
       })
         .toPromise()
         .then((response) => {
@@ -389,6 +403,11 @@ export default {
           this.pageSize = response.size
           this.deptBudgetTotal = response.total
         })
+            // console.log(response)
+          })
+          
+          
+     
     },
     //编辑
     delivery(item) {
@@ -522,7 +541,7 @@ export default {
     editClick1(row) {
       console.log(row)
      row.editstatus=true
-     var arr=JSON.parse(this.$route.query.warehouseBaseInfoList)
+     var arr=this.list
      for (let i = 0; i < arr.length; i++) {
        if(arr[i].warehouseName==row.warehouseName){
 console.log(arr[i])

src/views/warehouse/warehouseManagementAdd.vue

@@ -38,7 +38,7 @@
         <!--其他负责人-->
         <ws-form-item label="其他负责人" span="1" prop="otherPersonCharge">
           <el-select v-model="deptBudgetList.otherPersonPhone" placeholder="请选择其他负责人" @change="selectstaffOther"
-            multiple filterable clearable>
+            multiple filterable clearable collapse-tags>
             <el-option v-for="item in optionsOther" :key="item.staffMobilePhone" :label="item.staffName"
               :value="item.staffMobilePhone" />
           </el-select>

src/views/warehouse/warehouseManagementDelivery.vue

@@ -312,14 +312,14 @@
             "
           >
             <ws-input
-              v-if="!carstatus"
+              v-if="!carstatus || carjudge"
               v-model="deptBudgetList.carNo"
               placeholder="请输入车牌号"
               maxlength="7"
               size="small"
             />
             <el-select
-              v-if="carstatus"
+              v-else
               filterable
               clearable
               :filter-method="dataFilter2"
@@ -335,6 +335,7 @@
                 :value="item.carNo"
               />
             </el-select>
+            <el-button type="primary" @click="carNoTypeChange" v-if="carstatus">{{carChange1}}</el-button>
           </ws-form-item>
               <!--船名  -->
               <ws-form-item
@@ -701,6 +702,7 @@ export default {
         type:'干粮',
         addressUrl:'',
         warehouseInOutDetail: {},
+         selfLoading:"0",
       },
       historyList: [],
 
@@ -711,6 +713,8 @@ export default {
       },
       accessoryTFs: false,
       deptBudgetList1:[],
+      carChange1:"手动填写",
+      carjudge:false
     }
   },
   mounted() {
@@ -724,6 +728,17 @@ export default {
   
   },
   methods: {
+    //切换车牌号输入状态
+      carNoTypeChange(){
+         this.carjudge = !this.carjudge
+        if(!this.carjudge){
+            this.deptBudgetList.selfLoading = "0"
+            this.carChange1="手动填写"
+        }else{
+            this.deptBudgetList.selfLoading = "1"
+            this.carChange1="识别下拉"
+        }
+      },
     imgBig(item){
       console.log(item)
       this.img=item
@@ -1586,6 +1601,9 @@ export default {
           return
         }
       }
+      if(!this.carstatus){//若自运的合同该字段置空
+          this.deptBudgetList.selfLoading = ""
+        }
       this.$confirm(`确定提交出库信息`, {
         cancelButtonText: '取消',
         confirmButtonText: '确定',

src/views/warehouse/warehouseManagementEdit.vue

@@ -41,7 +41,7 @@
           <!--其他负责人-->
           <ws-form-item label="其他负责人" v-if="warehouseType == 1" span="1" prop="otherPersonCharge">
             <el-select v-model="deptBudgetList.otherPersonPhone" placeholder="请选择其他负责人" @change="selectstaffOther"
-              :filter-method="dataFilter1" filterable clearable multiple>
+              :filter-method="dataFilter1" filterable clearable multiple collapse-tags>
               <el-option v-for="item in optionsOther" :key="item.staffMobilePhone" :label="item.staffName"
                 :value="item.staffMobilePhone " />
             </el-select>

src/views/warehouse/warehouseManagementGross.vue

@@ -27,7 +27,7 @@
           <div class="top">
             <div class="car-type">毛重</div>
             <div class="weight">
-              {{ deptBudgetList.grossWeight }} <span class="kg-style">kg</span>
+              {{ grossWeight }} <span class="kg-style">kg</span>
             </div>
             <!-- <div v-else class="weight">{{weighingList.tare}} <span class="kg-style">kg</span></div> -->
             <div class="car-no">{{ deptBudgetList.carNo }}</div>
@@ -517,6 +517,7 @@
             return time.getTime() > Date.now()
           },
         },
+
         accessoryTFs: false,
         allowEdit: true,
         param: 9600,
@@ -670,6 +671,7 @@
         for (let i = 0; i < this.tranCarInfoList.length; i++) {
           if (this.tranCarInfoList[i].carNo == this.deptBudgetList.carNo) {
             this.deptBudgetList.tranCarNo = this.tranCarInfoList[i].tranCarNo
+            this.deptBudgetList.carId = this.tranCarInfoList[i].id
             this.deptBudgetList.freight = Math.round(
               this.tranCarInfoList[i].tranPrice
             )
@@ -1023,6 +1025,7 @@
           })
           return
         }
+
         // if (
         //   this.deptBudgetList.contractNo.length < 6 ||
         //   this.deptBudgetList.contractNo.length > 20
@@ -1063,7 +1066,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.waterContent < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.waterContent < 0 ||
             this.deptBudgetList.warehouseInOutDetail.waterContent > 40 ||
             (String(
                 this.deptBudgetList.warehouseInOutDetail.waterContent
@@ -1077,7 +1080,7 @@
               2)
           ) {
             this.$message({
-              message: '水分（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '水分（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1094,7 +1097,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.impurity < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.impurity < 0 ||
             this.deptBudgetList.warehouseInOutDetail.impurity > 40 ||
             (String(this.deptBudgetList.warehouseInOutDetail.impurity).indexOf(
                 '.'
@@ -1107,7 +1110,7 @@
               2)
           ) {
             this.$message({
-              message: '杂质（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '杂质（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1123,7 +1126,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.mildewGrain < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.mildewGrain < 0 ||
             this.deptBudgetList.warehouseInOutDetail.mildewGrain > 40 ||
             (String(this.deptBudgetList.warehouseInOutDetail.mildewGrain).indexOf(
                 '.'
@@ -1137,7 +1140,7 @@
               2)
           ) {
             this.$message({
-              message: '霉变粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '霉变粒（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1154,7 +1157,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.jiaorenli < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.jiaorenli < 0 ||
             this.deptBudgetList.warehouseInOutDetail.jiaorenli > 40 ||
             (String(this.deptBudgetList.warehouseInOutDetail.jiaorenli).indexOf(
                 '.'
@@ -1167,7 +1170,7 @@
               2)
           ) {
             this.$message({
-              message: '热损伤（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '热损伤（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1184,7 +1187,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.imperfectGrain < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.imperfectGrain < 0 ||
             this.deptBudgetList.warehouseInOutDetail.imperfectGrain > 40 ||
             (String(
                 this.deptBudgetList.warehouseInOutDetail.imperfectGrain
@@ -1198,7 +1201,7 @@
               2)
           ) {
             this.$message({
-              message: '不完善粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '不完善粒（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1626,7 +1629,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.waterContent < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.waterContent < 0 ||
             this.deptBudgetList.warehouseInOutDetail.waterContent > 40 ||
             (String(
                 this.deptBudgetList.warehouseInOutDetail.waterContent
@@ -1640,7 +1643,7 @@
               2)
           ) {
             this.$message({
-              message: '水分（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '水分（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1657,7 +1660,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.impurity < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.impurity < 0 ||
             this.deptBudgetList.warehouseInOutDetail.impurity > 40 ||
             (String(this.deptBudgetList.warehouseInOutDetail.impurity).indexOf(
                 '.'
@@ -1670,7 +1673,7 @@
               2)
           ) {
             this.$message({
-              message: '杂质（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '杂质（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1686,7 +1689,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.mildewGrain < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.mildewGrain < 0 ||
             this.deptBudgetList.warehouseInOutDetail.mildewGrain > 40 ||
             (String(this.deptBudgetList.warehouseInOutDetail.mildewGrain).indexOf(
                 '.'
@@ -1700,7 +1703,7 @@
               2)
           ) {
             this.$message({
-              message: '霉变粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '霉变粒（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1717,7 +1720,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.jiaorenli < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.jiaorenli < 0 ||
             this.deptBudgetList.warehouseInOutDetail.jiaorenli > 40 ||
             (String(this.deptBudgetList.warehouseInOutDetail.jiaorenli).indexOf(
                 '.'
@@ -1730,7 +1733,7 @@
               2)
           ) {
             this.$message({
-              message: '热损伤（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '热损伤（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1747,7 +1750,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.imperfectGrain < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.imperfectGrain < 0 ||
             this.deptBudgetList.warehouseInOutDetail.imperfectGrain > 40 ||
             (String(
                 this.deptBudgetList.warehouseInOutDetail.imperfectGrain
@@ -1761,7 +1764,7 @@
               2)
           ) {
             this.$message({
-              message: '不完善粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '不完善粒（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return

src/views/warehouse/warehouseManagementIossRecord.vue

@@ -74,7 +74,7 @@
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="qualityInspector" label="内勤">
+        <el-table-column prop="qualityInspector" label="操作人">
         </el-table-column>
         <el-table-column prop="createDate" label="录入时间"> </el-table-column>
       </el-table>

src/views/warehouse/warehouseManagementList.vue

@@ -45,7 +45,7 @@
       </template>
     </BaseHeaderLayout>
     <div v-show="this.warehouseType == '1'" class="main_css">
-      <el-table show-summary :summary-method="getSummaries" class="wenzi" :data="warehouseList"
+      <el-table ref='table' show-summary :summary-method="getSummaries" class="wenzi" :data="warehouseList"
         style="width: 100%; margin-top: 20px" height="calc(100% - 45px)">
         <el-table-column prop="warehouseName" label="仓库名">
         </el-table-column>
@@ -836,8 +836,8 @@
         this.$router.push({
           path: 'tranManagementWarehouseInOutTask',
           query: {
-            stringList: arr,
-            warehouseBaseInfoList: JSON.stringify(this.list)
+            // stringList: arr,
+            // warehouseBaseInfoList: JSON.stringify(this.list)
           }
         })
         // this.$router.push({ path: 'tranManagementWarehouseInOutTask',query:{warehouseBaseInfoList:JSON.stringify(this.list)} })
@@ -914,6 +914,10 @@
 
             }
             this.warehouseList = response
+            this.$nextTick(() => {
+                this.$refs.table.doLayout();
+                // el-table加ref="multipleTable"
+            });
           })
         getsponsible({
             compId: localStorage.getItem('ws-pf_compId')

src/views/warehouse/warehouseManagementNoComplete.vue

@@ -84,7 +84,7 @@
 					<el-table-column prop="titleNoOther" label="封号-2">
 					</el-table-column>
           <el-table-column prop="agent" label="经办人"> </el-table-column>
-          <el-table-column prop="backOffice" label="内勤"> </el-table-column>
+          <el-table-column prop="backOffice" label="操作人"> </el-table-column>
           <el-table-column prop="updateDate" label="保存时间">
           </el-table-column>
           <el-table-column prop="address" label="操作" width="200">

src/views/warehouse/warehouseManagementNoWeight.vue

@@ -70,7 +70,7 @@
             <el-table-column prop="shipName" label="船名">
             </el-table-column>
             <el-table-column prop="agent" label="经办人"> </el-table-column>
-            <el-table-column prop="backOffice" label="内勤"> </el-table-column>
+            <el-table-column prop="backOffice" label="操作人"> </el-table-column>
             <el-table-column prop="updateDate" label="保存时间">
             </el-table-column>
             <el-table-column prop="address" label="操作" width="200">
@@ -292,7 +292,9 @@
               deductionAmount: row.deductionAmount,
               deductionWeight: row.deductionWeight,
               allowEdit: row.allowEdit,
-              automaticWeightAcquisition: row.automaticWeightAcquisition
+              automaticWeightAcquisition: row.automaticWeightAcquisition,
+              outType:row.outType,//运输类型
+              carId:row.carId,//派车id
             },
           })
         } else if (row.inOutFlag == 1) {
@@ -340,7 +342,9 @@
               deductionAmount: row.deductionAmount,
               deductionWeight: row.deductionWeight,
               allowEdit: row.allowEdit,
-              automaticWeightAcquisition: row.automaticWeightAcquisition
+              automaticWeightAcquisition: row.automaticWeightAcquisition,
+              outType:row.outType,//运输类型
+              carId:row.carId,//派车id
             },
           })
         }

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -28,7 +28,7 @@
             <div class="car-type">皮重</div>
             <!-- <div class="weight">{{deptBudgetList.grossWeight}} <span class="kg-style">kg</span></div> -->
             <div class="weight">
-              {{ dataList.tare }} <span class="kg-style">kg</span>
+              {{ tare }} <span class="kg-style">kg</span>
             </div>
             <div class="car-no">{{ dataList.carNo }}</div>
           </div>
@@ -41,7 +41,7 @@
               <!--任务编号-->
               <ws-form-item label="任务编号" span="1" prop="inOutTaskNo">
                 <el-select filterable clearable v-model="dataList.inOutTaskNo" placeholder="请选择任务编号" class="typeselect"
-                  @change="contractNoChange" filterable clearable>
+                  @change="contractNoChange">
                   <el-option v-for="item in deptBudgetList2" :key="item.inOutTaskNo" :label="item.inOutTaskNo"
                     :value="item.inOutTaskNo" />
                 </el-select>
@@ -107,7 +107,7 @@
                   value-format="yyyy-MM-dd">
                 </el-date-picker>
               </ws-form-item>
-              <!--经办人-->
+             <!-- 经办人  -->
               <ws-form-item label="经办人" span="1" prop="agent">
                 <el-select v-model="dataList.agent" placeholder="请选择经办人" filterable clearable @change="selectstaff">
                   <el-option v-for="item in options" :key="item.value" :label="item.staffName"
@@ -541,6 +541,7 @@
             value: '3',
           },
         ],
+        tare:"",
       }
     },
     mounted() {},
@@ -560,6 +561,7 @@
       this.dataList.warehouseName = this.$route.query.warehouseName
       this.dataList.binNumber = this.$route.query.binNumber
       this.dataList.tare = Math.round(this.$route.query.tare * 1000)
+      this.tare = this.dataList.tare
       this.dataList.netWeight = Math.round(this.$route.query.netWeight * 1000)
       this.dataList.grade = this.$route.query.grade
       this.dataList.agent = this.$route.query.agent
@@ -568,6 +570,7 @@
       this.dataList.titleNo = this.$route.query.titleNo
       this.dataList.titleNoOther = this.$route.query.titleNoOther
       this.dataList.carNo = this.$route.query.carNo
+      this.dataList.carId = this.$route.query.carId
       this.dataList.inOutDate = this.$route.query.inOutDate
       this.dataList.contractNo = this.$route.query.contractNo
       this.dataList.inOutType = this.$route.query.inOutType
@@ -584,6 +587,7 @@
       this.dataList.cost = this.$route.query.cost
       this.dataList.freight = this.$route.query.freight
       this.dataList.type = this.$route.query.type
+      this.dataList.outType = this.$route.query.outType//运输方式
       this.dataList.buckleWeightRatio = this.$route.query.buckleWeightRatio
       this.dataList.tidalGrainWater = this.$route.query.tidalGrainWater
       this.dataList.solidGrainWater = this.$route.query.solidGrainWater
@@ -653,6 +657,7 @@
         for (let i = 0; i < this.tranCarInfoList.length; i++) {
           if (this.tranCarInfoList[i].carNo == this.dataList.carNo) {
             this.dataList.tranCarNo = this.tranCarInfoList[i].tranCarNo
+            this.dataList.carId = this.tranCarInfoList[i].id
             this.dataList.freight = this.tranCarInfoList[i].tranPrice
           }
           if(this.dataList.inOutType=='移库入库'){
@@ -846,7 +851,6 @@
       },
       //提交按钮
       submit() {
-
         if (this.reader) {
           this.reader.cancel()
         }
@@ -1448,6 +1452,7 @@
         })
       },
       tarechange(e) {
+        this.tare = this.dataList.tare
         if (this.dataList.grossWeight && this.dataList.tare) {
           this.dataList.netWeight = Number(
             this.dataList.grossWeight - this.dataList.tare
@@ -1765,11 +1770,6 @@
     height: 2000px;
     margin: 0 auto;
   }
-
-  /deep/.el-form-item__label {
-    width: 160px;
-  }
-
   .inspector {
     width: 50%;
   }

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -27,7 +27,7 @@
           <div class="top">
             <div class="car-type">毛重</div>
             <div class="weight">
-              {{ dataList.grossWeight }}
+              {{ grossWeight }}
               <span class="kg-style">kg</span>
             </div>
             <!-- <div class="weight">{{dataList.tare}} <span class="kg-style">kg</span></div> -->
@@ -184,13 +184,15 @@
               dataList.outType == '汽运' ||
               dataList.outType == '集装箱船'
             ">
-                <ws-input v-if="!carstatus" v-model="dataList.carNo" placeholder="请输入车牌号" maxlength="7" size="small" />
-                <el-select v-if="carstatus" filterable clearable :filter-method="dataFilter2" v-model="dataList.carNo"
-                  placeholder="请选择车牌号" class="typeselect" @change="carChange">
-                  <el-option v-for="item in options2" :key="item.constKey"
-                    :label="item.carNo + '(' + item.tranCarNo + ')'" :value="item.carNo" />
+                <ws-input v-if="!carstatus || carjudge" v-model="dataList.carNo" placeholder="请输入车牌号" maxlength="7" size="small" />
+                <el-select v-else filterable clearable :filter-method="dataFilter2" v-model="dataList.carNo" placeholder="请选择车牌号" class="typeselect" @change="carChange">
+                  <el-option v-for="item in options2" :key="item.constKey" :label="item.carNo + '(' + item.tranCarNo + ')'" :value="item.carNo" />
                 </el-select>
-                 <span style='padding-left:10px;'>发货重量（吨）：{{dataList.loadNetWeight}}</span>
+                 <!-- <span style='padding-left:10px;'>发货重量（吨）：{{dataList.loadNetWeight}}</span> -->
+                  <el-button type="primary" @click="carNoTypeChange" v-if="carstatus">{{carChange1}}</el-button>
+              </ws-form-item>
+              <ws-form-item label="发货重量（吨）：" span="1" prop="loadNetWeight">
+                 <ws-input v-model="dataList.loadNetWeight" placeholder="暂无获取到发货重量" maxlength="10" disabled size="small" />
               </ws-form-item>
 
               <ws-form-item label="车号" span="1" prop="carNo" v-if="dataList.outType == '火运'">
@@ -458,6 +460,7 @@
           inOutDate: '',
           inOutType: '',
           goodsName: '',
+          selfLoading:"0",
           warehouseInOutDetail: {
             qualityInspector: '',
           },
@@ -483,6 +486,9 @@
         param: 9600,
         allowEdit: true,
         result1: '00',
+        grossWeight:"",//显示的毛重
+        carChange1:"手动填写",
+        carjudge:false
       }
     },
     mounted() {},
@@ -496,6 +502,7 @@
       this.deptBudgetList1.binNumber = this.$route.query.binNumber
       this.dataList.id = this.$route.query.id
       this.dataList.grossWeight = Math.round(this.$route.query.grossWeight * 1000)
+      this.grossWeight =  this.dataList.grossWeight
       this.dataList.contractNo = this.$route.query.contractNo
       this.dataList.baseId = this.$route.query.baseId
       this.dataList.positionId = this.$route.query.positionId
@@ -510,6 +517,7 @@
       this.dataList.grade = this.$route.query.grade
       this.dataList.agent = this.$route.query.agent
       this.dataList.carNo = this.$route.query.carNo
+      this.dataList.carId = this.$route.query.carId//派车id初始化默认一下（解决第一次进来无carid）
       this.dataList.inOutDate = this.$route.query.inOutDate
       this.dataList.contractNo = this.$route.query.contractNo
       this.dataList.inOutType = this.$route.query.inOutType
@@ -521,6 +529,8 @@
       this.dataList.inOutTypeKey = Number(this.$route.query.inOutTypeKey)
       this.dataList.statusFlag = this.$route.statusFlag
       this.dataList.warehouseInOutDetail = this.$route.query.warehouseInOutDetail
+      this.dataList.outType = this.$route.query.outType//运输方式
+      this.dataList.selfLoading = this.$route.query.selfLoading//
       console.log(this.dataList)
       if (this.$route.query.automaticWeightAcquisition == '1') {
         this.isShowBalance = true
@@ -528,6 +538,17 @@
       this.getList()
     },
     methods: {
+      //切换车牌号输入状态
+      carNoTypeChange(){
+         this.carjudge = !this.carjudge
+        if(!this.carjudge){
+            this.dataList.selfLoading = "0"
+            this.carChange1="手动填写"
+        }else{
+            this.dataList.selfLoading = "1"
+            this.carChange1="识别下拉"
+        }
+      },
       setVal(data) {
         if (this.information == '毛重检斤') {
           this.dataList.grossWeight = data
@@ -722,7 +743,6 @@
       typeChange(e) {},
       //提交按钮
       submit() {
-
         if (this.reader) {
           this.reader.cancel()
         }
@@ -961,7 +981,7 @@
             return
           }
           if (
-            this.dataList.warehouseInOutDetail.waterContent < 1 ||
+            this.dataList.warehouseInOutDetail.waterContent < 0 ||
             this.dataList.warehouseInOutDetail.waterContent > 40 ||
             (String(this.dataList.warehouseInOutDetail.waterContent).indexOf(
                 '.'
@@ -974,7 +994,7 @@
               2)
           ) {
             this.$message({
-              message: '水分（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '水分（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -991,7 +1011,7 @@
             return
           }
           if (
-            this.dataList.warehouseInOutDetail.impurity < 1 ||
+            this.dataList.warehouseInOutDetail.impurity < 0 ||
             this.dataList.warehouseInOutDetail.impurity > 40 ||
             (String(this.dataList.warehouseInOutDetail.impurity).indexOf('.') !=
               -1 &&
@@ -1003,7 +1023,7 @@
               2)
           ) {
             this.$message({
-              message: '杂质（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '杂质（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1019,7 +1039,7 @@
             return
           }
           if (
-            this.dataList.warehouseInOutDetail.mildewGrain < 1 ||
+            this.dataList.warehouseInOutDetail.mildewGrain < 0 ||
             this.dataList.warehouseInOutDetail.mildewGrain > 40 ||
             (String(this.dataList.warehouseInOutDetail.mildewGrain).indexOf(
                 '.'
@@ -1032,7 +1052,7 @@
               2)
           ) {
             this.$message({
-              message: '霉变粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '霉变粒（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1049,7 +1069,7 @@
             return
           }
           if (
-            this.dataList.warehouseInOutDetail.jiaorenli < 1 ||
+            this.dataList.warehouseInOutDetail.jiaorenli < 0 ||
             this.dataList.warehouseInOutDetail.jiaorenli > 40 ||
             (String(this.dataList.warehouseInOutDetail.jiaorenli).indexOf('.') !=
               -1 &&
@@ -1061,7 +1081,7 @@
               2)
           ) {
             this.$message({
-              message: '热损伤（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '热损伤（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1078,7 +1098,7 @@
             return
           }
           if (
-            this.dataList.warehouseInOutDetail.imperfectGrain < 1 ||
+            this.dataList.warehouseInOutDetail.imperfectGrain < 0 ||
             this.dataList.warehouseInOutDetail.imperfectGrain > 40 ||
             (String(this.dataList.warehouseInOutDetail.imperfectGrain).indexOf(
                 '.'
@@ -1091,7 +1111,7 @@
               2)
           ) {
             this.$message({
-              message: '不完善粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '不完善粒（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1127,6 +1147,10 @@
             return
           }
         }
+        if(!this.carstatus){//若自运的合同该字段置空
+          this.deptBudgetList.selfLoading = ""
+        }
+        console.log("查看carId",this.dataList)
         this.$confirm(`确定提交毛重检斤`, {
             cancelButtonText: '取消',
             confirmButtonText: '确定',
@@ -1213,6 +1237,7 @@
         }
       },
       grossWeightchange(e) {
+        this.grossWeight = this.dataList.grossWeight
         if (this.dataList.grossWeight && this.dataList.tare) {
           this.dataList.netWeight = Number(
             this.dataList.grossWeight - this.dataList.tare

src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -280,14 +280,14 @@
             "
           >
             <ws-input
-              v-if="!carstatus"
+              v-if="!carstatus || carjudge"
               v-model="dataList.carNo"
               placeholder="请输入车牌号"
               maxlength="7"
               size="small"
             />
             <el-select
-              v-if="carstatus"
+              v-else
               filterable
               clearable
               :filter-method="dataFilter2"
@@ -303,6 +303,7 @@
                 :value="item.carNo"
               />
             </el-select>
+             <el-button type="primary" @click="carNoTypeChange" v-if="carstatus">{{carChange1}}</el-button>
           </ws-form-item>
               <!--船名  -->
               <ws-form-item
@@ -676,6 +677,7 @@ export default {
         pureWeight:'',
         deductionAmount:'',
         deductionWeigh:'',
+        selfLoading:"0"
       },
       historyList: [],
 
@@ -685,6 +687,8 @@ export default {
         },
       },
       accessoryTFs: false,
+        carChange1:"手动填写",
+        carjudge:false
     }
   },
   activated() {
@@ -720,9 +724,21 @@ export default {
     this.dataList.inOutTypeKey = Number(this.$route.query.inOutTypeKey)
     this.dataList.statusFlag = this.$route.statusFlag
     this.dataList.warehouseInOutDetail = this.$route.query.warehouseInOutDetail
+     this.dataList.selfLoading = this.$route.query.selfLoading
     console.log(this.dataList)
   },
   methods: {
+    //切换车牌号输入状态
+      carNoTypeChange(){
+        this.carjudge = !this.carjudge
+        if(!this.carjudge){
+            this.dataList.selfLoading = "0"
+            this.carChange1="手动填写"
+        }else{
+            this.dataList.selfLoading = "1"
+            this.carChange1="识别下拉"
+        }
+      },
     imgBig(item){
       console.log(item)
       this.img=item
@@ -1213,6 +1229,9 @@ export default {
           return
         }
       }
+      if(!this.carstatus){//若自运的合同该字段置空
+          this.dataList.selfLoading = ""
+        }
       this.$refs.dataList.validate((valid) => {
         if (valid) {
           this.dataList.compId = localStorage.getItem('ws-pf_compId')

src/views/warehouse/warehouseManagementRecord.vue

@@ -17,6 +17,7 @@
 				<span style="color: #323233">{{ deptBudgetList.warehouseName }}</span>
 				<div class="ware" v-show="warehouseType==1">
 					<!-- {{binNumber}}仓位(容量{{capacity}}吨) -->
+					<span class="binNo">仓位号：</span>
 					<el-select filterable clearable v-model="binNumber" placeholder="请选择仓位" class="typeselect"
               @change="binNumberChange">
 			  <el-option  key="" label="全部仓位"
@@ -121,7 +122,7 @@
 						</template>
 					</el-table-column>
 					<el-table-column prop="binNumber" label="仓位号" width="60px"> </el-table-column>
-					<el-table-column prop="goodsName" label="货名" width="60px"> </el-table-column>
+					<el-table-column prop="goodsName" label="货名" width="100"> </el-table-column>
 					<!-- <el-table-column prop="type" label="类型" width="60px"> </el-table-column> -->
 					<el-table-column prop="grossWeight" label="毛重（吨）" >
 						
@@ -130,7 +131,7 @@
 					<el-table-column prop="deductionWeight" label="扣重（吨）"> </el-table-column>
 					<el-table-column prop="netWeight" label="净重（吨）"></el-table-column>
 					<el-table-column prop="pureWeight" label="纯重（吨）"> </el-table-column>
-					<el-table-column prop="deductionAmount" label="扣款（元/吨）" width="150"> </el-table-column>
+					<el-table-column prop="deductionAmount" label="扣款（元/吨）" width="100"> </el-table-column>
 					<el-table-column prop="grade" label="品级" width="80px">
 						<template slot-scope="scope">
 							<span v-if="scope.row.grade == '一等品'" class="top-grade">{{
@@ -153,7 +154,7 @@
 						</template>
 					</el-table-column>
 					<el-table-column prop="inOutType" label="类型"> </el-table-column>
-					<el-table-column prop="contractNo" label="合同编号">
+					<el-table-column prop="contractNo" label="合同编号" width="180">
 						<template slot-scope="scope">
 							<span style="color: #8890b1">{{ scope.row.contractNo }}</span>
 						</template>
@@ -1156,4 +1157,9 @@
 	/deep/.el-table td , /deep/.el-table .el-table__header .cell{
 		text-align: center;
 	}
+	.binNo{
+		color: #333;
+		font-size: 18px;
+		margin-left: 20px;
+	}
 </style>

src/views/warehouse/warehouseManagementTare.vue

@@ -27,7 +27,7 @@
             <div class="car-type">皮重</div>
             <!-- <div class="weight">{{deptBudgetList.grossWeight}} <span class="kg-style">kg</span></div> -->
             <div class="weight">
-              {{ deptBudgetList.tare }} <span class="kg-style">kg</span>
+              {{ tare }} <span class="kg-style">kg</span>
             </div>
             <div class="car-no">{{ deptBudgetList.carNo }}</div>
           </div>
@@ -171,17 +171,13 @@
                 </el-select>
               </ws-form-item>
 
-              <ws-form-item label="车牌号" span="1" prop="carNo" v-if="
-              deptBudgetList.outType == '汽运' ||
-              deptBudgetList.outType == '集装箱船'
-            ">
-                <ws-input v-if="!carstatus" v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7"
-                  size="small" />
-                <el-select v-if="carstatus" filterable clearable :filter-method="dataFilter2"
-                  v-model="deptBudgetList.carNo" placeholder="请选择车牌号" class="typeselect" @change="carChange">
+              <ws-form-item label="车牌号" span="1" prop="carNo" v-if="deptBudgetList.outType == '汽运' || deptBudgetList.outType == '集装箱船'">
+                <ws-input v-if="!carstatus || carjudge" v-model="deptBudgetList.carNo" placeholder="请输入车牌号" maxlength="7" size="small" />
+                <el-select v-else filterable clearable :filter-method="dataFilter2" v-model="deptBudgetList.carNo" placeholder="请选择车牌号" class="typeselect" @change="carChange">
                   <el-option v-for="item in options2" :key="item.constKey"
                     :label="item.carNo + '(' + item.tranCarNo + ')'" :value="item.carNo" />
                 </el-select>
+                <el-button type="primary" @click="carNoTypeChange" v-if="carstatus">{{carChange1}}</el-button>
               </ws-form-item>
 
               <ws-form-item label="车号" span="1" prop="carNo" v-if="deptBudgetList.outType == '火运'">
@@ -400,6 +396,7 @@
           grossWeight: '',
           tare: '',
           inOutDate: '',
+          selfLoading:"0",
         },
         weightbills: {},
         historyList: [],
@@ -431,6 +428,10 @@
             value: '3',
           },
         ],
+        tare:"",//显示的皮重
+        carChange1:"手动填写",
+        carjudge:false,
+        options2:[],
       }
     },
     mounted() {
@@ -467,6 +468,17 @@
       }
     },
     methods: {
+      //切换车牌号输入状态
+      carNoTypeChange(){
+        this.carjudge = !this.carjudge
+        if(!this.carjudge){
+            this.deptBudgetList.selfLoading = "0"
+            this.carChange1="手动填写"
+        }else{
+            this.deptBudgetList.selfLoading = "1"
+            this.carChange1="识别下拉"
+        }
+      },
       setVal(data) {
         if (this.information == '毛重检斤') {
           this.deptBudgetList.grossWeight = data
@@ -765,7 +777,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.waterContent < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.waterContent < 0 ||
             this.deptBudgetList.warehouseInOutDetail.waterContent > 40 ||
             (String(
                 this.deptBudgetList.warehouseInOutDetail.waterContent
@@ -779,7 +791,7 @@
               2)
           ) {
             this.$message({
-              message: '水分（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '水分（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -796,7 +808,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.impurity < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.impurity < 0 ||
             this.deptBudgetList.warehouseInOutDetail.impurity > 40 ||
             (String(this.deptBudgetList.warehouseInOutDetail.impurity).indexOf(
                 '.'
@@ -809,7 +821,7 @@
               2)
           ) {
             this.$message({
-              message: '杂质（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '杂质（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -825,7 +837,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.mildewGrain < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.mildewGrain < 0 ||
             this.deptBudgetList.warehouseInOutDetail.mildewGrain > 40 ||
             (String(this.deptBudgetList.warehouseInOutDetail.mildewGrain).indexOf(
                 '.'
@@ -839,7 +851,7 @@
               2)
           ) {
             this.$message({
-              message: '霉变粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '霉变粒（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -856,7 +868,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.jiaorenli < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.jiaorenli < 0 ||
             this.deptBudgetList.warehouseInOutDetail.jiaorenli > 40 ||
             (String(this.deptBudgetList.warehouseInOutDetail.jiaorenli).indexOf(
                 '.'
@@ -869,7 +881,7 @@
               2)
           ) {
             this.$message({
-              message: '热损伤（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '热损伤（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -886,7 +898,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.imperfectGrain < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.imperfectGrain < 0 ||
             this.deptBudgetList.warehouseInOutDetail.imperfectGrain > 40 ||
             (String(
                 this.deptBudgetList.warehouseInOutDetail.imperfectGrain
@@ -900,7 +912,7 @@
               2)
           ) {
             this.$message({
-              message: '不完善粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '不完善粒（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1245,7 +1257,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.waterContent < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.waterContent < 0 ||
             this.deptBudgetList.warehouseInOutDetail.waterContent > 40 ||
             (String(
                 this.deptBudgetList.warehouseInOutDetail.waterContent
@@ -1259,7 +1271,7 @@
               2)
           ) {
             this.$message({
-              message: '水分（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '水分（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1276,7 +1288,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.impurity < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.impurity < 0 ||
             this.deptBudgetList.warehouseInOutDetail.impurity > 40 ||
             (String(this.deptBudgetList.warehouseInOutDetail.impurity).indexOf(
                 '.'
@@ -1289,7 +1301,7 @@
               2)
           ) {
             this.$message({
-              message: '杂质（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '杂质（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1305,7 +1317,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.mildewGrain < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.mildewGrain < 0 ||
             this.deptBudgetList.warehouseInOutDetail.mildewGrain > 40 ||
             (String(this.deptBudgetList.warehouseInOutDetail.mildewGrain).indexOf(
                 '.'
@@ -1319,7 +1331,7 @@
               2)
           ) {
             this.$message({
-              message: '霉变粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '霉变粒（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1336,7 +1348,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.jiaorenli < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.jiaorenli < 0 ||
             this.deptBudgetList.warehouseInOutDetail.jiaorenli > 40 ||
             (String(this.deptBudgetList.warehouseInOutDetail.jiaorenli).indexOf(
                 '.'
@@ -1349,7 +1361,7 @@
               2)
           ) {
             this.$message({
-              message: '热损伤（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '热损伤（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1366,7 +1378,7 @@
             return
           }
           if (
-            this.deptBudgetList.warehouseInOutDetail.imperfectGrain < 1 ||
+            this.deptBudgetList.warehouseInOutDetail.imperfectGrain < 0 ||
             this.deptBudgetList.warehouseInOutDetail.imperfectGrain > 40 ||
             (String(
                 this.deptBudgetList.warehouseInOutDetail.imperfectGrain
@@ -1380,7 +1392,7 @@
               2)
           ) {
             this.$message({
-              message: '不完善粒（%）输入错误! 取值范围1-40之间且可以保留2小数',
+              message: '不完善粒（%）输入错误! 取值范围0-40之间且可以保留2小数',
               type: 'warning',
             })
             return
@@ -1417,6 +1429,9 @@
             return
           }
         }
+        if(!this.carstatus){//若自运的合同该字段置空
+          this.deptBudgetList.selfLoading = ""
+        }
         this.$confirm(`确定提交出库信息`, {
           cancelButtonText: '取消',
           confirmButtonText: '确定',
@@ -1496,6 +1511,7 @@
         })
       },
       tarechange(e) {
+        this.tare = this.deptBudgetList.tare
         if (this.deptBudgetList.grossWeight && this.deptBudgetList.tare) {
           this.deptBudgetList.netWeight = Number(
             this.deptBudgetList.grossWeight - this.deptBudgetList.tare

src/views/workNotification/components/MessageItem.vue

@@ -129,7 +129,8 @@ export default {
       const url = utils.code2Url(
         this.info.businessType,
         this.info.businessCode,
-        this.info.acceptanceType
+        this.info.acceptanceType,
+        this.info.messageContent
       )
       if (!url) {
         EventBus.$emit('error', this.$t('workNotification.noRelatedType'))

src/views/workNotification/components/WorkNotificationItem.vue

@@ -158,6 +158,7 @@ export default {
       }
     },
     checkType () {
+      console.log(this.info)
       return utils.code2Url(this.info.businessType, this.info.businessCode, this.info.acceptanceType);
     },
   }

src/views/workNotification/utils/index.js

@@ -1,8 +1,9 @@
 import HandleType from '../types/handleType'
 
+import { gettaskInfo } from '@/model/indexRx'
 // 根据业务类型和业务码获取对应url
-export function code2Url (type, code, state) {
-  console.log(type,code)
+export function code2Url (type, code, state,status,message,businessId) {
+  console.log(type,code, state,message)
   switch (type) {
     // 判断 出入库
     case 'INOUTTASK':
@@ -26,17 +27,41 @@ export function code2Url (type, code, state) {
       return warehouseReceiptRegulation(code, state)
     case 'ROLE':
       return stock(code, state)
-    case 'TRANSPORTATION':
-      return trantask(code,state)
+    case 'TRANSPORTATIONTASK':
+      return trantask(code,state,message)
+    case 'WAREHOUSE':
+      return warehousetask(code,state)
     default:
       return ''
   }
 }
 // 运输任务
-export function trantask(code, state){
+export function trantask(code, state,message){
   let url = ''
   switch (code) {
-    case 'TRANSPORTATION-SETTLEMENT-REPORT':
+    case 'TRANTASK-APPROVE':
+
+      if(message.indexOf('汽运')!=-1){
+        url = 'vehicleDispatching'
+        break
+      }
+      if(message.indexOf('火运')!=-1){
+        url = 'fireDispatching'
+        break
+      }
+      if(message.indexOf('船运')!=-1){
+        url = 'shippingDispatching'
+        break
+      }
+  }
+   return url
+}
+export function warehousetask(code, state){
+  let url = ''
+  switch (code) {
+    
+    // 出入库任务
+    case 'INOUTTASK-TASK-APPROVE':
       url = 'tranManagementWarehouseInOutTask'
       break
   }