修改表格自适应高度

src/App.vue

@@ -118,6 +118,9 @@ input[type='number'] {
   background-color: #5473E8!important;
 }
 .el-pagination{
-  padding: 0!important;
+  padding: 20px!important;
+}
+.container{
+  overflow: auto;
 }
 </style>

src/styles/media.scss

@@ -83,6 +83,7 @@
   box-sizing: border-box;
   padding: 10px;
   height:100%;
+  // overflow: scroll;
 }
 
 .winseaview-footer {

src/views/contractManagement/futuresPurchaseContract.vue

@@ -1,110 +1,110 @@
 <!--期货采购合同-->
 <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 v-model="searchKeyWord" @keyup.enter.native="find()" 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 v-model="searchKeyWord" @keyup.enter.native="find()" 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="780">
-			<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="" />
-				</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="" />
+        </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" height="17" style="
+          <img width="16" height="17" style="
               vertical-align: text-top;
               position: relative;
               top: -1px;
@@ -112,771 +112,768 @@
             " 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 {
-				id:'',
-				size: 10,
-				// 是否显示
-				showType: true,
-				// 年
-				year: '',
-				deliver_type: 1,
-				deptBudgetTotal: 0,
-				currentPage: 1,
-				pageSize: 10,
-				appendixIdsAdd: '',
-				searchType: 1,
-				searchTypeText: '未完成',
-				searchKeyWord: '',
-				contractType: 2,
-				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'),
-				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
-							}
-						}
-					})
-			},
-			// 上传附件
-			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.appendixIdss = row.addressUrl
-				console.log(this.appendixIdss)
-				this.accessoryTFs = true
-			},
-			handleExamine(row) {
-				console.log(row)
-				this.$router.push({
-					name: 'futuresPurchaseContractExamine',
-					query: {
-						id: row.id,
-						status: row.status
-					},
-				})
-			},
-			handleAdd() {
-				this.$router.push({
-					path: 'futuresPurchaseContractAdd'
-				})
-			},
-			handleEdit(row) {
-				this.$router.push({
-					name: 'futuresPurchaseContractEdit',
-					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 {
+        id: '',
+        size: 10,
+        // 是否显示
+        showType: true,
+        // 年
+        year: '',
+        deliver_type: 1,
+        deptBudgetTotal: 0,
+        currentPage: 1,
+        pageSize: 10,
+        appendixIdsAdd: '',
+        searchType: 1,
+        searchTypeText: '未完成',
+        searchKeyWord: '',
+        contractType: 2,
+        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'),
+        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
+              }
+            }
+          })
+      },
+      // 上传附件
+      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.appendixIdss = row.addressUrl
+        console.log(this.appendixIdss)
+        this.accessoryTFs = true
+      },
+      handleExamine(row) {
+        console.log(row)
+        this.$router.push({
+          name: 'futuresPurchaseContractExamine',
+          query: {
+            id: row.id,
+            status: row.status
+          },
+        })
+      },
+      handleAdd() {
+        this.$router.push({
+          path: 'futuresPurchaseContractAdd'
+        })
+      },
+      handleEdit(row) {
+        this.$router.push({
+          name: 'futuresPurchaseContractEdit',
+          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/futuresSalesContract.vue

@@ -31,7 +31,7 @@
             " src="../../../public/img/sousuo.png" alt="" /></ws-button>
 			</template>
 		</BaseHeaderLayout>
-		<el-table class="wenzi" :data="contractList.records" style="width: 100%; margin-top: 10px" height="780">
+		<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>

src/views/contractManagement/purchaseContract.vue

@@ -30,7 +30,7 @@
             " 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% - 75px)">
+    <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>

src/views/customer/customerList.vue

@@ -4,71 +4,32 @@
     <BaseHeaderLayout :leftSpan="8">
       <template slot="left"> </template>
       <template slot="left">
-        <ws-input
-          v-model="searchKeyWord"
-          placeholder="可按客户名称、电话查找"
-          clearable
-          maxlength="500"
-          type="input"
-          class="findValue"
-          @keyup.enter.native="find()"
-        ></ws-input>
-        <ws-button class="find" type="primary" @click="find()"
-          ><img
-            width="16"
-            height="16"
-            style="
+        <ws-input v-model="searchKeyWord" placeholder="可按客户名称、电话查找" clearable maxlength="500" type="input"
+          class="findValue" @keyup.enter.native="find()"></ws-input>
+        <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>
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button>
 
         <!--设置默认定金比例-->
-        <el-button
-          class="bg-bottom"
-          type="primary"
-          size="small"
-          @click="installRatio()"
-        >
-          默认定金比例</el-button
-        >
-        <el-dialog
-          width="25%"
-          title="设置默认定金比例"
-          :visible.sync="outerVisibleDefaultEdit"
-          :append-to-body="true"
-        >
+        <el-button class="bg-bottom" type="primary" size="small" @click="installRatio()">
+          默认定金比例</el-button>
+        <el-dialog width="25%" title="设置默认定金比例" :visible.sync="outerVisibleDefaultEdit" :append-to-body="true">
           <div style="width: 50%">
             <div class="dingjin">定金比例(元/吨)</div>
-            <el-input
-              type="textarea"
-              :rows="2"
-              placeholder="请输入定金比例"
-              v-model="depositRatio"
-            >
+            <el-input type="textarea" :rows="2" placeholder="请输入定金比例" v-model="depositRatio">
             </el-input>
           </div>
           <div slot="footer" class="dialog-footer">
-            <el-button @click="outerVisibleDefaultEdit = false"
-              >取 消</el-button
-            >
-            <el-button type="primary" @click="editDefaultDepositRatio()"
-              >确 定</el-button
-            >
+            <el-button @click="outerVisibleDefaultEdit = false">取 消</el-button>
+            <el-button type="primary" @click="editDefaultDepositRatio()">确 定</el-button>
           </div>
         </el-dialog>
 
         <!--增加定金-->
-        <el-dialog
-          width="30%"
-          title="增加定金"
-          :visible.sync="outerVisibleAdd"
-          :append-to-body="true"
-        >
+        <el-dialog width="30%" title="增加定金" :visible.sync="outerVisibleAdd" :append-to-body="true">
           <div class="addprice">
             已付定金
             <div class="yifudingjin">
@@ -77,13 +38,7 @@
           </div>
           <div class="addpricejine">增加金额</div>
           <div style="width: 50%" class="zengjia">
-            <el-input
-              type="textarea"
-              :rows="2"
-              maxlength="30"
-              placeholder="请输入本次增加定金金额"
-              v-model="money"
-            >
+            <el-input type="textarea" :rows="2" maxlength="30" placeholder="请输入本次增加定金金额" v-model="money">
             </el-input>
             <div class="yuan">元</div>
           </div>
@@ -94,12 +49,7 @@
         </el-dialog>
 
         <!--退回定金-->
-        <el-dialog
-          width="30%"
-          title="退回定金"
-          :visible.sync="outerVisibleReturn"
-          :append-to-body="true"
-        >
+        <el-dialog width="30%" title="退回定金" :visible.sync="outerVisibleReturn" :append-to-body="true">
           <div class="returnprice">
             可退定金
             <div class="ketuidingjin">
@@ -110,13 +60,7 @@
           </div>
           <div class="returnpricejine">退回金额</div>
           <div style="width: 50%" class="tuihui">
-            <el-input
-              type="textarea"
-              :rows="2"
-              maxlength="30"
-              placeholder="请输入本次退回定金金额"
-              v-model="money"
-            >
+            <el-input type="textarea" :rows="2" maxlength="30" placeholder="请输入本次退回定金金额" v-model="money">
             </el-input>
             <div class="yuan">元</div>
           </div>
@@ -127,21 +71,15 @@
         </el-dialog>
       </template>
     </BaseHeaderLayout>
-    <div>
-      <el-table
-        class="wenzi"
-        :data="customerList.records"
-        style="width: 100%"
-        height="680"
-      >
-        <el-table-column prop="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="customerName" label="客户名称">
-          <!-- <template scope="scope">
+    <el-table class="wenzi" :data="customerList.records" style="width: 100%" height="calc(100% - 110px)">
+      <el-table-column prop="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="customerName" label="客户名称">
+        <!-- <template scope="scope">
             <span
               v-if="
                 scope.row.customerName == '' || scope.row.customerName == null
@@ -153,724 +91,724 @@
               >{{ scope.row.customerName }}</span
             >
           </template> -->
-        </el-table-column>
-        <el-table-column prop="compAddress" label="地址"></el-table-column>
-        <el-table-column prop="customerPhone" label="电话"> </el-table-column>
-        <el-table-column width='170' prop="payTaxesCard" label="纳税人识别号">
-          <template scope="scope">
-            <span
-              v-if="
+      </el-table-column>
+      <el-table-column prop="compAddress" label="地址"></el-table-column>
+      <el-table-column prop="customerPhone" label="电话"> </el-table-column>
+      <el-table-column width='170' prop="payTaxesCard" label="纳税人识别号">
+        <template scope="scope">
+          <span v-if="
                 scope.row.payTaxesCard == '' || scope.row.payTaxesCard == null
-              "
-            >
-              — —
-            </span>
-            {{ scope.row.payTaxesCard }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="bankDeposit" label="开户行">
-          <template slot-scope="scope">
-            {{ scope.row.bankDeposit }} - {{ scope.row.bankDepositBranch }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="bankCard" label="银行卡号"> </el-table-column>
-        <el-table-column prop="totalDeposit" label="总定金(元)">
-        </el-table-column>
-        <el-table-column width='150' prop="freezingDeposit" label="冻结定金(元)">
-        </el-table-column>
-        <el-table-column
-         width='150'
-          class="table_td"
-          prop="depositRatio"
-          label="定金比例(元/吨)"
-        >
-          <template slot-scope="scope">
-            <div class="inputChenge">
-              <!-- readonly -->
-              <el-input
-                v-model="scope.row.depositRatio"
-                v-if="scope.row.identification == 'true'"
-              ></el-input>
-              <div v-if="scope.row.identification == 'false'" class="inputs">
-                {{ scope.row.depositRatio }}
-              </div>
+              ">
+            — —
+          </span>
+          {{ scope.row.payTaxesCard }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="bankDeposit" label="开户行">
+        <template slot-scope="scope">
+          {{ scope.row.bankDeposit }} - {{ scope.row.bankDepositBranch }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="bankCard" label="银行卡号"> </el-table-column>
+      <el-table-column prop="totalDeposit" label="总定金(元)">
+      </el-table-column>
+      <el-table-column width='150' prop="freezingDeposit" label="冻结定金(元)">
+      </el-table-column>
+      <el-table-column width='150' class="table_td" prop="depositRatio" label="定金比例(元/吨)">
+        <template slot-scope="scope">
+          <div class="inputChenge">
+            <!-- readonly -->
+            <el-input v-model="scope.row.depositRatio" v-if="scope.row.identification == 'true'"></el-input>
+            <div v-if="scope.row.identification == 'false'" class="inputs">
+              {{ scope.row.depositRatio }}
             </div>
-            <img
-              width="17"
-              height="18"
-              style="vertical-align: text-top; position: relative; top: -1px"
-              src="../../../public/img/edit.png"
-              @click="whether(scope.row)"
-              v-if="scope.row.identification == 'false'"
-              alt=""
-            />
-            <i
-              class="el-icon-check"
-              style="line-height: 29px; margin-left: 10px"
-              v-if="scope.row.identification == 'true'"
-              @click="varietyClick(scope.row)"
-            ></i>
-            <!-- <div>—</div> -->
-          </template>
-        </el-table-column>
-
-        <el-table-column prop="updateDate" label="更新时间"> </el-table-column>
-        <el-table-column prop="seller" label="操作" width="280">
-          <template slot-scope="scope">
-            <el-button
-              type="primary"
-              v-hasPermission="
+          </div>
+          <img width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/edit.png" @click="whether(scope.row)" v-if="scope.row.identification == 'false'"
+            alt="" />
+          <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
+            v-if="scope.row.identification == 'true'" @click="varietyClick(scope.row)"></i>
+          <!-- <div>—</div> -->
+        </template>
+      </el-table-column>
+
+      <el-table-column prop="updateDate" label="更新时间"> </el-table-column>
+      <el-table-column prop="seller" label="操作" width="280">
+        <template slot-scope="scope">
+          <el-button type="primary" v-hasPermission="
             `customerManagement.customer.customerInfo.View`
-          "
-              @click="editClick(1, scope.row)"
-              >增加定金</el-button
-            >
-            <el-button
-              v-hasPermission="
+          " @click="editClick(1, scope.row)">增加定金</el-button>
+          <el-button v-hasPermission="
             `customerManagement.customer.customerInfo.View`
-          "
-              type="primary"
-              @click="editClick(2, scope.row)"
-              >退回定金</el-button
-            >
-          </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>
+          " type="primary" @click="editClick(2, scope.row)">退回定金</el-button>
+        </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>
-import {
-  getList,
-  installDepositRatio,
-  editCustomerInfo,
-} from '@/model/customer/index'
-import Pagination from '@/components/Pagination'
-import WsUpload from '@/components/WsUpload'
-
-export default {
-  name: 'viewSpareMoney',
-  components: {
-    WsUpload,
-    Pagination,
-  },
-  watch: {
-    vesselId(val) {
-      this.getList()
-    },
-    isShow(val) {
-      this.showType = val
+  import {
+    getList,
+    installDepositRatio,
+    editCustomerInfo,
+  } from '@/model/customer/index'
+  import Pagination from '@/components/Pagination'
+  import WsUpload from '@/components/WsUpload'
+
+  export default {
+    name: 'viewSpareMoney',
+    components: {
+      WsUpload,
+      Pagination,
     },
-  },
-  data() {
-    return {
-      //弹出框
-      dialogViewSpareMoney: false,
-      dialogApproveFormVisible: false,
-      // 船舶类型
-      monetaryKey: null,
-      // 表格显示数据
-      tableDate: [],
-      // 是否显示
-      showType: true,
-      // 年
-      year: '',
-      currentPage: 1,
-      pageSize: 10,
-      deptBudgetTotal: 0,
-      searchKeyWord: '',
-      outerVisibleDefaultEdit: false,
-      outerVisibleEdit: false,
-      outerVisibleAdd: false,
-      outerVisibleReturn: false,
-      contractType: 2,
-      searchType: 1,
-      // 提交类型
-      submitType: true,
-      size: 10,
-      spanArr: [],
-      depositRatio: '700',
-      id: '',
-      money: '',
-      compId: localStorage.getItem('ws-pf_compId'),
-      deptCircularPage: {},
-      customerList: [],
-      deptBudgetList: {},
-      historyList: [],
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          return time.getTime() > Date.now()
-        },
+    watch: {
+      vesselId(val) {
+        this.getList()
       },
-      accessoryTFs: false,
-      customerInfo: {
+      isShow(val) {
+        this.showType = val
+      },
+    },
+    data() {
+      return {
+        //弹出框
+        dialogViewSpareMoney: false,
+        dialogApproveFormVisible: false,
+        // 船舶类型
+        monetaryKey: null,
+        // 表格显示数据
+        tableDate: [],
+        // 是否显示
+        showType: true,
+        // 年
+        year: '',
+        currentPage: 1,
+        pageSize: 10,
+        deptBudgetTotal: 0,
+        searchKeyWord: '',
+        outerVisibleDefaultEdit: false,
+        outerVisibleEdit: false,
+        outerVisibleAdd: false,
+        outerVisibleReturn: false,
+        contractType: 2,
+        searchType: 1,
+        // 提交类型
+        submitType: true,
+        size: 10,
+        spanArr: [],
+        depositRatio: '700',
         id: '',
-        compId: '',
-        depositRatio: '',
-        flag: '',
         money: '',
+        compId: localStorage.getItem('ws-pf_compId'),
+        deptCircularPage: {},
+        customerList: [],
+        deptBudgetList: {},
+        historyList: [],
+        pickerBeginDateBefore: {
+          disabledDate: (time) => {
+            return time.getTime() > Date.now()
+          },
+        },
+        accessoryTFs: false,
+        customerInfo: {
+          id: '',
+          compId: '',
+          depositRatio: '',
+          flag: '',
+          money: '',
+          totalDeposit: 0,
+          freezingDeposit: 0,
+        },
         totalDeposit: 0,
         freezingDeposit: 0,
-      },
-      totalDeposit: 0,
-      freezingDeposit: 0,
-    }
-  },
-  activated() {
-    this.getList()
-    this.showType = this.isShow
-  },
-  methods: {
-    //查看//传参
-    nocomplete(row) {
-      this.$router.push({
-        name: 'vehicleDispatchingview',
-        query: {
-          id: row.id,
-        },
-      })
-    },
-    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.accessoryTFs = false
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getList()
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val
-      console.log(`当前页: ${val}`)
-      this.getList()
     },
-    changestatus(state) {
-      this.searchType = state
+    activated() {
       this.getList()
+      this.showType = this.isShow
     },
-    //修改定金比例
-    varietyClick(row) {
-       if (
-        row.depositRatio < 0 ||
-        row.depositRatio > 100000 ||
-        (String(row.depositRatio).indexOf('.') != -1 &&
-          String(row.depositRatio).length -
+    methods: {
+      //查看//传参
+      nocomplete(row) {
+        this.$router.push({
+          name: 'vehicleDispatchingview',
+          query: {
+            id: row.id,
+          },
+        })
+      },
+      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.accessoryTFs = false
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+      changestatus(state) {
+        this.searchType = state
+        this.getList()
+      },
+      //修改定金比例
+      varietyClick(row) {
+        if (
+          row.depositRatio < 0 ||
+          row.depositRatio > 100000 ||
+          (String(row.depositRatio).indexOf('.') != -1 &&
+            String(row.depositRatio).length -
             (String(row.depositRatio).indexOf('.') + 1) >
             2)
-      ) {
-        this.$message({
-          message: '定金比例输入错误',
-          type: 'warning',
-        })
-        return
-      }
-      if (row.depositRatio) {
-        if (isNaN(row.depositRatio)) {
+        ) {
           this.$message({
-            message: '定金比例非数字!',
+            message: '定金比例输入错误',
             type: 'warning',
           })
           return
         }
-      }
-      if (!row.depositRatio) {
-        this.$message({
-          message: '定金比例不能为空！',
-          type: 'warning',
-        })
-        return
-      }
-      this.$confirm(`确定要修改定金比例？`, {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          editCustomerInfo({
-            flag: 0,
-            depositRatio: row.depositRatio,
-            id: row.id,
-          })
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '修改成功',
-              })
-              this.getList()
+        if (row.depositRatio) {
+          if (isNaN(row.depositRatio)) {
+            this.$message({
+              message: '定金比例非数字!',
+              type: 'warning',
             })
-            .catch((response) => {})
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    whether(row) {
-      row.identification = 'true'
-    },
-    //列表查询
-    getList() {
-      getList({
-        compId: localStorage.getItem('ws-pf_compId'),
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        searchKeyWord: this.searchKeyWord,
-        customerTypeFlag: this.customerTypeFlag,
-      })
-        .toPromise()
-        .then((response) => {
-          for (var i = 0; i < response.records.length; i++) {
-            response.records[i].identification = 'false'
+            return
           }
-          this.customerList = response
-          this.deptCircularPage.currentPage = response.current
-          this.deptCircularPage.pageSize = response.size
-          this.deptBudgetTotal = response.total
-        })
-    },
-    //设置默认定金比例
-    installRatio() {
-      this.outerVisibleDefaultEdit = true
-    },
-    editDefaultDepositRatio() {
-      if (
-        this.depositRatio < 1 ||
-        this.depositRatio > 100000 ||
-        (String(this.depositRatio).indexOf('.') != -1 &&
-          String(this.depositRatio).length -
-            (String(this.depositRatio).indexOf('.') + 1) >
-            2)
-      ) {
-        this.$message({
-          message: '默认定金比例输入错误',
-          type: 'warning',
-        })
-        return
-      }
-      if (this.depositRatio) {
-        if (isNaN(this.depositRatio)) {
+        }
+        if (!row.depositRatio) {
           this.$message({
-            message: '默认定金比例非数字!',
+            message: '定金比例不能为空！',
             type: 'warning',
           })
           return
         }
-        if (!this.depositRatio) {
-          this.$message({
-            message: '默认定金比例不能为空！',
+        this.$confirm(`确定要修改定金比例？`, {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
             type: 'warning',
           })
-          return
-        }
-        installDepositRatio({
-          compId: localStorage.getItem('ws-pf_compId'),
-          depositRatio: this.depositRatio,
-        })
+          .then(() => {
+            editCustomerInfo({
+                flag: 0,
+                depositRatio: row.depositRatio,
+                id: row.id,
+              })
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '修改成功',
+                })
+                this.getList()
+              })
+              .catch((response) => {})
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      whether(row) {
+        row.identification = 'true'
+      },
+      //列表查询
+      getList() {
+        getList({
+            compId: localStorage.getItem('ws-pf_compId'),
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            searchKeyWord: this.searchKeyWord,
+            customerTypeFlag: this.customerTypeFlag,
+          })
           .toPromise()
           .then((response) => {
-            this.outerVisibleDefaultEdit = false
-            this.getList()
-            this.$message.success('设置默认定金比例成功')
+            for (var i = 0; i < response.records.length; i++) {
+              response.records[i].identification = 'false'
+            }
+            this.customerList = response
+            this.deptCircularPage.currentPage = response.current
+            this.deptCircularPage.pageSize = response.size
+            this.deptBudgetTotal = response.total
           })
-      }
-    },
-    //编辑
-    editClick(index, row) {
-      this.id = row.id
-      this.depositRatio = row.depositRatio
-      this.totalDeposit = row.totalDeposit
-      this.freezingDeposit = row.freezingDeposit
-
-      //增加定金
-      if (index == 1) {
-        this.outerVisibleAdd = true
-        this.customerInfo.flag = 1
-      }
-      //退回定金
-      else {
-        this.outerVisibleReturn = true
-        this.customerInfo.flag = 2
-      }
-    },
-    editPrice(asdf) {
-      this.customerInfo.id = this.id
-      this.customerInfo.compId = this.compId
-      this.customerInfo.depositRatio = this.depositRatio
-      this.customerInfo.money = this.money
-      this.customerInfo.totalDeposit = this.totalDeposit
-      this.customerInfo.freezingDeposit = this.freezingDeposit
-
-      //增加定金
-      if (asdf == 1) {
+      },
+      //设置默认定金比例
+      installRatio() {
+        this.outerVisibleDefaultEdit = true
+      },
+      editDefaultDepositRatio() {
         if (
-          this.money < 0 ||
-          this.money > 100000000 ||
-          (String(this.money).indexOf('.') != -1 &&
-            String(this.money).length - (String(this.money).indexOf('.') + 1) >
-              2)
+          this.depositRatio < 1 ||
+          this.depositRatio > 100000 ||
+          (String(this.depositRatio).indexOf('.') != -1 &&
+            String(this.depositRatio).length -
+            (String(this.depositRatio).indexOf('.') + 1) >
+            2)
         ) {
           this.$message({
-            message: '增加金额输入错误',
+            message: '默认定金比例输入错误',
             type: 'warning',
           })
           return
         }
-        if (this.money) {
-          if (isNaN(this.money)) {
+        if (this.depositRatio) {
+          if (isNaN(this.depositRatio)) {
             this.$message({
-              message: '增加金额非数字!',
+              message: '默认定金比例非数字!',
               type: 'warning',
             })
             return
           }
+          if (!this.depositRatio) {
+            this.$message({
+              message: '默认定金比例不能为空！',
+              type: 'warning',
+            })
+            return
+          }
+          installDepositRatio({
+              compId: localStorage.getItem('ws-pf_compId'),
+              depositRatio: this.depositRatio,
+            })
+            .toPromise()
+            .then((response) => {
+              this.outerVisibleDefaultEdit = false
+              this.getList()
+              this.$message.success('设置默认定金比例成功')
+            })
         }
-        if (!this.money) {
-          this.$message({
-            message: '增加金额不能为空！',
-            type: 'warning',
-          })
-          return
+      },
+      //编辑
+      editClick(index, row) {
+        this.id = row.id
+        this.depositRatio = row.depositRatio
+        this.totalDeposit = row.totalDeposit
+        this.freezingDeposit = row.freezingDeposit
+
+        //增加定金
+        if (index == 1) {
+          this.outerVisibleAdd = true
+          this.customerInfo.flag = 1
         }
-      }
-      //退回定金
-      if (asdf == 2) {
-        if (
-          this.money < 0 ||
-          this.money > 100000000 ||
-          (String(this.money).indexOf('.') != -1 &&
-            String(this.money).length - (String(this.money).indexOf('.') + 1) >
-              2)
-        ) {
-          this.$message({
-            message: '退回金额输入错误',
-            type: 'warning',
-          })
-          return
+        //退回定金
+        else {
+          this.outerVisibleReturn = true
+          this.customerInfo.flag = 2
         }
-        if (this.money) {
-          if (isNaN(this.money)) {
+      },
+      editPrice(asdf) {
+        this.customerInfo.id = this.id
+        this.customerInfo.compId = this.compId
+        this.customerInfo.depositRatio = this.depositRatio
+        this.customerInfo.money = this.money
+        this.customerInfo.totalDeposit = this.totalDeposit
+        this.customerInfo.freezingDeposit = this.freezingDeposit
+
+        //增加定金
+        if (asdf == 1) {
+          if (
+            this.money < 0 ||
+            this.money > 100000000 ||
+            (String(this.money).indexOf('.') != -1 &&
+              String(this.money).length - (String(this.money).indexOf('.') + 1) >
+              2)
+          ) {
             this.$message({
-              message: '退回金额非数字!',
+              message: '增加金额输入错误',
+              type: 'warning',
+            })
+            return
+          }
+          if (this.money) {
+            if (isNaN(this.money)) {
+              this.$message({
+                message: '增加金额非数字!',
+                type: 'warning',
+              })
+              return
+            }
+          }
+          if (!this.money) {
+            this.$message({
+              message: '增加金额不能为空！',
               type: 'warning',
             })
             return
           }
         }
-        if (!this.money) {
-          this.$message({
-            message: '退回金额不能为空！',
-            type: 'warning',
-          })
-          return
-        }
-        if (this.money > this.totalDeposit - this.freezingDeposit) {
-          this.$message({
-            message: '退回金额不能大于可退金额！',
-            type: 'warning',
-          })
-          return
-        }
-      }
-      editCustomerInfo(this.customerInfo)
-        .toPromise()
-        .then((response) => {
-          this.outerVisibleAdd = false
-          this.outerVisibleReturn = false
-          this.outerVisibleEdit = false
-          this.getList()
-          this.money = ''
-
-          //增加定金
-          if (asdf == 1) {
-            this.$message.success('增加成功')
+        //退回定金
+        if (asdf == 2) {
+          if (
+            this.money < 0 ||
+            this.money > 100000000 ||
+            (String(this.money).indexOf('.') != -1 &&
+              String(this.money).length - (String(this.money).indexOf('.') + 1) >
+              2)
+          ) {
+            this.$message({
+              message: '退回金额输入错误',
+              type: 'warning',
+            })
+            return
           }
-          //退回定金
-          if (asdf == 2) {
-            this.$message.success('退回成功')
+          if (this.money) {
+            if (isNaN(this.money)) {
+              this.$message({
+                message: '退回金额非数字!',
+                type: 'warning',
+              })
+              return
+            }
           }
-        })
-    },
-    find() {
-      this.currentPage = 1
-      this.getList()
+          if (!this.money) {
+            this.$message({
+              message: '退回金额不能为空！',
+              type: 'warning',
+            })
+            return
+          }
+          if (this.money > this.totalDeposit - this.freezingDeposit) {
+            this.$message({
+              message: '退回金额不能大于可退金额！',
+              type: 'warning',
+            })
+            return
+          }
+        }
+        editCustomerInfo(this.customerInfo)
+          .toPromise()
+          .then((response) => {
+            this.outerVisibleAdd = false
+            this.outerVisibleReturn = false
+            this.outerVisibleEdit = false
+            this.getList()
+            this.money = ''
+
+            //增加定金
+            if (asdf == 1) {
+              this.$message.success('增加成功')
+            }
+            //退回定金
+            if (asdf == 2) {
+              this.$message.success('退回成功')
+            }
+          })
+      },
+      find() {
+        this.currentPage = 1
+        this.getList()
+      },
     },
-  },
-}
+  }
 </script>
 <style lang="scss" scoped>
-.connert {
-  width: 90%;
-  margin: 0 auto;
-}
-.vertical-text-left {
-  width: 62px;
-  text-align: right;
-}
-.el-button--primary {
-  background-color: #5878e8;
-  border-color: #5878e8;
-}
-.el-button--primary {
-  background-color: #5878e8;
-  color: #fff;
-}
-.el-button--default {
-  color: #8890b1;
-  border-color: #e8eaf1;
-}
-/deep/.base_header_layout .find.el-button--primary {
-  width: 30px;
-  margin-left: 0;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-}
-/deep/.findValue .el-input__inner {
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
-//操作按钮
-.record,
-.adjustment {
-  display: inline-block;
-  color: #5878e8;
-  padding: 0 4px !important;
-  position: relative;
-  font-size: 14px;
-}
-.record:after {
-  position: absolute;
-  content: '';
-  display: block;
-  top: 5px;
-  right: -2px;
-  width: 1px;
-  height: 12px;
-  background: #e9ecf7;
-}
-//状态样式
-.executory,
-.inExecution,
-.done {
-  width: 6px;
-  height: 6px;
-  display: inline-block;
-  border-radius: 50%;
-  position: relative;
-  top: -1px;
-  font-size: 14px;
-}
-.executory {
-  background: #ff9f24;
-}
-.inExecution {
-  background: #5878e8;
-}
-.done {
-  background: #50cad4;
-}
-.putstorage.el-button--default,
-.deliverystorage.el-button--default {
-  border-color: #8890b1;
-  background-color: #fff;
-  color: #8890b1;
-}
-/deep/.el-table td,
-/deep/.el-table th.is-leaf {
-  border-right: 1px solid #e9ecf7;
-  text-align: center;
-}
-/deep/.el-table tr td:first-child,
-/deep/.el-table tr th.is-leaf:first-child {
-  border-left: 1px solid #e9ecf7;
-}
-.record,
-.adjustment {
-  display: inline-block;
-  color: #5878e8;
-  padding: 0 4px !important;
-  position: relative;
-}
-.record:after {
-  position: absolute;
-  content: '';
-  display: block;
-  top: 5px;
-  right: -2px;
-  width: 1px;
-  height: 12px;
-  background: #e9ecf7;
-}
-.el-row {
-  height: 60px;
-}
-.base_header_layout .grid-content {
-  margin-top: 80px;
-}
-.el-input--small .el-input__inner {
-  margin-left: 20px;
-}
-.dialog-footer {
-  margin-top: 33px;
-}
-.el-range-editor--small.el-input__inner {
-  height: 32px;
-  margin: 0 10px;
-}
-/deep/.el-pagination {
-  text-align: center;
-  white-space: nowrap;
-  padding: 2px 5px;
-  color: #303133;
-  font-weight: 700;
-  margin-bottom: 20px;
-}
-.el-select {
-  width: 30%;
-  margin-right: 10px;
-}
-/deep/.zengjia .el-textarea__inner {
-  display: block;
-  padding: 13px 9px;
-  line-height: 0.5;
-  box-sizing: border-box;
-  width: 80%;
-  font-size: inherit;
-  color: #606266;
-  background-color: #fff;
-  background-image: none;
-  border: 1px solid #dcdfe6;
-  border-radius: 4px;
-  margin-left: 180px;
-  margin-top: 10px;
-}
-
-/deep/.xiugai .el-textarea__inner {
-  display: block;
-  padding: 13px 17px;
-  line-height: 0.5;
-  box-sizing: border-box;
-  width: 105%;
-  font-size: inherit;
-  color: #606266;
-  background-color: #fff;
-  background-image: none;
-  border: 1px solid #dcdfe6;
-  border-radius: 4px;
-  transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
-  margin-left: 95px;
-}
-
-/deep/.tuihui .el-textarea__inner {
-  display: block;
-  padding: 13px 9px;
-  line-height: 0.5;
-  box-sizing: border-box;
-  width: 80%;
-  font-size: inherit;
-  color: #606266;
-  background-color: #fff;
-  background-image: none;
-  border: 1px solid #dcdfe6;
-  border-radius: 4px;
-  margin-left: 180px;
-  margin-top: 10px;
-}
-/deep/.dingjin {
-  width: 98px;
-  margin-left: 30px;
-  margin-bottom: -37px;
-  padding-top: 20px;
-}
-/deep/.el-textarea__inner {
-  display: block;
-  padding: 13px 17px;
-  line-height: 0.5;
-  box-sizing: border-box;
-  width: 90%;
-  font-size: inherit;
-  color: #606266;
-  background-color: #fff;
-  background-image: none;
-  border: 1px solid #dcdfe6;
-  border-radius: 4px;
-  transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
-  margin-left: 155px;
-  margin-top: 10px;
-}
-/deep/.addprice {
-  width: 98px;
-  margin-left: 50px;
-}
-/deep/.returnprice {
-  width: 98px;
-  margin-left: 50px;
-}
-/deep/.yuan {
-  width: 10px;
-  margin-left: 150%;
-  margin-top: -32px;
-}
-/deep/.addpricejine {
-  width: 98px;
-  margin-left: 50px;
-  margin-bottom: -37px;
-  padding-top: 20px;
-}
-/deep/.returnpricejine {
-  width: 98px;
-  margin-left: 50px;
-  margin-bottom: -37px;
-  padding-top: 20px;
-}
-/deep/.typeselect .el-input__inner {
-  color: #8890b1;
-}
-/deep/.yifudingjin {
-  margin-left: 135px;
-  width: 70px;
-  margin-top: -19px;
-}
-.inputChenge {
-  width: 50%;
-  display: inline-flex;
-}
-.inputs {
-  margin: 0 auto;
-}
-/deep/.ketuidingjin {
-  margin-left: 135px;
-  width: 70px;
-  margin-top: -19px;
-}
+  .connert {
+    width: 90%;
+    margin: 0 auto;
+  }
+
+  .vertical-text-left {
+    width: 62px;
+    text-align: right;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    color: #fff;
+  }
+
+  .el-button--default {
+    color: #8890b1;
+    border-color: #e8eaf1;
+  }
+
+  /deep/.base_header_layout .find.el-button--primary {
+    width: 30px;
+    margin-left: 0;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+
+  /deep/.findValue .el-input__inner {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
+
+  //操作按钮
+  .record,
+  .adjustment {
+    display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+    font-size: 14px;
+  }
+
+  .record:after {
+    position: absolute;
+    content: '';
+    display: block;
+    top: 5px;
+    right: -2px;
+    width: 1px;
+    height: 12px;
+    background: #e9ecf7;
+  }
+
+  //状态样式
+  .executory,
+  .inExecution,
+  .done {
+    width: 6px;
+    height: 6px;
+    display: inline-block;
+    border-radius: 50%;
+    position: relative;
+    top: -1px;
+    font-size: 14px;
+  }
+
+  .executory {
+    background: #ff9f24;
+  }
+
+  .inExecution {
+    background: #5878e8;
+  }
+
+  .done {
+    background: #50cad4;
+  }
+
+  .putstorage.el-button--default,
+  .deliverystorage.el-button--default {
+    border-color: #8890b1;
+    background-color: #fff;
+    color: #8890b1;
+  }
+
+  /deep/.el-table td,
+  /deep/.el-table th.is-leaf {
+    border-right: 1px solid #e9ecf7;
+    text-align: center;
+  }
+
+  /deep/.el-table tr td:first-child,
+  /deep/.el-table tr th.is-leaf:first-child {
+    border-left: 1px solid #e9ecf7;
+  }
+
+  .record,
+  .adjustment {
+    display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+  }
+
+  .record:after {
+    position: absolute;
+    content: '';
+    display: block;
+    top: 5px;
+    right: -2px;
+    width: 1px;
+    height: 12px;
+    background: #e9ecf7;
+  }
+
+  .el-row {
+    height: 60px;
+  }
+
+  .base_header_layout .grid-content {
+    margin-top: 80px;
+  }
+
+  .el-input--small .el-input__inner {
+    margin-left: 20px;
+  }
+
+  .dialog-footer {
+    margin-top: 33px;
+  }
+
+  .el-range-editor--small.el-input__inner {
+    height: 32px;
+    margin: 0 10px;
+  }
+
+  /deep/.el-pagination {
+    text-align: center;
+    white-space: nowrap;
+    padding: 2px 5px;
+    color: #303133;
+    font-weight: 700;
+    margin-bottom: 20px;
+  }
+
+  .el-select {
+    width: 30%;
+    margin-right: 10px;
+  }
+
+  /deep/.zengjia .el-textarea__inner {
+    display: block;
+    padding: 13px 9px;
+    line-height: 0.5;
+    box-sizing: border-box;
+    width: 80%;
+    font-size: inherit;
+    color: #606266;
+    background-color: #fff;
+    background-image: none;
+    border: 1px solid #dcdfe6;
+    border-radius: 4px;
+    margin-left: 180px;
+    margin-top: 10px;
+  }
+
+  /deep/.xiugai .el-textarea__inner {
+    display: block;
+    padding: 13px 17px;
+    line-height: 0.5;
+    box-sizing: border-box;
+    width: 105%;
+    font-size: inherit;
+    color: #606266;
+    background-color: #fff;
+    background-image: none;
+    border: 1px solid #dcdfe6;
+    border-radius: 4px;
+    transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+    margin-left: 95px;
+  }
+
+  /deep/.tuihui .el-textarea__inner {
+    display: block;
+    padding: 13px 9px;
+    line-height: 0.5;
+    box-sizing: border-box;
+    width: 80%;
+    font-size: inherit;
+    color: #606266;
+    background-color: #fff;
+    background-image: none;
+    border: 1px solid #dcdfe6;
+    border-radius: 4px;
+    margin-left: 180px;
+    margin-top: 10px;
+  }
+
+  /deep/.dingjin {
+    width: 98px;
+    margin-left: 30px;
+    margin-bottom: -37px;
+    padding-top: 20px;
+  }
+
+  /deep/.el-textarea__inner {
+    display: block;
+    padding: 13px 17px;
+    line-height: 0.5;
+    box-sizing: border-box;
+    width: 90%;
+    font-size: inherit;
+    color: #606266;
+    background-color: #fff;
+    background-image: none;
+    border: 1px solid #dcdfe6;
+    border-radius: 4px;
+    transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+    margin-left: 155px;
+    margin-top: 10px;
+  }
+
+  /deep/.addprice {
+    width: 98px;
+    margin-left: 50px;
+  }
+
+  /deep/.returnprice {
+    width: 98px;
+    margin-left: 50px;
+  }
+
+  /deep/.yuan {
+    width: 10px;
+    margin-left: 150%;
+    margin-top: -32px;
+  }
+
+  /deep/.addpricejine {
+    width: 98px;
+    margin-left: 50px;
+    margin-bottom: -37px;
+    padding-top: 20px;
+  }
+
+  /deep/.returnpricejine {
+    width: 98px;
+    margin-left: 50px;
+    margin-bottom: -37px;
+    padding-top: 20px;
+  }
+
+  /deep/.typeselect .el-input__inner {
+    color: #8890b1;
+  }
+
+  /deep/.yifudingjin {
+    margin-left: 135px;
+    width: 70px;
+    margin-top: -19px;
+  }
+
+  .inputChenge {
+    width: 50%;
+    display: inline-flex;
+  }
+
+  .inputs {
+    margin: 0 auto;
+  }
+
+  /deep/.ketuidingjin {
+    margin-left: 135px;
+    width: 70px;
+    margin-top: -19px;
+  }
 </style>

src/views/customerFundManagement/customerFundList.vue

@@ -4,67 +4,40 @@
     <BaseHeaderLayout :leftSpan="8">
       <template slot="left"> </template>
       <template slot="left">
-        <ws-input
-          v-model="searchKeyWord"
-          placeholder="可按客户名称、电话查找"
-          clearable
-          maxlength="500"
-          type="input"
-          class="findValue"
-          @keyup.enter.native="find()"
-        ></ws-input>
-        <ws-button class="find" type="primary" @click="find()"
-          ><img
-            width="16"
-            height="16"
-            style="
+        <ws-input v-model="searchKeyWord" placeholder="可按客户名称、电话查找" clearable maxlength="500" type="input"
+          class="findValue" @keyup.enter.native="find()"></ws-input>
+        <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>
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button>
 
         <!--添加客户-->
-        <ws-button v-hasPermission=" `customerMoneyManagement.customerMoney.audit`" type="primary" @click="customerAdd()"
-          ><img
-            width="13"
-            height="13"
-            style="
+        <ws-button v-hasPermission=" `customerMoneyManagement.customerMoney.audit`" type="primary"
+          @click="customerAdd()"><img width="13" height="13" style="
               vertical-align: text-top;
               position: relative;
               top: 0px;
               left: -4px;
-            "
-            src="../../../public/img/header-add.png"
-            alt=""
-          />创建客户</ws-button
-        >
+            " src="../../../public/img/header-add.png" alt="" />创建客户</ws-button>
       </template>
       <!-- v-hasPermission="`contractManagement.buyContract.buyContractInfo.add`" -->
     </BaseHeaderLayout>
-    <div>
-      <el-table
-        class="wenzi"
-        :data="customerList.records"
-        style="width: 100%"
-        height="680"
-      >
+      <el-table class="wenzi" :data="customerList.records" style="width: 100%" height="calc(100% - 110px)">
         <el-table-column prop="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="customerType" label="客户类型" ></el-table-column>
-        <el-table-column prop="compName" label="企业名称" ></el-table-column>
-        <el-table-column prop="customerName" label="客户姓名" ></el-table-column>
-        <el-table-column prop="customerPhone" label="电话" > </el-table-column>
-        <el-table-column prop="totalDeposit" label="定金（元）" ></el-table-column>
-        <el-table-column prop="advancePayment" label="预付金（元）" ></el-table-column>
-        <el-table-column prop="securityDeposit" label="保证金（元）" ></el-table-column>
+        <el-table-column prop="customerType" label="客户类型"></el-table-column>
+        <el-table-column prop="compName" label="企业名称"></el-table-column>
+        <el-table-column prop="customerName" label="客户姓名"></el-table-column>
+        <el-table-column prop="customerPhone" label="电话"> </el-table-column>
+        <el-table-column prop="totalDeposit" label="定金（元）"></el-table-column>
+        <el-table-column prop="advancePayment" label="预付金（元）"></el-table-column>
+        <el-table-column prop="securityDeposit" label="保证金（元）"></el-table-column>
         <el-table-column prop="bankCard" label="账号" width="200"> </el-table-column>
         <el-table-column prop="bankDeposit" label="开户行" width="300">
           <template slot-scope="scope">
@@ -74,458 +47,475 @@
         <!-- <el-table-column prop="bankDepositBranch" label="开户支行" width="260">
          <template slot-scope="scope">
             {{ scope.row.bankDeposit }} - {{ scope.row.bankDepositBranch }}
-          </template> 
+          </template>
         </el-table-column> -->
-        <el-table-column prop="payeeName" label="收款人姓名" > </el-table-column>
+        <el-table-column prop="payeeName" label="收款人姓名"> </el-table-column>
         <el-table-column prop="seller" label="操作" width="200">
           <template slot-scope="scope">
-            <el-button
-              size="medium"
-              type="text"
-              class="record"
-               v-hasPermission=" `customerMoneyManagement.customerMoney.edit`"
-              @click="customerEdit(scope.row)"
-              >编辑</el-button
-            >
-             <el-divider direction="vertical"></el-divider>
-            <el-button
-              size="medium"
-              type="text"
-              class="record"
-               v-hasPermission=" `customerMoneyManagement.customerMoney.delete`"
-              @click="customerDel(scope.row)"
-              >删除</el-button
-            >
+            <el-button size="medium" type="text" class="record"
+              v-hasPermission=" `customerMoneyManagement.customerMoney.edit`" @click="customerEdit(scope.row)">编辑
+            </el-button>
+            <el-divider direction="vertical"></el-divider>
+            <el-button size="medium" type="text" class="record"
+              v-hasPermission=" `customerMoneyManagement.customerMoney.delete`" @click="customerDel(scope.row)">删除
+            </el-button>
           </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 @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>
-import {
-  getCustomerList,
-  delCustomerInfo,
-} from '@/model/customerFundManagement/index'
-import Pagination from '@/components/Pagination'
-import WsUpload from '@/components/WsUpload'
-
-export default {
-  name: 'viewSpareMoney',
-  components: {
-    WsUpload,
-    Pagination,
-  },
-  watch: {
-    vesselId(val) {
-      this.getList()
-    },
-    isShow(val) {
-      this.showType = val
+  import {
+    getCustomerList,
+    delCustomerInfo,
+  } from '@/model/customerFundManagement/index'
+  import Pagination from '@/components/Pagination'
+  import WsUpload from '@/components/WsUpload'
+
+  export default {
+    name: 'viewSpareMoney',
+    components: {
+      WsUpload,
+      Pagination,
     },
-  },
-  data() {
-    return {
-      //弹出框
-      dialogViewSpareMoney: false,
-      dialogApproveFormVisible: false,
-      // 船舶类型
-      monetaryKey: null,
-      // 表格显示数据
-      tableDate: [],
-      // 是否显示
-      showType: true,
-      // 年
-      year: '',
-      currentPage: 1,
-      pageSize: 10,
-      deptBudgetTotal: 0,
-      searchKeyWord: '',
-      contractType: 2,
-      searchType: 1,
-      // 提交类型
-      submitType: true,
-      size: 10,
-      spanArr: [],
-      id: '',
-      money: '',
-      compId: localStorage.getItem('ws-pf_compId'),
-      deptCircularPage: {},
-      customerList: [],
-      deptBudgetList: {},
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          return time.getTime() > Date.now()
-        },
+    watch: {
+      vesselId(val) {
+        this.getList()
+      },
+      isShow(val) {
+        this.showType = val
       },
-      accessoryTFs: false,
-      customerInfo: {
+    },
+    data() {
+      return {
+        //弹出框
+        dialogViewSpareMoney: false,
+        dialogApproveFormVisible: false,
+        // 船舶类型
+        monetaryKey: null,
+        // 表格显示数据
+        tableDate: [],
+        // 是否显示
+        showType: true,
+        // 年
+        year: '',
+        currentPage: 1,
+        pageSize: 10,
+        deptBudgetTotal: 0,
+        searchKeyWord: '',
+        contractType: 2,
+        searchType: 1,
+        // 提交类型
+        submitType: true,
+        size: 10,
+        spanArr: [],
         id: '',
-        compId: '',
-        flag: '',
         money: '',
-        totalDeposit: 0,
-      },
-      totalDeposit: 0,
-    }
-  },
-  activated() {
-    this.getList()
-    this.showType = this.isShow
-  },
-  methods: {
-    //查看//传参
-    nocomplete(row) {
-      this.$router.push({
-        name: 'vehicleDispatchingview',
-        query: {
-          id: row.id,
+        compId: localStorage.getItem('ws-pf_compId'),
+        deptCircularPage: {},
+        customerList: [],
+        deptBudgetList: {},
+        pickerBeginDateBefore: {
+          disabledDate: (time) => {
+            return time.getTime() > Date.now()
+          },
         },
-      })
-    },
-    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')
-          )
-        }
+        accessoryTFs: false,
+        customerInfo: {
+          id: '',
+          compId: '',
+          flag: '',
+          money: '',
+          totalDeposit: 0,
+        },
+        totalDeposit: 0,
       }
-      return fmt
     },
-    customerAdd() {
-      this.$router.push({
-        path: 'customerFundAdd',
-      })
-    },
-    customerEdit(row) {
-      this.$router.push({
-        name: 'customerFundEdit',
-        query: {
-          id: row.id,
-        },
-      })
+    activated() {
+      this.getList()
+      this.showType = this.isShow
     },
-    customerDel(row) {
-      this.$confirm(`客户信息删除后不可恢复，是否确定删除？`, {
-        cancelButtonText: '取消',
-        confirmButtonText: '确定',
-        type: 'warning',
-      })
-        .then(() => {
-          delCustomerInfo({
+    methods: {
+      //查看//传参
+      nocomplete(row) {
+        this.$router.push({
+          name: 'vehicleDispatchingview',
+          query: {
             id: row.id,
-          })
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '删除成功',
-              })
-              this.getList()
-            })
-            .catch((response) => {})
-        })
-        .catch(() => {
-          return false
+          },
         })
-    },
-    handleClose() {
-      this.accessoryTFs = false
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getList()
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val
-      console.log(`当前页: ${val}`)
-      this.getList()
-    },
-    changestatus(state) {
-      this.searchType = state
-      this.getList()
-    },
-    whether(row) {
-      row.identification = 'true'
-    },
-    //列表查询
-    getList() {
-      getCustomerList({
-        compId: localStorage.getItem('ws-pf_compId'),
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        searchKeyWord: this.searchKeyWord,
-        customerTypeFlag: this.customerTypeFlag,
-      })
-        .toPromise()
-        .then((response) => {
-          for (var i = 0; i < response.records.length; i++) {
-            response.records[i].identification = 'false'
+      },
+      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')
+            )
           }
-          this.customerList = response
-          this.deptCircularPage.currentPage = response.current
-          this.deptCircularPage.pageSize = response.size
-          this.deptBudgetTotal = response.total
+        }
+        return fmt
+      },
+      customerAdd() {
+        this.$router.push({
+          path: 'customerFundAdd',
         })
+      },
+      customerEdit(row) {
+        this.$router.push({
+          name: 'customerFundEdit',
+          query: {
+            id: row.id,
+          },
+        })
+      },
+      customerDel(row) {
+        this.$confirm(`客户信息删除后不可恢复，是否确定删除？`, {
+            cancelButtonText: '取消',
+            confirmButtonText: '确定',
+            type: 'warning',
+          })
+          .then(() => {
+            delCustomerInfo({
+                id: row.id,
+              })
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '删除成功',
+                })
+                this.getList()
+              })
+              .catch((response) => {})
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      handleClose() {
+        this.accessoryTFs = false
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+      changestatus(state) {
+        this.searchType = state
+        this.getList()
+      },
+      whether(row) {
+        row.identification = 'true'
+      },
+      //列表查询
+      getList() {
+        getCustomerList({
+            compId: localStorage.getItem('ws-pf_compId'),
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            searchKeyWord: this.searchKeyWord,
+            customerTypeFlag: this.customerTypeFlag,
+          })
+          .toPromise()
+          .then((response) => {
+            for (var i = 0; i < response.records.length; i++) {
+              response.records[i].identification = 'false'
+            }
+            this.customerList = response
+            this.deptCircularPage.currentPage = response.current
+            this.deptCircularPage.pageSize = response.size
+            this.deptBudgetTotal = response.total
+          })
+      },
+      find() {
+        this.currentPage = 1
+        this.getList()
+      },
     },
-    find() {
-      this.currentPage = 1
-      this.getList()
-    },
-  },
-}
+  }
 </script>
 <style lang="scss" scoped>
-.connert {
-  width: 90%;
-  margin: 0 auto;
-}
-.vertical-text-left {
-  width: 62px;
-  text-align: right;
-}
-.el-button--primary {
-  background-color: #5878e8;
-  border-color: #5878e8;
-}
-.el-button--primary {
-  background-color: #5878e8;
-  color: #fff;
-}
-.el-button--default {
-  color: #8890b1;
-  border-color: #e8eaf1;
-}
-/deep/.base_header_layout .find.el-button--primary {
-  width: 30px;
-  margin-left: 0;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-}
-/deep/.findValue .el-input__inner {
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
-//操作按钮
-.record,
-.adjustment {
-  display: inline-block;
-  color: #5878e8;
-  padding: 0 4px !important;
-  position: relative;
-  font-size: 14px;
-}
-// .record:after {
-//   position: absolute;
-//   content: '';
-//   display: block;
-//   top: 5px;
-//   right: -2px;
-//   width: 1px;
-//   height: 12px;
-//   background: #e9ecf7;
-// }
-
-//状态样式
-.executory,
-.inExecution,
-.done {
-  width: 6px;
-  height: 6px;
-  display: inline-block;
-  border-radius: 50%;
-  position: relative;
-  top: -1px;
-  font-size: 14px;
-}
-.executory {
-  background: #ff9f24;
-}
-.inExecution {
-  background: #5878e8;
-}
-.done {
-  background: #50cad4;
-}
-.putstorage.el-button--default,
-.deliverystorage.el-button--default {
-  border-color: #8890b1;
-  background-color: #fff;
-  color: #8890b1;
-}
-/deep/.el-table td,
-/deep/.el-table th.is-leaf {
-  border-right: 1px solid #e9ecf7;
-  text-align: center;
-}
-/deep/.el-table tr td:first-child,
-/deep/.el-table tr th.is-leaf:first-child {
-  border-left: 1px solid #e9ecf7;
-}
-
-.el-row {
-  height: 60px;
-}
-.base_header_layout .grid-content {
-  margin-top: 80px;
-}
-.el-input--small .el-input__inner {
-  margin-left: 20px;
-}
-.dialog-footer {
-  margin-top: 33px;
-}
-.el-range-editor--small.el-input__inner {
-  height: 32px;
-  margin: 0 10px;
-}
-/deep/.el-pagination {
-  text-align: center;
-  white-space: nowrap;
-  padding: 2px 5px;
-  color: #303133;
-  font-weight: 700;
-  margin-bottom: 20px;
-}
-.el-select {
-  width: 30%;
-  margin-right: 10px;
-}
-/deep/.zengjia .el-textarea__inner {
-  display: block;
-  padding: 13px 9px;
-  line-height: 0.5;
-  box-sizing: border-box;
-  width: 80%;
-  font-size: inherit;
-  color: #606266;
-  background-color: #fff;
-  background-image: none;
-  border: 1px solid #dcdfe6;
-  border-radius: 4px;
-  margin-left: 180px;
-  margin-top: 10px;
-}
-
-/deep/.xiugai .el-textarea__inner {
-  display: block;
-  padding: 13px 17px;
-  line-height: 0.5;
-  box-sizing: border-box;
-  width: 105%;
-  font-size: inherit;
-  color: #606266;
-  background-color: #fff;
-  background-image: none;
-  border: 1px solid #dcdfe6;
-  border-radius: 4px;
-  transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
-  margin-left: 95px;
-}
-
-/deep/.tuihui .el-textarea__inner {
-  display: block;
-  padding: 13px 9px;
-  line-height: 0.5;
-  box-sizing: border-box;
-  width: 80%;
-  font-size: inherit;
-  color: #606266;
-  background-color: #fff;
-  background-image: none;
-  border: 1px solid #dcdfe6;
-  border-radius: 4px;
-  margin-left: 180px;
-  margin-top: 10px;
-}
-/deep/.dingjin {
-  width: 98px;
-  margin-left: 30px;
-  margin-bottom: -37px;
-  padding-top: 20px;
-}
-/deep/.el-textarea__inner {
-  display: block;
-  padding: 13px 17px;
-  line-height: 0.5;
-  box-sizing: border-box;
-  width: 90%;
-  font-size: inherit;
-  color: #606266;
-  background-color: #fff;
-  background-image: none;
-  border: 1px solid #dcdfe6;
-  border-radius: 4px;
-  transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
-  margin-left: 155px;
-  margin-top: 10px;
-}
-/deep/.addprice {
-  width: 98px;
-  margin-left: 50px;
-}
-/deep/.returnprice {
-  width: 98px;
-  margin-left: 50px;
-}
-/deep/.yuan {
-  width: 10px;
-  margin-left: 150%;
-  margin-top: -32px;
-}
-/deep/.addpricejine {
-  width: 98px;
-  margin-left: 50px;
-  margin-bottom: -37px;
-  padding-top: 20px;
-}
-/deep/.returnpricejine {
-  width: 98px;
-  margin-left: 50px;
-  margin-bottom: -37px;
-  padding-top: 20px;
-}
-/deep/.typeselect .el-input__inner {
-  color: #8890b1;
-}
-/deep/.yifudingjin {
-  margin-left: 135px;
-  width: 70px;
-  margin-top: -19px;
-}
-.inputChenge {
-  width: 50%;
-  display: inline-flex;
-}
-.inputs {
-  margin: 0 auto;
-}
-/deep/.ketuidingjin {
-  margin-left: 135px;
-  width: 70px;
-  margin-top: -19px;
-}
+  .connert {
+    width: 90%;
+    margin: 0 auto;
+  }
+
+  .vertical-text-left {
+    width: 62px;
+    text-align: right;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    color: #fff;
+  }
+
+  .el-button--default {
+    color: #8890b1;
+    border-color: #e8eaf1;
+  }
+
+  /deep/.base_header_layout .find.el-button--primary {
+    width: 30px;
+    margin-left: 0;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+
+  /deep/.findValue .el-input__inner {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
+
+  //操作按钮
+  .record,
+  .adjustment {
+    display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+    font-size: 14px;
+  }
+
+  // .record:after {
+  //   position: absolute;
+  //   content: '';
+  //   display: block;
+  //   top: 5px;
+  //   right: -2px;
+  //   width: 1px;
+  //   height: 12px;
+  //   background: #e9ecf7;
+  // }
+
+  //状态样式
+  .executory,
+  .inExecution,
+  .done {
+    width: 6px;
+    height: 6px;
+    display: inline-block;
+    border-radius: 50%;
+    position: relative;
+    top: -1px;
+    font-size: 14px;
+  }
+
+  .executory {
+    background: #ff9f24;
+  }
+
+  .inExecution {
+    background: #5878e8;
+  }
+
+  .done {
+    background: #50cad4;
+  }
+
+  .putstorage.el-button--default,
+  .deliverystorage.el-button--default {
+    border-color: #8890b1;
+    background-color: #fff;
+    color: #8890b1;
+  }
+
+  /deep/.el-table td,
+  /deep/.el-table th.is-leaf {
+    border-right: 1px solid #e9ecf7;
+    text-align: center;
+  }
+
+  /deep/.el-table tr td:first-child,
+  /deep/.el-table tr th.is-leaf:first-child {
+    border-left: 1px solid #e9ecf7;
+  }
+
+  .el-row {
+    height: 60px;
+  }
+
+  .base_header_layout .grid-content {
+    margin-top: 80px;
+  }
+
+  .el-input--small .el-input__inner {
+    margin-left: 20px;
+  }
+
+  .dialog-footer {
+    margin-top: 33px;
+  }
+
+  .el-range-editor--small.el-input__inner {
+    height: 32px;
+    margin: 0 10px;
+  }
+
+  /deep/.el-pagination {
+    text-align: center;
+    white-space: nowrap;
+    padding: 2px 5px;
+    color: #303133;
+    font-weight: 700;
+    margin-bottom: 20px;
+  }
+
+  .el-select {
+    width: 30%;
+    margin-right: 10px;
+  }
+
+  /deep/.zengjia .el-textarea__inner {
+    display: block;
+    padding: 13px 9px;
+    line-height: 0.5;
+    box-sizing: border-box;
+    width: 80%;
+    font-size: inherit;
+    color: #606266;
+    background-color: #fff;
+    background-image: none;
+    border: 1px solid #dcdfe6;
+    border-radius: 4px;
+    margin-left: 180px;
+    margin-top: 10px;
+  }
+
+  /deep/.xiugai .el-textarea__inner {
+    display: block;
+    padding: 13px 17px;
+    line-height: 0.5;
+    box-sizing: border-box;
+    width: 105%;
+    font-size: inherit;
+    color: #606266;
+    background-color: #fff;
+    background-image: none;
+    border: 1px solid #dcdfe6;
+    border-radius: 4px;
+    transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+    margin-left: 95px;
+  }
+
+  /deep/.tuihui .el-textarea__inner {
+    display: block;
+    padding: 13px 9px;
+    line-height: 0.5;
+    box-sizing: border-box;
+    width: 80%;
+    font-size: inherit;
+    color: #606266;
+    background-color: #fff;
+    background-image: none;
+    border: 1px solid #dcdfe6;
+    border-radius: 4px;
+    margin-left: 180px;
+    margin-top: 10px;
+  }
+
+  /deep/.dingjin {
+    width: 98px;
+    margin-left: 30px;
+    margin-bottom: -37px;
+    padding-top: 20px;
+  }
+
+  /deep/.el-textarea__inner {
+    display: block;
+    padding: 13px 17px;
+    line-height: 0.5;
+    box-sizing: border-box;
+    width: 90%;
+    font-size: inherit;
+    color: #606266;
+    background-color: #fff;
+    background-image: none;
+    border: 1px solid #dcdfe6;
+    border-radius: 4px;
+    transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+    margin-left: 155px;
+    margin-top: 10px;
+  }
+
+  /deep/.addprice {
+    width: 98px;
+    margin-left: 50px;
+  }
+
+  /deep/.returnprice {
+    width: 98px;
+    margin-left: 50px;
+  }
+
+  /deep/.yuan {
+    width: 10px;
+    margin-left: 150%;
+    margin-top: -32px;
+  }
+
+  /deep/.addpricejine {
+    width: 98px;
+    margin-left: 50px;
+    margin-bottom: -37px;
+    padding-top: 20px;
+  }
+
+  /deep/.returnpricejine {
+    width: 98px;
+    margin-left: 50px;
+    margin-bottom: -37px;
+    padding-top: 20px;
+  }
+
+  /deep/.typeselect .el-input__inner {
+    color: #8890b1;
+  }
+
+  /deep/.yifudingjin {
+    margin-left: 135px;
+    width: 70px;
+    margin-top: -19px;
+  }
+
+  .inputChenge {
+    width: 50%;
+    display: inline-flex;
+  }
+
+  .inputs {
+    margin: 0 auto;
+  }
+
+  /deep/.ketuidingjin {
+    margin-left: 135px;
+    width: 70px;
+    margin-top: -19px;
+  }
 </style>

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -3,34 +3,18 @@
   <div>
     <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
-        <el-button
-          type="primary"
-          @click="newAcquisition('','','新增')"
-          v-hasPermission=" `acquisitionManagement.acquisitionCustomer.add`"
-        >新增</el-button>
+        <el-button type="primary" @click="newAcquisition('','','新增')"
+          v-hasPermission=" `acquisitionManagement.acquisitionCustomer.add`">新增</el-button>
         <div>
-          <el-select
-            v-model="selectVal"
-            placeholder="请选择"
-            @change="warehouseChange"
-            style="margin:0 20px"
-          >
-            <el-option
-              v-for="item in warehouseList"
-              :key="item.id"
-              :label="item.warehouseName"
-              :value="item.id"
-            ></el-option>
+          <el-select v-model="selectVal" placeholder="请选择" @change="warehouseChange" style="margin:0 20px">
+            <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName" :value="item.id">
+            </el-option>
           </el-select>
-          <el-checkbox
-            v-hasPermission=" `acquisitionManagement.acquisition.allow`"
-            v-model="checked"
-            @change="allowEdit"
-            :disabled="warehouseList.length==0"
-          >允许手动编辑重量</el-checkbox>
+          <el-checkbox v-hasPermission=" `acquisitionManagement.acquisition.allow`" v-model="checked"
+            @change="allowEdit" :disabled="warehouseList.length==0">允许手动编辑重量</el-checkbox>
         </div>
       </template>
-    
+
     </BaseHeaderLayout>
     <!-- <div class="header">
       <div>
@@ -45,317 +29,298 @@
     <el-dialog title="新增" :visible.sync="newAcquisitionDialogVisible" width="50%">
       <acquisitionManagementAdd></acquisitionManagementAdd>
     </el-dialog>
-    <div class="table-content">
-      <el-table :data="tableData" style="width: 100%;margin-top: 20px;" border height="600" >
-        <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="warehouseName" label="仓库名称"></el-table-column>
-        <el-table-column prop="goodsName" label="货名"></el-table-column>
-        <el-table-column label="水分范围(%)">
-          <template slot-scope="{ row }">{{row.waterMin}}-{{row.waterMax}}</template>
-        </el-table-column>
-        <el-table-column prop="waterBase" label="基准水分(%)"></el-table-column>
-        <el-table-column prop="deductWeight" label="扣重比"></el-table-column>
-        <el-table-column prop="saleLimit" label="销量上限(年/吨)"></el-table-column>
-        <el-table-column prop="dryGrainPrice" label="干粮收购价"></el-table-column>
-        <el-table-column prop="status" label="状态"></el-table-column>
-        <el-table-column prop="updateDate" label="通过时间"></el-table-column>
-        <el-table-column label="操作" width="300">
-          <template slot-scope="scope">
-            <el-button size="mini" @click="newAcquisition(scope.$index, scope.row,'查看')">查看</el-button>
-            <el-button
-              v-if="scope.row.status!='审核中'"
-              size="mini"
-              @click="newAcquisition(scope.$index, scope.row,'编辑')"
-              v-hasPermission=" `acquisitionManagement.acquisitionCustomer.edit`"
-            >编辑</el-button>
-            <el-button
-              v-if="scope.row.status=='审核中'"
-              size="mini"
-              :disabled="!scope.row.taskId"
-              @click="newAcquisition(scope.$index, scope.row,'审核中')"
-            >审核中</el-button>
-            <el-button
-              size="mini"
-              :disabled="!userJurisdiction"
-              type="danger"
-              @click="delRow(scope.$index, scope.row)"
-              v-hasPermission=" `acquisitionManagement.acquisitionCustomer.delete`"
-            >删除</el-button>
-            <el-button size="mini" @click="print(scope.$index, scope.row)">打印</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="paging">
-        <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>
+    <el-table :data="tableData" style="width: 100%;margin-top: 20px;" border height="calc(100% - 130px)">
+      <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="warehouseName" label="仓库名称"></el-table-column>
+      <el-table-column prop="goodsName" label="货名"></el-table-column>
+      <el-table-column label="水分范围(%)">
+        <template slot-scope="{ row }">{{row.waterMin}}-{{row.waterMax}}</template>
+      </el-table-column>
+      <el-table-column prop="waterBase" label="基准水分(%)"></el-table-column>
+      <el-table-column prop="deductWeight" label="扣重比"></el-table-column>
+      <el-table-column prop="saleLimit" label="销量上限(年/吨)"></el-table-column>
+      <el-table-column prop="dryGrainPrice" label="干粮收购价"></el-table-column>
+      <el-table-column prop="status" label="状态"></el-table-column>
+      <el-table-column prop="updateDate" label="通过时间"></el-table-column>
+      <el-table-column label="操作" width="300">
+        <template slot-scope="scope">
+          <el-button size="mini" @click="newAcquisition(scope.$index, scope.row,'查看')">查看</el-button>
+          <el-button v-if="scope.row.status!='审核中'" size="mini" @click="newAcquisition(scope.$index, scope.row,'编辑')"
+            v-hasPermission=" `acquisitionManagement.acquisitionCustomer.edit`">编辑</el-button>
+          <el-button v-if="scope.row.status=='审核中'" size="mini" :disabled="!scope.row.taskId"
+            @click="newAcquisition(scope.$index, scope.row,'审核中')">审核中</el-button>
+          <el-button size="mini" :disabled="!userJurisdiction" type="danger" @click="delRow(scope.$index, scope.row)"
+            v-hasPermission=" `acquisitionManagement.acquisitionCustomer.delete`">删除</el-button>
+          <el-button size="mini" @click="print(scope.$index, scope.row)">打印</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="paging">
+      <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>
-import {
-  getPurchasePrice,
-  selectWarehouseSelf,
-  purchasePriceAllowEdit,
-  purchasePriceLook,
-  purchasePriceDel
-} from '@/model/houseSelfCollect/index'
-import { getHp } from '@/utils/getHasPermission'
-export default {
-  components: {},
-  watch: {},
-  data() {
-    return {
-      newAcquisitionDialogVisible: false,
-      visible: false,
-      checked: false,
-      currentPage: 1,
-      pageSize: 10,
-      deptBudgetTotal: 0,
-      deptCircularPage: {},
-      compId: '',
-      accountName: '',
-      tableData: [],
-      selectVal: '',
-      goodsNameList: [],
-      warehouseList: [],
-      userJurisdiction: false,
-      userJurisdictionAllow: true,
-      warehouseName: ''
-    }
-  },
-  activated() {
-    //获取公司id
-    this.compId = localStorage.getItem('ws-pf_compId')
-    //用户名
-    this.accountName = localStorage.getItem('ws-pf_staffName')
-    this.getWarehouseSelf()
-    //获取用户权限，决策人、统计
-    this.getUserJurisdiction()
-  },
-  computed() {},
-  created() {},
-  methods: {
-    getUserJurisdiction() {
-      this.userJurisdiction = getHp('acquisitionManagement.acquisition.view')
-      this.userJurisdictionAllow = getHp(
-        'acquisitionManagement.acquisition.allow'
-      )
-      this.userJurisdictionAudit = getHp(
-        'acquisitionManagement.acquisition.edit'
-      )
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getList()
+  import {
+    getPurchasePrice,
+    selectWarehouseSelf,
+    purchasePriceAllowEdit,
+    purchasePriceLook,
+    purchasePriceDel
+  } from '@/model/houseSelfCollect/index'
+  import {
+    getHp
+  } from '@/utils/getHasPermission'
+  export default {
+    components: {},
+    watch: {},
+    data() {
+      return {
+        newAcquisitionDialogVisible: false,
+        visible: false,
+        checked: false,
+        currentPage: 1,
+        pageSize: 10,
+        deptBudgetTotal: 0,
+        deptCircularPage: {},
+        compId: '',
+        accountName: '',
+        tableData: [],
+        selectVal: '',
+        goodsNameList: [],
+        warehouseList: [],
+        userJurisdiction: false,
+        userJurisdictionAllow: true,
+        warehouseName: ''
+      }
     },
-    handleCurrentChange(val) {
-      this.currentPage = val
-      console.log(`当前页: ${val}`)
-      this.getList()
+    activated() {
+      //获取公司id
+      this.compId = localStorage.getItem('ws-pf_compId')
+      //用户名
+      this.accountName = localStorage.getItem('ws-pf_staffName')
+      this.getWarehouseSelf()
+      //获取用户权限，决策人、统计
+      this.getUserJurisdiction()
     },
-    warehouseChange(e) {
-      for (let i = 0; i < this.warehouseList.length; i++) {
-        if (this.warehouseList[i].id == this.selectVal) {
-          localStorage.setItem(
-            'houseSelfCollect_house',
-            JSON.stringify(this.warehouseList[i])
-          )
-          this.warehouseName = this.warehouseList[i].warehouseName
-          this.WAREHOUSE[0].payname = this.warehouseList[i].id
+    computed() {},
+    created() {},
+    methods: {
+      getUserJurisdiction() {
+        this.userJurisdiction = getHp('acquisitionManagement.acquisition.view')
+        this.userJurisdictionAllow = getHp(
+          'acquisitionManagement.acquisition.allow'
+        )
+        this.userJurisdictionAudit = getHp(
+          'acquisitionManagement.acquisition.edit'
+        )
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+      warehouseChange(e) {
+        for (let i = 0; i < this.warehouseList.length; i++) {
+          if (this.warehouseList[i].id == this.selectVal) {
+            localStorage.setItem(
+              'houseSelfCollect_house',
+              JSON.stringify(this.warehouseList[i])
+            )
+            this.warehouseName = this.warehouseList[i].warehouseName
+            this.WAREHOUSE[0].payname = this.warehouseList[i].id
+          }
         }
-      }
-      let _obj = this.warehouseList.find(item => {
-        return item.id === this.selectVal
-      })
-      if (_obj.allowEdit == 1) {
-        this.checked = true
-      } else {
-        this.checked = false
-      }
-      this.currentPage = 1
-      this.pageSize = 10
-      this.getList()
-    },
-    newAcquisition(index, row, type) {
-      let _obj = {}
-      let _query = {}
-      switch (type) {
-        case '新增':
-          _obj = this.warehouseList.find(item => {
-            return item.id === this.selectVal
+        let _obj = this.warehouseList.find(item => {
+          return item.id === this.selectVal
+        })
+        if (_obj.allowEdit == 1) {
+          this.checked = true
+        } else {
+          this.checked = false
+        }
+        this.currentPage = 1
+        this.pageSize = 10
+        this.getList()
+      },
+      newAcquisition(index, row, type) {
+        let _obj = {}
+        let _query = {}
+        switch (type) {
+          case '新增':
+            _obj = this.warehouseList.find(item => {
+              return item.id === this.selectVal
+            })
+            _query = {
+              warehouseId: _obj.id,
+              warehouseName: _obj.warehouseName,
+              compId: this.compId,
+              type: type,
+              goodsNameList: this.goodsNameList
+            }
+            break
+          default:
+            _query = {
+              data: JSON.stringify(row),
+              type: type,
+              goodsNameList: this.goodsNameList
+            }
+            break
+        }
+        this.$router.push({
+          name: 'acquisitionManagementAdd',
+          query: _query
+        })
+      },
+      //获取仓库
+      getWarehouseSelf() {
+        selectWarehouseSelf({
+            compId: this.compId
           })
-          _query = {
-            warehouseId: _obj.id,
-            warehouseName: _obj.warehouseName,
-            compId: this.compId,
-            type: type,
-            goodsNameList: this.goodsNameList
-          }
-          break
-        default:
-          _query = {
-            data: JSON.stringify(row),
-            type: type,
-            goodsNameList: this.goodsNameList
-          }
-          break
-      }
-      this.$router.push({
-        name: 'acquisitionManagementAdd',
-        query: _query
-      })
-    },
-    //获取仓库
-    getWarehouseSelf() {
-      selectWarehouseSelf({
-        compId: this.compId
-      })
-        .toPromise()
-        .then(response => {
-          this.warehouseList = response
-          // if(this.userJurisdiction){
-          //   this.warehouseList.unshift({warehouseName:response[0].flag})
-          // }
-          let _wareHouse = localStorage.getItem('houseSelfCollect_house')
-          if (_wareHouse) {
-            _wareHouse = JSON.parse(_wareHouse)
-            this.selectVal = _wareHouse.id
-            this.warehouseName = _wareHouse.warehouseName
-            if (_wareHouse.allowEdit == 1) {
-              this.checked = true
+          .toPromise()
+          .then(response => {
+            this.warehouseList = response
+            // if(this.userJurisdiction){
+            //   this.warehouseList.unshift({warehouseName:response[0].flag})
+            // }
+            let _wareHouse = localStorage.getItem('houseSelfCollect_house')
+            if (_wareHouse) {
+              _wareHouse = JSON.parse(_wareHouse)
+              this.selectVal = _wareHouse.id
+              this.warehouseName = _wareHouse.warehouseName
+              if (_wareHouse.allowEdit == 1) {
+                this.checked = true
+              } else {
+                this.checked = false
+              }
             } else {
-              this.checked = false
+              this.selectVal = this.warehouseList[0].id
+              if (this.warehouseName) {
+                this.selectVal = this.WAREHOUSE[0].payname
+              } else {
+                this.WAREHOUSE[0].payname = this.warehouseList[0].id
+              }
+              this.warehouseName = this.warehouseList[0].warehouseName
+              if (this.warehouseList[0].allowEdit == 1) {
+                this.checked = true
+              } else {
+                this.checked = false
+              }
             }
-          } else {
-            this.selectVal = this.warehouseList[0].id
-            if (this.warehouseName) {
-              this.selectVal = this.WAREHOUSE[0].payname
-            } else {
-              this.WAREHOUSE[0].payname = this.warehouseList[0].id
+
+            // this.tableData = response.records
+            this.getList()
+          })
+      },
+      //获取列表数据
+      getList() {
+        this.goodsNameList = []
+        getPurchasePrice({
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            warehouseId: this.selectVal,
+            compId: this.compId
+          })
+          .toPromise()
+          .then(response => {
+            for (let i = 0; i < response.records.length; i++) {
+              this.goodsNameList.push(response.records[i].goodsName)
             }
-            this.warehouseName = this.warehouseList[0].warehouseName
-            if (this.warehouseList[0].allowEdit == 1) {
-              this.checked = true
+            this.tableData = response.records
+            this.deptBudgetTotal = response.total
+          })
+      },
+      allowEdit(val) {
+        purchasePriceAllowEdit({
+            warehouseId: this.selectVal
+          })
+          .toPromise()
+          .then(response => {
+            let _data = localStorage.getItem('houseSelfCollect_house1')
+            _data = JSON.parse(localStorage.getItem('houseSelfCollect_house1'))
+            if (_data.allowEdit == 0) {
+              _data.allowEdit = 1
             } else {
-              this.checked = false
+              _data.allowEdit = 0
             }
-          }
-
-          // this.tableData = response.records
-          this.getList()
-        })
-    },
-    //获取列表数据
-    getList() {
-      this.goodsNameList = []
-      getPurchasePrice({
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        warehouseId: this.selectVal,
-        compId: this.compId
-      })
-        .toPromise()
-        .then(response => {
-          for (let i = 0; i < response.records.length; i++) {
-            this.goodsNameList.push(response.records[i].goodsName)
-          }
-          this.tableData = response.records
-          this.deptBudgetTotal = response.total
-        })
-    },
-    allowEdit(val) {
-      purchasePriceAllowEdit({
-        warehouseId: this.selectVal
-      })
-        .toPromise()
-        .then(response => {
-           let _data = localStorage.getItem('houseSelfCollect_house1')
-           _data = JSON.parse(localStorage.getItem('houseSelfCollect_house1'))
-           if(_data.allowEdit==0){
-             _data.allowEdit = 1
-           }else{
-             _data.allowEdit = 0
-           } 
-            localStorage.setItem('houseSelfCollect_house1',JSON.stringify(_data))
+            localStorage.setItem('houseSelfCollect_house1', JSON.stringify(_data))
             this.getWarehouseSelf()
-          // this.tableData = response.records
-        })
-    },
-    // 删除
-    delRow(index, row) {
-      //删除
-      this.$confirm('确定删除该条设置？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          purchasePriceDel({
-            id: row.id
+            // this.tableData = response.records
+          })
+      },
+      // 删除
+      delRow(index, row) {
+        //删除
+        this.$confirm('确定删除该条设置？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
           })
-            .toPromise()
-            .then(response => {
-              this.$notify.success({
-                title: '成功',
-                message: '删除成功'
+          .then(() => {
+            purchasePriceDel({
+                id: row.id
               })
-              this.getList()
-            })
-            .catch(response => {
-              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-            })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    print(index, row) {
-      // 打印价格对照表
-      purchasePriceLook({
-        id: row.id
-      })
-        .toPromise()
-        .then(response => {
-          // this.tableData = response.records
-          // this.getList()
-          localStorage.setItem(
-            'pricePrintList',
-            JSON.stringify(response.detailPrints)
-          )
-          window.open('../../../static/print.html?name=' + row.goodsName)
-        })
-    },
-    validate() {}
+              .toPromise()
+              .then(response => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '删除成功'
+                })
+                this.getList()
+              })
+              .catch(response => {
+                // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              })
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      print(index, row) {
+        // 打印价格对照表
+        purchasePriceLook({
+            id: row.id
+          })
+          .toPromise()
+          .then(response => {
+            // this.tableData = response.records
+            // this.getList()
+            localStorage.setItem(
+              'pricePrintList',
+              JSON.stringify(response.detailPrints)
+            )
+            window.open('../../../static/print.html?name=' + row.goodsName)
+          })
+      },
+      validate() {}
+    }
   }
-}
 </script>
 <style lang="scss" scoped>
-.header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-/deep/.el-table .cell {
-  text-align: center;
-}
+  .header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
 
-.paging {
-  text-align: center;
-  margin-top:20px
-}
+  /deep/.el-table .cell {
+    text-align: center;
+  }
 
+  .paging {
+    text-align: center;
+    margin-top: 20px
+  }
 </style>

src/views/houseSelfCollect/customerManagement.vue

@@ -7,7 +7,8 @@
         <ws-button type="primary" @click="createCustomer(1)">创建新客户</ws-button>
       </template>
       <template slot="right">
-        <ws-input class='findinput' @keyup.enter.native="find()" v-model="searchKeyWord" placeholder="可按姓名、手机号查找" clearable maxlength="500" type="input"></ws-input>
+        <ws-input class='findinput' @keyup.enter.native="find()" v-model="searchKeyWord" placeholder="可按姓名、手机号查找"
+          clearable maxlength="500" type="input"></ws-input>
         <ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
               vertical-align: text-top;
               position: relative;
@@ -20,7 +21,7 @@
       <div class="search-right">
         <!-- <ws-button @click="getCustomer()">获取客户</ws-button> -->
         <el-dialog title="客户扫码" :visible.sync="customerDialogVisible" width="320px">
-          <img style="width:300px;height:300px" :src="qrcode"/>
+          <img style="width:300px;height:300px" :src="qrcode" />
         </el-dialog>
         <!-- <ws-button @click="createCustomer()">创建新客户</ws-button> -->
         <el-dialog title="创建新客户" :visible.sync="creatNewCustomerDialogVisible" width="50%">
@@ -29,14 +30,14 @@
       </div>
     </div>
 
-    <el-table :data="customertList" style="width: 100%; margin-top: 20px" ref="customertList" border height="600">
+    <el-table :data="customertList" style="width: 100%; margin-top: 20px" ref="customertList" border height="calc(100% - 115px)">
       <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="customerName" label="客户"></el-table-column>
+      <el-table-column prop="customerName" label="客户"></el-table-column>
       <el-table-column prop="supplier" label="供应商"></el-table-column>
       <el-table-column prop="customerPhone" label="手机号"></el-table-column>
       <el-table-column prop="payeeName" label="收款人"></el-table-column>
@@ -50,13 +51,15 @@
       <el-table-column prop="authenticationStatus" label="状态"></el-table-column>
       <el-table-column prop="address" label="操作" width="300">
         <template slot-scope="scope">
-          <el-button size="mini" @click="createCustomer(scope.row, 2)" v-show="scope.row.authenticationStatus!='已删除'">查看</el-button>
-          <el-button size="mini" @click="createCustomer(scope.row, 3)" v-show="scope.row.authenticationStatus!='已删除'" :disabled="!scope.row.isEdit">编辑</el-button>
+          <el-button size="mini" @click="createCustomer(scope.row, 2)" v-show="scope.row.authenticationStatus!='已删除'">查看
+          </el-button>
+          <el-button size="mini" @click="createCustomer(scope.row, 3)" v-show="scope.row.authenticationStatus!='已删除'"
+            :disabled="!scope.row.isEdit">编辑</el-button>
           <el-button size="mini" type="danger" @click="handleDelete(scope.row, '')">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
-    <div style="text-align: center;margin-top:20px">
+    <div style="text-align: center;">
       <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
         :page-size="deptCircularPage.pageSize" layout="total, sizes, prev, pager, next, jumper"
         :total="deptBudgetTotal">
@@ -87,7 +90,7 @@
         pageSize: 10,
         deptBudgetTotal: 0,
         deptCircularPage: {},
-        qrcode:""
+        qrcode: ""
       }
     },
     activated() {
@@ -100,14 +103,14 @@
       //获取客户
       getCustomer() {
         this.customerDialogVisible = true
-        if(!this.qrcode||this.qrcode == ""){
+        if (!this.qrcode || this.qrcode == "") {
           getQRCode({
-            compId: localStorage.getItem('ws-pf_compId')
-          })
-          .toPromise()
-          .then((response) => {
-           this.qrcode = response
-          })
+              compId: localStorage.getItem('ws-pf_compId')
+            })
+            .toPromise()
+            .then((response) => {
+              this.qrcode = response
+            })
         }
 
       },
@@ -173,11 +176,11 @@
           .toPromise()
           .then((response) => {
             this.customertList = response.records
-            for(let i=0;i<response.records.length;i++){
-              if(response.records[i].compId==localStorage.getItem('ws-pf_compId')){
+            for (let i = 0; i < response.records.length; i++) {
+              if (response.records[i].compId == localStorage.getItem('ws-pf_compId')) {
                 response.records[i].isEdit = true
-              }else{
-                 response.records[i].isEdit = false
+              } else {
+                response.records[i].isEdit = false
               }
             }
             this.deptBudgetTotal = response.total
@@ -194,7 +197,7 @@
 
     .find {
       width: 32px;
-      margin-left:10px;
+      margin-left: 10px;
     }
 
     .search-left {
@@ -230,16 +233,19 @@
   /deep/.el-table--enable-row-transition .el-table__body td {
     text-align: center;
   }
+
   /deep/.base_header_layout .find.el-button--primary {
-  width: 30px;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-}
-/deep/.base_header_layout .findinput input {
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
-//   /deep/.el-table--border{
-//   height: calc(100vh - 600px) !important;
-// }
+    width: 30px;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+
+  /deep/.base_header_layout .findinput input {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
+
+  //   /deep/.el-table--border{
+  //   height: calc(100vh - 600px) !important;
+  // }
 </style>

src/views/houseSelfCollect/inspectionManagement.vue

@@ -1,428 +1,431 @@
 <!--质检管理-->
 <template>
-	<div>
-		<BaseHeaderLayout :leftSpan="16">
-			<template slot="left">
-				<ws-button type="primary" @click="inspectInfo(1)"
-					v-hasPermission="`acquisitionManagement.acquisitionQuality.add`">添加</ws-button>
-			</template>
-			<template slot="right">
-				<ws-select v-model="warehouseName" placeholder="" @change="warehouseNameChange" :value="searchType"
-					style="margin: 0 10px">
-					<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>
-				<ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
+  <div>
+    <BaseHeaderLayout :leftSpan="16">
+      <template slot="left">
+        <ws-button type="primary" @click="inspectInfo(1)"
+          v-hasPermission="`acquisitionManagement.acquisitionQuality.add`">添加</ws-button>
+      </template>
+      <template slot="right">
+        <ws-select v-model="warehouseName" placeholder="" @change="warehouseNameChange" :value="searchType"
+          style="margin: 0 10px">
+          <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>
+        <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>
-		<!-- <div style="height:calc(100vh - 600px)"> -->
-		<el-table :data="inspect" style="width: 100%; margin-top: 20px" ref="inspect" border height="600">
-			<el-table-column type="index" label="序号" width="50">
-				<template scope="scope">
-					<span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
-					<span v-else>{{ scope.$index + 1 }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column prop="qualityNo" width="100" label="编号"></el-table-column>
-			<el-table-column prop="customerName" label="客户"></el-table-column>
-			<el-table-column prop="carNumber" label="车牌号"></el-table-column>
-			<el-table-column prop="boxNo" label="箱号-1">
-			</el-table-column>
-			<el-table-column prop="boxNoOther" label="箱号-2">
-			</el-table-column>
-			<el-table-column prop="titleNo" label="封号-1">
-			</el-table-column>
-			<el-table-column prop="titleNoOther" label="封号-2">
-			</el-table-column>
-			<el-table-column prop="goodsName" label="货名"></el-table-column>
-			<el-table-column prop="waterContent" label="水分（%）" width="120">
-				<template scope="scope">
-					<span class="water-left">{{scope.row.waterContent}}</span>
-					<span class="water-line">|</span>
-					<span class="water-right">{{scope.row.reWaterContent ? scope.row.reWaterContent : '未复检' }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column prop="buckleMiscellaneous" label="扣杂" width="120">
-				<template scope="scope">
-					<div v-if="scope.row.paramType == 1">
-						<span class="water-left">{{scope.row.buckleMiscellaneous}} </span>
-						<span class="water-line">|</span>
-						<span
-							class="water-right">{{scope.row.reBuckleMiscellaneous ? scope.row.reBuckleMiscellaneous : '未复检'}}</span>
-					</div>
-				</template>
-			</el-table-column>
-			<el-table-column prop="type" label="类型"></el-table-column>
-			<el-table-column prop="tidalGrainPrice" label="单价（元/公斤）" width="120px">
-				<template scope="scope">
-					<span v-if="scope.row.type == '潮粮'">{{ scope.row.tidalGrainPrice }}</span>
-					<span v-else>{{ scope.row.dryGrainPrice }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column prop="binNumber" label="仓位号"></el-table-column>
-			<el-table-column prop="storageTagNo" label="囤位号"></el-table-column>
-			<el-table-column prop="qualityInspector" label="质检员" width="120px">
-				<template scope="scope">
-					<span>{{scope.row.qualityInspector}}</span>
-					<span
-						v-if="scope.row.reInspector && scope.row.qualityInspector != scope.row.reInspector">,{{scope.row.reInspector}}</span>
-				</template>
-			</el-table-column>
-			<el-table-column prop="updateDate" label="质检时间" width="90px"></el-table-column>
-			<el-table-column prop="status" label="状态">
-				<template slot-scope="scope">
-					<span v-if='scope.row.confirm=="1"'>
-						已确认
-					</span>
-					<span v-else>
-						{{scope.row.status}}
-					</span>
-				</template>
-			</el-table-column>
-			<el-table-column width="410" label="操作">
-				<template slot-scope="scope">
-					<el-button @click="inspectInfo(scope.row, 2)"
-						v-hasPermission="`acquisitionManagement.acquisitionQuality.view`">查看</el-button>
-					<el-button @click="inspectInfo(scope.row, 3)"
-						v-if="scope.row.status=='已初检'&& scope.row.confirm!='1'"
-						v-hasPermission="`acquisitionManagement.acquisitionQuality.initial`">初检</el-button>
-					<div v-show="scope.row.confirm !='1' && scope.row.status == '已复检'" style="display: inline-block;">
-						<el-button @click="inspectInfo(scope.row, 5)"
-							v-hasPermission="`acquisitionManagement.acquisitionQuality.con`">确认</el-button>
-					</div>
-					<el-button @click="inspectInfo(scope.row, 4)" v-if="scope.row.confirm !='1'"
-						v-hasPermission="`acquisitionManagement.acquisitionQuality.again`">复检</el-button>
-					<div style="display: inline-block;"
-						v-if="scope.row.weighingManagement&&scope.row.weighingManagement.status=='已质检'">
-						<el-button @click="del(scope.row)" type="danger"
-							v-hasPermission="`acquisitionManagement.acquisitionQuality.delete`">删除</el-button>
-					</div>
-					<el-button @click="print(scope.row)"
-						v-hasPermission="`acquisitionManagement.acquisitionQuality.print`">打印</el-button>
-				</template>
-			</el-table-column>
-		</el-table>
-		
-		 <el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint" title="粮食质检单">
-			<!-- <inspectInfoPrint :printData="printData"></inspectInfoPrint> -->
-			<inspectInfoPrint :printData="printData" ref="saveImg"></inspectInfoPrint>
-			<div style="text-align:center">
-				<el-button type="primary" @click="closePrint">关闭</el-button>
-				<el-button type="primary" @click="printSmall">打印小票</el-button>
-				<el-button type="primary" @click="printBig">打印单据</el-button>
-			</div>
-		</el-dialog>
-		<div style="text-align: center;margin-top:20px">
-			<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> -->
-	</div>
+      </template>
+    </BaseHeaderLayout>
+    <!-- <div style="height:calc(100vh - 600px)"> -->
+    <el-table :data="inspect" style="width: 100%; margin-top: 20px" ref="inspect" border height="calc(100% - 130px)">
+      <el-table-column type="index" label="序号" width="50">
+        <template scope="scope">
+          <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+          <span v-else>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="qualityNo" width="100" label="编号"></el-table-column>
+      <el-table-column prop="customerName" label="客户"></el-table-column>
+      <el-table-column prop="carNumber" label="车牌号"></el-table-column>
+      <el-table-column prop="boxNo" label="箱号-1">
+      </el-table-column>
+      <el-table-column prop="boxNoOther" label="箱号-2">
+      </el-table-column>
+      <el-table-column prop="titleNo" label="封号-1">
+      </el-table-column>
+      <el-table-column prop="titleNoOther" label="封号-2">
+      </el-table-column>
+      <el-table-column prop="goodsName" label="货名"></el-table-column>
+      <el-table-column prop="waterContent" label="水分（%）" width="120">
+        <template scope="scope">
+          <span class="water-left">{{scope.row.waterContent}}</span>
+          <span class="water-line">|</span>
+          <span class="water-right">{{scope.row.reWaterContent ? scope.row.reWaterContent : '未复检' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="buckleMiscellaneous" label="扣杂" width="120">
+        <template scope="scope">
+          <div v-if="scope.row.paramType == 1">
+            <span class="water-left">{{scope.row.buckleMiscellaneous}} </span>
+            <span class="water-line">|</span>
+            <span
+              class="water-right">{{scope.row.reBuckleMiscellaneous ? scope.row.reBuckleMiscellaneous : '未复检'}}</span>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="type" label="类型"></el-table-column>
+      <el-table-column prop="tidalGrainPrice" label="单价（元/公斤）" width="120px">
+        <template scope="scope">
+          <span v-if="scope.row.type == '潮粮'">{{ scope.row.tidalGrainPrice }}</span>
+          <span v-else>{{ scope.row.dryGrainPrice }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="binNumber" label="仓位号"></el-table-column>
+      <el-table-column prop="storageTagNo" label="囤位号"></el-table-column>
+      <el-table-column prop="qualityInspector" label="质检员" width="120px">
+        <template scope="scope">
+          <span>{{scope.row.qualityInspector}}</span>
+          <span
+            v-if="scope.row.reInspector && scope.row.qualityInspector != scope.row.reInspector">,{{scope.row.reInspector}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="updateDate" label="质检时间" width="90px"></el-table-column>
+      <el-table-column prop="status" label="状态">
+        <template slot-scope="scope">
+          <span v-if='scope.row.confirm=="1"'>
+            已确认
+          </span>
+          <span v-else>
+            {{scope.row.status}}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column width="410" label="操作">
+        <template slot-scope="scope">
+          <el-button @click="inspectInfo(scope.row, 2)"
+            v-hasPermission="`acquisitionManagement.acquisitionQuality.view`">查看</el-button>
+          <el-button @click="inspectInfo(scope.row, 3)" v-if="scope.row.status=='已初检'&& scope.row.confirm!='1'"
+            v-hasPermission="`acquisitionManagement.acquisitionQuality.initial`">初检</el-button>
+          <div v-show="scope.row.confirm !='1' && scope.row.status == '已复检'" style="display: inline-block;">
+            <el-button @click="inspectInfo(scope.row, 5)"
+              v-hasPermission="`acquisitionManagement.acquisitionQuality.con`">确认</el-button>
+          </div>
+          <el-button @click="inspectInfo(scope.row, 4)" v-if="scope.row.confirm !='1'"
+            v-hasPermission="`acquisitionManagement.acquisitionQuality.again`">复检</el-button>
+          <div style="display: inline-block;"
+            v-if="scope.row.weighingManagement&&scope.row.weighingManagement.status=='已质检'">
+            <el-button @click="del(scope.row)" type="danger"
+              v-hasPermission="`acquisitionManagement.acquisitionQuality.delete`">删除</el-button>
+          </div>
+          <el-button @click="print(scope.row)" v-hasPermission="`acquisitionManagement.acquisitionQuality.print`">打印
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+     <el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint" title="粮食质检单">
+      <!-- <inspectInfoPrint :printData="printData"></inspectInfoPrint> -->
+      <inspectInfoPrint :printData="printData" ref="saveImg"></inspectInfoPrint>
+      <div style="text-align:center">
+        <el-button type="primary" @click="closePrint">关闭</el-button>
+        <el-button type="primary" @click="printSmall">打印小票</el-button>
+        <el-button type="primary" @click="printBig">打印单据</el-button>
+      </div>
+    </el-dialog>
+    <div style="text-align: center;margin-top:20px">
+      <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> -->
+  </div>
 </template>
 <script>
-	import {
-		selectWarehouseSelf,
-		getinspectList,
-		getinspectDelete,
-		getinspectLook,
-		getQRcode
-	} from '@/model/houseSelfCollect/index'
-	import inspectInfoPrint from './component/inspectInfoPrint.vue'
-	export default {
-		components: {
-			inspectInfoPrint
-		},
-		watch: {},
-		data() {
-			return {
-				//分页
-				currentPage: 1,
-				pageSize: 10,
-				deptCircularPage: {},
-				deptBudgetTotal: 0,
+  import {
+    selectWarehouseSelf,
+    getinspectList,
+    getinspectDelete,
+    getinspectLook,
+    getQRcode
+  } from '@/model/houseSelfCollect/index'
+  import inspectInfoPrint from './component/inspectInfoPrint.vue'
+  export default {
+    components: {
+      inspectInfoPrint
+    },
+    watch: {},
+    data() {
+      return {
+        //分页
+        currentPage: 1,
+        pageSize: 10,
+        deptCircularPage: {},
+        deptBudgetTotal: 0,
 
-				searchKeyWord: '',
-				taskTypeList: [],
-				searchType: 0,
-				warehouseName: '',
-				inspect: [],
-				warehouseList1: [],
-				warehouseList: [],
-				cangid: '', //仓库id
-				warehouseCount: '',
-				warehouseNo: '',
-				isShowPrint: false,
-				printData: {},
-				deductWeight: '', //扣重比
-				saleLimit: '',
-				allowEdit:'0'
-			}
-		},
-		activated() {
-			this.selectWarehouse()
-			let _WarehouseName = localStorage.getItem('houseSelfCollect_house1')
-			_WarehouseName = JSON.parse(_WarehouseName)
-			if(_WarehouseName){
-					this.warehouseNameChange(_WarehouseName.value)
-			}
-		},
-		methods: {
-			printSmall() {
-				window.open('../../../static/inspection.html?type=1&dataList=' + JSON.stringify(this.printData))
-			},
-			printBig() {
-				window.open('../../../static/inspection.html?type=2&dataList=' + JSON.stringify(this.printData))
-			},
-			closePrint() {
-				this.isShowPrint = false
-				this.$router.push({
-					path: 'inspectionManagement'
-				})
-			},
-			find() {
-				this.getList()
-			},
-			inspectInfo(row, index) {
-				for (let i = 0; i < this.warehouseList.length; i++) {
-					if (this.warehouseName == this.warehouseList[i].value) {
-						// console.log(this.warehouseList[i])
-						this.cangid = this.warehouseList[i].warehouseId
-					}
-				}
-				// console.log(this.cangid)
-				//添加,编辑，查看
-				this.$router.push({
-					path: 'inspectInfo',
-					query: {
-						type: index,
-						cangid: this.cangid,
-						id: row.id,
-						warehouseName: this.warehouseName,
-						count: this.warehouseCount,
-						warehouseNo: this.warehouseNo,
-						allowEdit:this.allowEdit,
-						status:row.status
-					},
-				})
-			},
-			warehouseNameChange(e) {
-				for (let i = 0; i < this.warehouseList.length; i++) {
-					if (this.warehouseList[i].value == e) {
-						this.warehouseName = this.warehouseList[i].value
-						this.warehouseCount = this.warehouseList[i].count
-						this.warehouseNo = this.warehouseList[i].No
-						this.cangid = this.warehouseList[i].warehouseId
-						this.allowEdit = this.warehouseList[i].allowEdit
-						this.WAREHOUSE[1].payname = this.warehouseList[i].value
-						this.warehouseList[i].compId = localStorage.getItem('ws-pf_compId')
-						localStorage.setItem('houseSelfCollect_house1', JSON.stringify(this.warehouseList[i]))
-					}
-				}
-				this.getList()
-			},
-			del(row) {
-				//删除
-				this.$confirm('确定删除质检信息？', '提示', {
-						confirmButtonText: '确定',
-						cancelButtonText: '取消',
-						type: 'warning',
-					})
-					.then(() => {
-						getinspectDelete({
-								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
-					})
-			},
-			handleSizeChange(val) {
-				console.log(`每页 ${val} 条`)
-				this.pageSize = val
-				this.getList()
-			},
-			handleCurrentChange(val) {
-				this.currentPage = val
-				console.log(`当前页: ${val}`)
-				this.getList()
-			},
-			selectWarehouse() {
-				selectWarehouseSelf({
-						compId: localStorage.getItem('ws-pf_compId'),
-					})
-					.toPromise()
-					.then((response) => {
-						this.warehouseList1 = response
-						this.warehouseList = []
-						let _wareHouse = localStorage.getItem('houseSelfCollect_house1')
-						_wareHouse = JSON.parse(_wareHouse)
-						for (let i = 0; i < response.length; i++) {
-							if(_wareHouse && response[i].warehouseName==_wareHouse.value){
-								this.warehouseCount = response[i].count
-								this.allowEdit = response[i].allowEdit
-								this.cangid = _wareHouse.warehouseId
-								this.warehouseName = response[i].warehouseName
-								this.warehouseNo = response[i].commonWarehouseNo
-							}
-							this.warehouseList.push({
-								value: response[i].warehouseName,
-								warehouseId: response[i].id,
-								count: response[i].count,
-								No: response[i].commonWarehouseNo,
-								allowEdit:response[i].allowEdit,
-								compId:localStorage.getItem('ws-pf_compId')
-							})
-							// if (_wareHouse && response[i].warehouseName == _wareHouse.value) {
-							// 		this.cangid = _wareHouse.warehouseId
-							// 		this.warehouseName = response[i].warehouseName
-							// 		this.warehouseNo = response[i].commonWarehouseNo
-							// 		this.warehouseCount =  response[i].count
-							// 		this.allowEdit = response[i].allowEdit
-							// } 
-							if (!_wareHouse) {
-								if (this.cangid && this.cangid == response[i].id) {
-									this.warehouseName = response[i].warehouseName
-									this.warehouseCount = response[i].count
-									this.warehouseNo = response[i].commonWarehouseNo
-									this.allowEdit =  response[i].allowEdit
-								}
-								if (this.warehouseList.length > 0 && !this.cangid) {
-									this.warehouseName = this.warehouseList[0].value
-									this.warehouseCount = this.warehouseList[0].count
-									this.warehouseNo = this.warehouseList[0].No
-									this.cangid = this.warehouseList[0].warehouseId
-									this.allowEdit = this.warehouseList[0].allowEdit
-									this.WAREHOUSE[1].payname = this.warehouseList[0].value
-								}
-							}
-						}
-						this.getList()
-					})
-			},
-			getList() {
-				getinspectList({
-						compId: localStorage.getItem('ws-pf_compId'),
-						currentPage: this.currentPage,
-						pageSize: this.pageSize,
-						searchKeyWord: (this.searchKeyWord).toUpperCase(),
-						warehouseName: this.warehouseName,
-						managementType: 1
-					})
-					.toPromise()
-					.then((response) => {
-						this.inspect = response.records
-						this.deptBudgetTotal = response.total
-						// this.$forceUpdate();
-					})
-			},
-			print(row) {
-				getinspectLook({
-						id: row.id,
-					})
-					.toPromise()
-					.then((response) => {
-								this.printData = response
-									this.isShowPrint = true
-						    if (response.compName == '黑龙江秋收有限公司') {
-               			    	 this.printData.compName = '黑龙江中天昊元贸易有限公司'
-              					}
-					})
-			},
-		},
-	}
+        searchKeyWord: '',
+        taskTypeList: [],
+        searchType: 0,
+        warehouseName: '',
+        inspect: [],
+        warehouseList1: [],
+        warehouseList: [],
+        cangid: '', //仓库id
+        warehouseCount: '',
+        warehouseNo: '',
+        isShowPrint: false,
+        printData: {},
+        deductWeight: '', //扣重比
+        saleLimit: '',
+        allowEdit: '0'
+      }
+    },
+    activated() {
+      this.selectWarehouse()
+      let _WarehouseName = localStorage.getItem('houseSelfCollect_house1')
+      _WarehouseName = JSON.parse(_WarehouseName)
+      if (_WarehouseName) {
+        this.warehouseNameChange(_WarehouseName.value)
+      }
+    },
+    methods: {
+      printSmall() {
+        window.open('../../../static/inspection.html?type=1&dataList=' + JSON.stringify(this.printData))
+      },
+      printBig() {
+        window.open('../../../static/inspection.html?type=2&dataList=' + JSON.stringify(this.printData))
+      },
+      closePrint() {
+        this.isShowPrint = false
+        this.$router.push({
+          path: 'inspectionManagement'
+        })
+      },
+      find() {
+        this.getList()
+      },
+      inspectInfo(row, index) {
+        for (let i = 0; i < this.warehouseList.length; i++) {
+          if (this.warehouseName == this.warehouseList[i].value) {
+            // console.log(this.warehouseList[i])
+            this.cangid = this.warehouseList[i].warehouseId
+          }
+        }
+        // console.log(this.cangid)
+        //添加,编辑，查看
+        this.$router.push({
+          path: 'inspectInfo',
+          query: {
+            type: index,
+            cangid: this.cangid,
+            id: row.id,
+            warehouseName: this.warehouseName,
+            count: this.warehouseCount,
+            warehouseNo: this.warehouseNo,
+            allowEdit: this.allowEdit,
+            status: row.status
+          },
+        })
+      },
+      warehouseNameChange(e) {
+        for (let i = 0; i < this.warehouseList.length; i++) {
+          if (this.warehouseList[i].value == e) {
+            this.warehouseName = this.warehouseList[i].value
+            this.warehouseCount = this.warehouseList[i].count
+            this.warehouseNo = this.warehouseList[i].No
+            this.cangid = this.warehouseList[i].warehouseId
+            this.allowEdit = this.warehouseList[i].allowEdit
+            this.WAREHOUSE[1].payname = this.warehouseList[i].value
+            this.warehouseList[i].compId = localStorage.getItem('ws-pf_compId')
+            localStorage.setItem('houseSelfCollect_house1', JSON.stringify(this.warehouseList[i]))
+          }
+        }
+        this.getList()
+      },
+      del(row) {
+        //删除
+        this.$confirm('确定删除质检信息？', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            getinspectDelete({
+                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
+          })
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+      selectWarehouse() {
+        selectWarehouseSelf({
+            compId: localStorage.getItem('ws-pf_compId'),
+          })
+          .toPromise()
+          .then((response) => {
+            this.warehouseList1 = response
+            this.warehouseList = []
+            let _wareHouse = localStorage.getItem('houseSelfCollect_house1')
+            _wareHouse = JSON.parse(_wareHouse)
+            for (let i = 0; i < response.length; i++) {
+              if (_wareHouse && response[i].warehouseName == _wareHouse.value) {
+                this.warehouseCount = response[i].count
+                this.allowEdit = response[i].allowEdit
+                this.cangid = _wareHouse.warehouseId
+                this.warehouseName = response[i].warehouseName
+                this.warehouseNo = response[i].commonWarehouseNo
+              }
+              this.warehouseList.push({
+                value: response[i].warehouseName,
+                warehouseId: response[i].id,
+                count: response[i].count,
+                No: response[i].commonWarehouseNo,
+                allowEdit: response[i].allowEdit,
+                compId: localStorage.getItem('ws-pf_compId')
+              })
+              // if (_wareHouse && response[i].warehouseName == _wareHouse.value) {
+              // 		this.cangid = _wareHouse.warehouseId
+              // 		this.warehouseName = response[i].warehouseName
+              // 		this.warehouseNo = response[i].commonWarehouseNo
+              // 		this.warehouseCount =  response[i].count
+              // 		this.allowEdit = response[i].allowEdit
+              // }
+              if (!_wareHouse) {
+                if (this.cangid && this.cangid == response[i].id) {
+                  this.warehouseName = response[i].warehouseName
+                  this.warehouseCount = response[i].count
+                  this.warehouseNo = response[i].commonWarehouseNo
+                  this.allowEdit = response[i].allowEdit
+                }
+                if (this.warehouseList.length > 0 && !this.cangid) {
+                  this.warehouseName = this.warehouseList[0].value
+                  this.warehouseCount = this.warehouseList[0].count
+                  this.warehouseNo = this.warehouseList[0].No
+                  this.cangid = this.warehouseList[0].warehouseId
+                  this.allowEdit = this.warehouseList[0].allowEdit
+                  this.WAREHOUSE[1].payname = this.warehouseList[0].value
+                }
+              }
+            }
+            this.getList()
+          })
+      },
+      getList() {
+        getinspectList({
+            compId: localStorage.getItem('ws-pf_compId'),
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            searchKeyWord: (this.searchKeyWord).toUpperCase(),
+            warehouseName: this.warehouseName,
+            managementType: 1
+          })
+          .toPromise()
+          .then((response) => {
+            this.inspect = response.records
+            this.deptBudgetTotal = response.total
+            // this.$forceUpdate();
+          })
+      },
+      print(row) {
+        getinspectLook({
+            id: row.id,
+          })
+          .toPromise()
+          .then((response) => {
+            this.printData = response
+            this.isShowPrint = true
+            if (response.compName == '黑龙江秋收有限公司') {
+              this.printData.compName = '黑龙江中天昊元贸易有限公司'
+            }
+          })
+      },
+    },
+  }
 </script>
 <style lang="scss" scoped>
-	/deep/.el-dialog__header {
-		text-align: center !important;
-		padding: 10px 0 !important;
-		height: auto !important;
-	}
+  /deep/.el-dialog__header {
+    text-align: center !important;
+    padding: 10px 0 !important;
+    height: auto !important;
+  }
+
+  /deep/.el-dialog__title {
+    font-size: 24px !important;
+  }
+
+  .title {
+    font-size: 20px;
+    font-weight: 600;
+    margin: 20px 0 0 20px;
+  }
+
+  .tit {
+    font-size: 16px;
+    font-weight: 600;
+    margin: 20px;
+  }
 
-	/deep/.el-dialog__title {
-		font-size: 24px !important;
-	}
+  .ws-info-table {
+    border: none;
+  }
 
-	.title {
-		font-size: 20px;
-		font-weight: 600;
-		margin: 20px 0 0 20px;
-	}
+  .ws-info-table .el-form-item {
+    width: 50%;
+    border: none;
+  }
 
-	.tit {
-		font-size: 16px;
-		font-weight: 600;
-		margin: 20px;
-	}
+  /deep/.ws-info-table .el-form-item .el-form-item__label {
+    width: 30%;
+    text-align: center;
+    background: #ffffff;
+    color: #8890b1;
+  }
 
-	.ws-info-table {
-		border: none;
-	}
+  /deep/.ws-info-table .el-form-item .el-form-item__content {
+    border: none;
+  }
 
-	.ws-info-table .el-form-item {
-		width: 50%;
-		border: none;
-	}
+  /deep/.el-table .el-table__header .cell,
+  .el-table .el-table__body .cell {
+    text-align: center;
+  }
 
-	/deep/.ws-info-table .el-form-item .el-form-item__label {
-		width: 30%;
-		text-align: center;
-		background: #ffffff;
-		color: #8890b1;
-	}
+  /deep/.el-table--enable-row-transition .el-table__body td {
+    text-align: center;
+  }
 
-	/deep/.ws-info-table .el-form-item .el-form-item__content {
-		border: none;
-	}
+  /deep/.el-dialog__body {
+    padding: 20px !important;
+  }
 
-	/deep/.el-table .el-table__header .cell,
-	.el-table .el-table__body .cell {
-		text-align: center;
-	}
+  .water-left,
+  .water-right {
+    width: 45%;
+    display: inline-block;
+  }
 
-	/deep/.el-table--enable-row-transition .el-table__body td {
-		text-align: center;
-	}
+  /deep/.base_header_layout .find.el-button--primary {
+    width: 30px;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
 
-	/deep/.el-dialog__body {
-		padding: 20px !important;
-	}
+  /deep/.base_header_layout .findinput input {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
 
-	.water-left,
-	.water-right {
-		width: 45%;
-		display: inline-block;
-	}
-	/deep/.base_header_layout .find.el-button--primary {
-  width: 30px;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-}
-/deep/.base_header_layout .findinput input {
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
-// 	/deep/.el-table--border{
-//   height: calc(100vh - 600px) !important;
-// }
+  // 	/deep/.el-table--border{
+  //   height: calc(100vh - 600px) !important;
+  // }
 </style>

src/views/houseSelfCollect/paymentManagement.vue

@@ -36,8 +36,8 @@
         <ws-button :type="invoicing === 0 ? 'primary' : ''" @click="screen(0)">未开票</ws-button>
       </template>
       <template slot="right">
-        <el-select class="warehouse_select" v-model="warehouseNameKey" placeholder="请选择仓库" @change="warehouseChange" filterable clearable
-          style="margin: 0 10px">
+        <el-select class="warehouse_select" v-model="warehouseNameKey" placeholder="请选择仓库" @change="warehouseChange"
+          filterable clearable style="margin: 0 10px">
           <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName" :value="item.id">
           </el-option>
         </el-select>
@@ -46,7 +46,8 @@
           end-placeholder="结算时间止">
         </el-date-picker>
         <div></div>
-        <ws-input class='findinput' @keyup.enter.native="find()" v-model="searchKeyWord" placeholder="可按编号、客户名、车牌号查找" clearable maxlength="500" type="input">
+        <ws-input class='findinput' @keyup.enter.native="find()" v-model="searchKeyWord" placeholder="可按编号、客户名、车牌号查找"
+          clearable maxlength="500" type="input">
         </ws-input>
         <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
         <ws-button class="find" type="primary" @click="find()">
@@ -80,7 +81,7 @@
       </template>
       <template slot="right"> </template>
     </BaseHeaderLayout>
-    <el-table :data="paymentList" ref="table" style="width: 100%; margin-top: 20px" border height="600"
+    <el-table :data="paymentList" ref="table" style="width: 100%; margin-top: 20px" border height="calc(100% - 170px)"
       @row-click="handleRowClick" @selection-change="handleSelectionChange" :summary-method="getSummaries" show-summary>
       <el-table-column :selectable="selectInit" type="selection" width="30"></el-table-column>
       <el-table-column type="index" label="序号" width="50">
@@ -98,7 +99,8 @@
         </template>
       </el-table-column>
       <el-table-column class="table_td" prop="carNo" label="车牌号"></el-table-column>
-      <el-table-column class="table_td" v-if='warehouseNameKey=="鲅鱼圈金信库"' width='140' prop="actualWeighingFee" label="卸车过磅费（元）"></el-table-column>
+      <el-table-column class="table_td" v-if='warehouseNameKey=="鲅鱼圈金信库"' width='140' prop="actualWeighingFee"
+        label="卸车过磅费（元）"></el-table-column>
       <el-table-column class="table_td" prop="goodsName" width="70" label="货名"></el-table-column>
       <el-table-column class="table_td" prop="type" width="60" label="类型"></el-table-column>
       <el-table-column class="table_td" prop="tidalGrainPrice" width="140" label="净重单价（元/公斤）"></el-table-column>
@@ -219,8 +221,8 @@
                 :on-success="handleAvatarSuccess1" :on-remove="_handleRemove">
                 <img @mouseout='imgshow' @mouseover="deleteshow=true" v-if="payImg" :src="payImg" class="avatar" />
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-                 
-     
+
+
               </el-upload> -->
       <div style="text-align: center; margin: 10px auto">
         <el-button @click="showPayImgs = false" type="primary">关闭</el-button>
@@ -490,20 +492,20 @@
         this.printType = 1
         this.isShowPrintType = true
       },
-      agreementPrint(){
-         var arr = []
-              for (let i = 0; i < this.modification.length; i++) {
-                if(this.modification[i].pictureAddress){
-                  arr.push({
-                  fileUrl: this.modification[i].pictureAddress,
-                  renameFileName: '结算单' + i + '.png',
-                })
-                }
-                
-              }
-              if(arr.length>0){
-                this.filesToRar(arr, '结算单文件')
-              }
+      agreementPrint() {
+        var arr = []
+        for (let i = 0; i < this.modification.length; i++) {
+          if (this.modification[i].pictureAddress) {
+            arr.push({
+              fileUrl: this.modification[i].pictureAddress,
+              renameFileName: '结算单' + i + '.png',
+            })
+          }
+
+        }
+        if (arr.length > 0) {
+          this.filesToRar(arr, '结算单文件')
+        }
       },
       async exportlist() {
         console.log('导出数据', this.modification)
@@ -648,61 +650,61 @@
           data
         } = param
         const sums = []
-        if(this.modification.length>0){
+        if (this.modification.length > 0) {
           columns.forEach((column, index) => {
             console.log(column, index)
-          if (index === 0) {
-            sums[index] = '合计'
-          } else if (
-            index === 10 ||
-            index === 11 || index === 15 || index === 16
+            if (index === 0) {
+              sums[index] = '合计'
+            } else if (
+              index === 10 ||
+              index === 11 || index === 15 || index === 16
 
-          ) {
-            const values = this.modification.map((item) => Number(item[column.property]))
-            if (!values.every((value) => isNaN(value))) {
-              sums[index] = values.reduce((prev, curr) => {
-                const value = Number(curr)
-                if (!isNaN(value)) {
-                  return prev + curr
-                } else {
-                  return prev
-                }
-              }, 0)
-              sums[index] = sums[index].toFixed(3)
+            ) {
+              const values = this.modification.map((item) => Number(item[column.property]))
+              if (!values.every((value) => isNaN(value))) {
+                sums[index] = values.reduce((prev, curr) => {
+                  const value = Number(curr)
+                  if (!isNaN(value)) {
+                    return prev + curr
+                  } else {
+                    return prev
+                  }
+                }, 0)
+                sums[index] = sums[index].toFixed(3)
+              } else {
+                sums[index] = '元'
+              }
             } else {
-              sums[index] = '元'
+              sums[index] = '--'
             }
-          } else {
-            sums[index] = '--'
-          }
-        })
-        }else{
+          })
+        } else {
           columns.forEach((column, index) => {
-          if (index === 0) {
-            sums[index] = '合计'
-          } else if (
-            index === 11 || index === 16 || index === 17
-          ) {
-            const values = data.map((item) => Number(item[column.property]))
-            if (!values.every((value) => isNaN(value))) {
-              sums[index] = values.reduce((prev, curr) => {
-                const value = Number(curr)
-                if (!isNaN(value)) {
-                  return prev + curr
-                } else {
-                  return prev
-                }
-              }, 0)
-              sums[index] = sums[index].toFixed(3)
+            if (index === 0) {
+              sums[index] = '合计'
+            } else if (
+              index === 11 || index === 16 || index === 17
+            ) {
+              const values = data.map((item) => Number(item[column.property]))
+              if (!values.every((value) => isNaN(value))) {
+                sums[index] = values.reduce((prev, curr) => {
+                  const value = Number(curr)
+                  if (!isNaN(value)) {
+                    return prev + curr
+                  } else {
+                    return prev
+                  }
+                }, 0)
+                sums[index] = sums[index].toFixed(3)
+              } else {
+                sums[index] = '元'
+              }
             } else {
-              sums[index] = '元'
+              sums[index] = '--'
             }
-          } else {
-            sums[index] = '--'
-          }
-        })
+          })
         }
-        
+
         // sums[6]=sums[6].toFixed(2)
         // sums[sums.length-2]=sums[sums.length-2].toFixed(2)
         return sums
@@ -923,7 +925,7 @@
                 if (_wareHouse && _wareHouse.value == this.warehouseList[index].warehouseName) {
                   this.warehouseName = this.warehouseList[index].warehouseName
                   this.warehouseNameKey = this.warehouseList[index].warehouseName
-                 break
+                  break
                 } else {
                   this.warehouseNameKey = this.warehouseList[0].id
                   if (this.warehouseName) {
@@ -935,7 +937,7 @@
                 }
               }
             }
-              this.getList()
+            this.getList()
           })
       },
       //上传付款截图
@@ -1598,14 +1600,16 @@
   .el-icon-delete {
     font-size: 20px;
   }
+
   /deep/.base_header_layout .find.el-button--primary {
-  width: 30px;
-  margin:0;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-}
-/deep/.base_header_layout .findinput input {
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
+    width: 30px;
+    margin: 0;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+
+  /deep/.base_header_layout .findinput input {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
 </style>

src/views/houseSelfCollect/weighingManagement.vue

@@ -24,7 +24,8 @@
           end-placeholder="截止时间">
         </el-date-picker>
         <div></div>
-        <ws-input class='findinput' @keyup.enter.native="find()" v-model="searchKeyWord" placeholder="可按编号、客户名、车牌号、货名查找" clearable maxlength="500" type="input">
+        <ws-input class='findinput' @keyup.enter.native="find()" v-model="searchKeyWord" placeholder="可按编号、客户名、车牌号、货名查找"
+          clearable maxlength="500" type="input">
         </ws-input>
         <ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
               vertical-align: text-top;
@@ -34,7 +35,7 @@
             " src="../../../public/img/sousuo.png" alt="" /></ws-button>
       </template>
     </BaseHeaderLayout>
-    <el-table :data="weighingList" style="width: 100%; margin-top: 20px" ref="weighingList" border height="600"
+    <el-table :data="weighingList" style="width: 100%; margin-top: 20px" ref="weighingList" border height="calc(100% - 130px)"
       @row-click="handleRowClick" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55"></el-table-column>
       <el-table-column type="index" label="序号" width="50">
@@ -363,9 +364,9 @@
               .toPromise()
               .then((response) => {
                 index1++;
-              if (response.compName == '黑龙江秋收有限公司') {
-              response.compName = '黑龙江中天昊元贸易有限公司'
-              }
+                if (response.compName == '黑龙江秋收有限公司') {
+                  response.compName = '黑龙江中天昊元贸易有限公司'
+                }
                 this.jjSelectPrintList.push(response)
                 if (index1 == this.modification.length) {
                   this.printBig(1, this.radio)
@@ -389,15 +390,15 @@
             })
             .toPromise()
             .then((response) => {
-              // let printString = localStorage.getItem('ws-pf_compId') + "," + row.qualityNo + "," + this.cangid 
+              // let printString = localStorage.getItem('ws-pf_compId') + "," + row.qualityNo + "," + this.cangid
               // getQRcode({printString}).toPromise()
-					    //       .then((res) => {//二维码
-								this.isShowPrint = true
-								this.dialogData = response
-								// this.printData.qrCodeUrl = res
-							  // })
+              //       .then((res) => {//二维码
+              this.isShowPrint = true
+              this.dialogData = response
+              // this.printData.qrCodeUrl = res
+              // })
               if (response.compName == '黑龙江秋收有限公司') {
-              this.dialogData.compName = '黑龙江中天昊元贸易有限公司'
+                this.dialogData.compName = '黑龙江中天昊元贸易有限公司'
               }
             })
             .catch((response) => {
@@ -425,7 +426,8 @@
         this.getList()
       },
       isConfirmQuality(val) {
-        if (val.qualityInspectionManagement.confirm == '1'&&val.qualityInspectionManagement.warehouseName=='哈尔滨依兰库') return false;
+        if (val.qualityInspectionManagement.confirm == '1' && val.qualityInspectionManagement.warehouseName == '哈尔滨依兰库')
+          return false;
         return true
       },
       weightCheck(row, num) {
@@ -449,7 +451,7 @@
               boxNoOther: row.qualityInspectionManagement.boxNoOther,
               titleNo: row.qualityInspectionManagement.titleNo,
               titleNoOther: row.qualityInspectionManagement.titleNoOther,
-              carModel:row.qualityInspectionManagement.carModel,
+              carModel: row.qualityInspectionManagement.carModel,
               goodsName: row.goodsName,
               grossWeight: row.grossWeight,
               tare: row.tare,
@@ -478,11 +480,10 @@
         this.getList()
       },
       datechange() {
-        if(this.value2){
-        this.startDate = this.value2[0]
-        this.endDate = this.value2[1]
-        }
-        else{
+        if (this.value2) {
+          this.startDate = this.value2[0]
+          this.endDate = this.value2[1]
+        } else {
           this.startDate = ''
           this.endDate = ''
         }
@@ -517,7 +518,7 @@
                 monitorUrl2: response[i].monitorUrl2,
                 id: response[i].id,
                 warehouseNo: response[i].commonWarehouseNo,
-                compId:response[i].compId
+                compId: response[i].compId
               })
               if (_wareHouse && response[i].warehouseName == _wareHouse.value) {
                 this.cangid = _wareHouse.warehouseId
@@ -764,13 +765,15 @@
   .show-excel {
     opacity: 0;
   }
+
   /deep/.base_header_layout .find.el-button--primary {
-  width: 30px;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-}
-/deep/.base_header_layout .findinput input {
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
+    width: 30px;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+
+  /deep/.base_header_layout .findinput input {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
 </style>

src/views/outboundManagement/collectionManagement.vue

@@ -3,226 +3,93 @@
   <div>
     <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
-        <ws-button 
-            :type="searchType == 3 ? 'primary' : ''"
-            @click="handlestatus(3)"
-        >待收款</ws-button>
-        <ws-button 
-            :type="searchType == 4 ? 'primary' : ''"
-            @click="handlestatus(4)"
-        >已收款</ws-button>
-        <ws-button 
-            :type="searchType == '' ? 'primary' : ''"
-            @click="handlestatus('')"
-        >全部</ws-button>
+        <ws-button :type="searchType == 3 ? 'primary' : ''" @click="handlestatus(3)">待收款</ws-button>
+        <ws-button :type="searchType == 4 ? 'primary' : ''" @click="handlestatus(4)">已收款</ws-button>
+        <ws-button :type="searchType == '' ? 'primary' : ''" @click="handlestatus('')">全部</ws-button>
         <ws-button type="primary" @click="adopt" v-hasPermission=" `outbound.collectionOut.view`">备注</ws-button>
         <ws-button type="primary" @click="collect" v-hasPermission=" `outbound.collectionOut.new`">收款</ws-button>
       </template>
       <template slot="right">
-        <el-col
-          style="text-align: right; line-height: 60px; padding-right: 10px"
-        >
-        <div class="el-input el-input--small el-input--suffix">
-          <el-select
-            v-model="contractNo"
-            placeholder="请选择合同"
-            clearable
-            filterable
-            @change="contractchange"
-            maxlength="500"
-            type="input"
-            class="findValue"
-          >
-       
-            <el-option
-              v-if="item.listStatus"
-              v-for="item in options"
-              :key="item.constKey"
-              :label="item.contractNo + '(' + item.listStatus + ')'"
-              :value="item.contractNo"
-            />
-            <el-option
-              v-if="!item.listStatus"
-              v-for="item in options"
-              :key="item.constKey"
-              :label="item.contractNo"
-              :value="item.contractNo"
-            />
-          </el-select>
-             </div>
+        <el-col style="text-align: right; line-height: 60px; padding-right: 10px">
+          <div class="el-input el-input--small el-input--suffix">
+            <el-select v-model="contractNo" placeholder="请选择合同" clearable filterable @change="contractchange"
+              maxlength="500" type="input" class="findValue">
+
+              <el-option v-if="item.listStatus" v-for="item in options" :key="item.constKey"
+                :label="item.contractNo + '(' + item.listStatus + ')'" :value="item.contractNo" />
+              <el-option v-if="!item.listStatus" v-for="item in options" :key="item.constKey" :label="item.contractNo"
+                :value="item.contractNo" />
+            </el-select>
+          </div>
         </el-col>
       </template>
     </BaseHeaderLayout>
-    <el-table
-      :data="collectList"
-      style="width: 100%; margin-top: 20px"
-      ref="collectList"
-      border
-      height="780"
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column
-        :selectable="selectInit"
-        type="selection"
-        width="55"
-      ></el-table-column>
+    <el-table :data="collectList" style="width: 100%; margin-top: 20px" ref="collectList" border height="calc(100% - 110px)"
+      @selection-change="handleSelectionChange">
+      <el-table-column :selectable="selectInit" type="selection" width="55"></el-table-column>
       <el-table-column type="index" label="序号" width="50">
         <template scope="scope">
           <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
           <span v-else>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="carNo"
-        label="车牌号"
-      ></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="goodsName"
-        label="货名"
-      ></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="grossWeight"
-        label="毛重（公斤）"
-      ></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="tare"
-        label="皮重（公斤）"
-      ></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="netWeight"
-        label="净重（公斤）"
-      ></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="contractPrice"
-        label="合同单价（元/公斤）"
-        width="150"
-      ></el-table-column>
-      <el-table-column
-         width='150'
-          class="table_td"
-          prop="calculationCollectable"
-          label="计算应收（元）"
-        ></el-table-column>
-      <el-table-column
-        class="table_td"
-        width='200'
-        prop="actualCollectionment"
-        label="实际应收（元）"
-      >
-      <template slot-scope="scope">
-            <div class="inputChenge">
-              <!-- readonly -->
-              <el-input
-                v-model="scope.row.actualCollectionment"
-                v-if="scope.row.identification == 'true'"
-              ></el-input>
-              <div v-if="scope.row.identification == 'false'" class="inputs">
-                {{ scope.row.actualCollectionment }}
-              </div>
+      <el-table-column class="table_td" prop="carNo" label="车牌号"></el-table-column>
+      <el-table-column class="table_td" prop="goodsName" label="货名"></el-table-column>
+      <el-table-column class="table_td" prop="grossWeight" label="毛重（公斤）"></el-table-column>
+      <el-table-column class="table_td" prop="tare" label="皮重（公斤）"></el-table-column>
+      <el-table-column class="table_td" prop="netWeight" label="净重（公斤）"></el-table-column>
+      <el-table-column class="table_td" prop="contractPrice" label="合同单价（元/公斤）" width="150"></el-table-column>
+      <el-table-column width='150' class="table_td" prop="calculationCollectable" label="计算应收（元）"></el-table-column>
+      <el-table-column class="table_td" width='200' prop="actualCollectionment" label="实际应收（元）">
+        <template slot-scope="scope">
+          <div class="inputChenge">
+            <!-- readonly -->
+            <el-input v-model="scope.row.actualCollectionment" v-if="scope.row.identification == 'true'"></el-input>
+            <div v-if="scope.row.identification == 'false'" class="inputs">
+              {{ scope.row.actualCollectionment }}
             </div>
-            <img
-              width="17"
-              height="18"
-              style="vertical-align: text-top; position: relative; top: -1px"
-              src="../../../public/img/edit.png"
-              @click="whether(scope.row)"
-              v-if="scope.row.identification == 'false'"
-              alt=""
-            />
-            <i
-              class="el-icon-check"
-              style="line-height: 29px; margin-left: 10px"
-              v-if="scope.row.identification == 'true'"
-              @click="varietyClick(scope.row)"
-            ></i>
-            <!-- <div>—</div> -->
-          </template></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="amountEdCollectionable"
-        label="已收款(元)"
-      >
-      <template slot-scope="scope">
-        <div @click="cellClick(scope.row)">{{scope.row.amountEdCollectionable}}</div>
-      </template>
+          </div>
+          <img width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/edit.png" @click="whether(scope.row)" v-if="scope.row.identification == 'false'"
+            alt="" />
+          <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
+            v-if="scope.row.identification == 'true'" @click="varietyClick(scope.row)"></i>
+          <!-- <div>—</div> -->
+        </template>
+      </el-table-column>
+      <el-table-column class="table_td" prop="amountEdCollectionable" label="已收款(元)">
+        <template slot-scope="scope">
+          <div @click="cellClick(scope.row)">{{scope.row.amountEdCollectionable}}</div>
+        </template>
       </el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="collectionDate"
-        width="90"
-        label="收款时间"
-      ></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="status"
-        label="状态"
-      ></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="collectionEdPayable"
-        label="操作"
-        width="200"
-      ><template scope="scope">
-        <el-button @click="collectment(2,scope.row)" v-hasPermission="`outbound.collectionOut.weight`">查看</el-button>
+      <el-table-column class="table_td" prop="collectionDate" width="90" label="收款时间"></el-table-column>
+      <el-table-column class="table_td" prop="status" label="状态"></el-table-column>
+      <el-table-column class="table_td" prop="collectionEdPayable" label="操作" width="200"><template scope="scope">
+          <el-button @click="collectment(2,scope.row)" v-hasPermission="`outbound.collectionOut.weight`">查看</el-button>
         </template>
       </el-table-column>
     </el-table>
     <el-dialog :visible.sync="isShowImgList" title="收款截图">
-     <div v-for="(item,index) in imgList" :key="index"  class="imgList-style">
-       <img :src="item" alt="" class="img">
-     </div>
+      <div v-for="(item,index) in imgList" :key="index" class="imgList-style">
+        <img :src="item" alt="" class="img">
+      </div>
     </el-dialog>
     <!-- 收款 -->
-    <el-dialog
-      width="25%"
-      title="收款"
-      :visible.sync="collectForm"
-      :append-to-body="true"
-    >
+    <el-dialog width="25%" title="收款" :visible.sync="collectForm" :append-to-body="true">
       <el-form :model="form">
         <el-form-item label="未收金额（元）" :label-width="formLabelWidth">
-          <el-input
-            v-model="allmoney1"
-            autocomplete="off"
-            class="deal"
-          ></el-input>
+          <el-input v-model="allmoney1" autocomplete="off" class="deal"></el-input>
         </el-form-item>
         <el-form-item label="本次收款金额（元）" :label-width="formLabelWidth">
-          <el-input
-            v-model="collectmoney"
-            autocomplete="off"
-            placeholder="请输入本次收款金额"
-            class="deal"
-          ></el-input>
+          <el-input v-model="collectmoney" autocomplete="off" placeholder="请输入本次收款金额" class="deal"></el-input>
         </el-form-item>
-        <el-form-item
-          label="收款日期"
-          prop="collectionDate"
-          :label-width="formLabelWidth"
-          class="deal"
-        >
-          <ws-date-picker
-            v-model="collectionDate"
-            type="date"
-            placeholder="请选择收款日期"
-            value-format="yyyy-MM-dd"
-            class="deal"
-          />
+        <el-form-item label="收款日期" prop="collectionDate" :label-width="formLabelWidth" class="deal">
+          <ws-date-picker v-model="collectionDate" type="date" placeholder="请选择收款日期" value-format="yyyy-MM-dd"
+            class="deal" />
         </el-form-item>
         <el-form-item label="上传收款截图" :label-width="formLabelWidth">
-          <el-upload
-            action="https://www.zthymaoyi.com/upload/admin"
-            list-type="picture-card"
-            :on-success="handlePictureCardPreview1"
-            :on-remove="handleRemove"
-            class="photo2"
-          >
+          <el-upload action="https://www.zthymaoyi.com/upload/admin" list-type="picture-card"
+            :on-success="handlePictureCardPreview1" :on-remove="handleRemove" class="photo2">
             <i class="el-icon-plus"></i>
           </el-upload>
           <el-dialog :visible.sync="dialogVisible">
@@ -236,20 +103,10 @@
       </div>
     </el-dialog>
     <!--备注-->
-    <el-dialog
-      width="25%"
-      title="备注"
-      :visible.sync="collectForm1"
-      :append-to-body="true"
-    >
+    <el-dialog width="25%" title="备注" :visible.sync="collectForm1" :append-to-body="true">
       <el-form :model="form">
         <div class="beizhu">
-          <el-input
-            v-model="remarks"
-            autocomplete="off"
-            placeholder="备注信息,不超过1000字"
-            class="deal"
-          ></el-input>
+          <el-input v-model="remarks" autocomplete="off" placeholder="备注信息,不超过1000字" class="deal"></el-input>
         </div>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -259,390 +116,403 @@
     </el-dialog>
     <!-- <houseSelfCollectPrint v-show="false"></houseSelfCollectPrint> -->
     <div style="text-align: center">
-      <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 @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>
-import {
-  getcollection,
-  editcollect,
-  remarksAdd,
-  moneyCollection,
-  contractList
-} from '@/model/outboundManagement/index'
-export default {
-  watch: {},
-  data() {
-    return {
-      imgList:[],
-      isShowImgList:false,
-      //分页
-      currentPage: 1,
-      pageSize: 10,
-      allmoney1:0,
-      deptCircularPage: {},
-      deptBudgetTotal: 0,
-      warehouseList: [
-        {
+  import {
+    getcollection,
+    editcollect,
+    remarksAdd,
+    moneyCollection,
+    contractList
+  } from '@/model/outboundManagement/index'
+  export default {
+    watch: {},
+    data() {
+      return {
+        imgList: [],
+        isShowImgList: false,
+        //分页
+        currentPage: 1,
+        pageSize: 10,
+        allmoney1: 0,
+        deptCircularPage: {},
+        deptBudgetTotal: 0,
+        warehouseList: [{
           collectionEdPayable: '快收款',
+        }, ],
+        options: [],
+        contractNoList: [],
+        contractNo: '全部合同',
+        dialogVisible: false,
+        form: {},
+        compId: localStorage.getItem('ws-pf_compId'),
+        collectForm: false,
+        collectForm1: false,
+        managementType: 3,
+        remarks: '',
+        money: 0,
+        //  id:'',
+        collectmoney: 0,
+        paymentManagementList: [],
+        collectionManagement: {
+          paymentManagementList: [],
+          remarks: '',
         },
-      ],
-      options:[],
-      contractNoList:[],
-      contractNo: '全部合同',
-      dialogVisible: false,
-      form: {},
-      compId: localStorage.getItem('ws-pf_compId'),
-      collectForm: false,
-      collectForm1: false,
-      managementType : 3,
-      remarks:'',
-       money: 0,
-      //  id:'',
-      collectmoney: 0,
-      paymentManagementList:[],
-      collectionManagement:{
-          paymentManagementList:[],
-          remarks:'',
-      },
-      collectList:[],
-      collectionDate: '',
-      collectionScreenshot: '',
-      amountEdCollectionable:'',
-      actualCollectionment:'',
-      // collectDate: '',
-      calculationCollectable:'',
-      searchType: '',
-      searchTypeText: '',
-      formLabelWidth: '120px',
-      searchKeyWord: '',
-      value1: '', //收款日期
-      modification: [],
-    }
-  },
-  activated() {
-    this.getList()
-  },
-  methods: {
-    cellClick(row){
-      this.imgList = row.collectionScreenshot.split('$')
-      this.isShowImgList = true
-      // console.log(val)
-      //  console.log(val2)
-      //   console.log(val3)
-      //    console.log(event)
-      console.log(row)
+        collectList: [],
+        collectionDate: '',
+        collectionScreenshot: '',
+        amountEdCollectionable: '',
+        actualCollectionment: '',
+        // collectDate: '',
+        calculationCollectable: '',
+        searchType: '',
+        searchTypeText: '',
+        formLabelWidth: '120px',
+        searchKeyWord: '',
+        value1: '', //收款日期
+        modification: [],
+      }
     },
-    contractchange(e) {
-      this.contractNo = e
+    activated() {
       this.getList()
     },
-    //修改实际应收
-    varietyClick(row) {
-       if (
-        row.actualCollectionment < 0 ||
-        row.actualCollectionment > 1000000 ||
-        (String(row.actualCollectionment).indexOf('.') != -1 &&
-          String(row.actualCollectionment).length -
+    methods: {
+      cellClick(row) {
+        this.imgList = row.collectionScreenshot.split('$')
+        this.isShowImgList = true
+        // console.log(val)
+        //  console.log(val2)
+        //   console.log(val3)
+        //    console.log(event)
+        console.log(row)
+      },
+      contractchange(e) {
+        this.contractNo = e
+        this.getList()
+      },
+      //修改实际应收
+      varietyClick(row) {
+        if (
+          row.actualCollectionment < 0 ||
+          row.actualCollectionment > 1000000 ||
+          (String(row.actualCollectionment).indexOf('.') != -1 &&
+            String(row.actualCollectionment).length -
             (String(row.actualCollectionment).indexOf('.') + 1) >
             2)
-      ) {
-        this.$message({
-          message: '实际应收输入错误',
-          type: 'warning',
-        })
-        return
-      }
-      if (!row.actualCollectionment) {
-        this.$message({
-          message: '实际应收不能为空',
-          type: 'warning',
-        })
-        return
-      }
-      if (row.actualCollectionment < row.amountEdCollectionable) {
-        this.$message({
-          message: '实际应收不能小于已收款',
-          type: 'warning',
-        })
-        return
-      }
-      this.$confirm(`确定要修改实际应收？`, {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          editcollect({
-            actualCollectionment: row.actualCollectionment,
-            amountNotCollectable:row.actualCollectionment-row.amountEdCollectionable,
+        ) {
+          this.$message({
+            message: '实际应收输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (!row.actualCollectionment) {
+          this.$message({
+            message: '实际应收不能为空',
+            type: 'warning',
+          })
+          return
+        }
+        if (row.actualCollectionment < row.amountEdCollectionable) {
+          this.$message({
+            message: '实际应收不能小于已收款',
+            type: 'warning',
+          })
+          return
+        }
+        this.$confirm(`确定要修改实际应收？`, {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            editcollect({
+                actualCollectionment: row.actualCollectionment,
+                amountNotCollectable: row.actualCollectionment - row.amountEdCollectionable,
+                id: row.id,
+              })
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '修改成功',
+                })
+                this.getList()
+              })
+              .catch((response) => {})
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      whether(row) {
+        row.identification = 'true'
+      },
+      handlestatus(status) {
+        this.searchType = status
+        this.getList()
+      },
+      // ,relationId :row.relationId
+      collectment(index, row) {
+        this.$router.push({
+          path: 'collectionment',
+          query: {
+            type: index,
             id: row.id,
+            relationId: row.relationId,
+            compId: localStorage.getItem('ws-pf_compId')
+          }
+        })
+        // this.$router.push({ path: 'settlement', query: { type: index,id: row.id,waterMin:data1.waterMin} })
+      },
+      collect() {
+        this.allmoney1 = 0
+        if (this.modification.length == 0) {
+          this.$message.warning('请选择一条要收款的条目')
+        } else {
+          for (var i = 0; i < this.modification.length; i++) {
+            this.allmoney1 += this.modification[i].actualCollectionment - this.modification[i].amountEdCollectionable
+          }
+          this.collectForm = true
+        }
+      },
+      collectSubmit() {
+        if (!this.collectionScreenshot) {
+          this.$message({
+            message: '请上传收款截图',
+            type: 'warning',
           })
+          return
+        }
+        this.$confirm(`确定提交收款信息？`, {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning',
+        }).then(() => {
+          moneyCollection({
+              paymentManagementList: this.modification,
+              money: this.collectmoney,
+              collectionDate: this.collectionDate,
+              collectionScreenshot: this.collectionScreenshot,
+            })
             .toPromise()
             .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '修改成功',
-              })
+              this.$message.success('收款成功')
+              this.collectmoney = ''
+              this.collectionDate = ''
+              this.collectionScreenshot = ''
+              this.collectForm = false
               this.getList()
             })
-            .catch((response) => {})
-        })
-        .catch(() => {
-          return false
         })
-    },
-    whether(row) {
-      row.identification = 'true'
-    },
-    handlestatus(status) {
-      this.searchType = status
-      this.getList()
-    },
-    // ,relationId :row.relationId
-    collectment(index,row) {
-      this.$router.push({ path: 'collectionment', 
-      query: { 
-      type: index, 
-      id: row.id ,
-      relationId :row.relationId,
-      compId: localStorage.getItem('ws-pf_compId')} })
-      // this.$router.push({ path: 'settlement', query: { type: index,id: row.id,waterMin:data1.waterMin} })
-    },
-    collect() {
-       this.allmoney1=0
-      if (this.modification.length == 0) {
-        this.$message.warning('请选择一条要收款的条目')
-      } else {
-        for (var i = 0; i < this.modification.length; i++) {
-          this.allmoney1 += this.modification[i].actualCollectionment - this.modification[i].amountEdCollectionable
+      },
+      //添加备注信息
+      adopt() {
+        this.remarks = this.remarks
+        this.paymentManagementList = this.collectList[0].paymentManagementList
+        if (this.modification.length == 0) {
+          this.$message.warning('请选择要备注的条目')
+        } else {
+          this.collectForm1 = true
         }
-        this.collectForm = true
-      }
-    },
-    collectSubmit() {
-     if (!this.collectionScreenshot) {
-        this.$message({
-          message: '请上传收款截图',
-          type: 'warning',
-        })
-        return
-      }
-      this.$confirm(`确定提交收款信息？`, {
-        cancelButtonText: '取消',
-        confirmButtonText: '确定',
-        type: 'warning',
-      }).then(() => {
-        moneyCollection({
-          paymentManagementList: this.modification,
-          money: this.collectmoney,
-          collectionDate: this.collectionDate,
-          collectionScreenshot: this.collectionScreenshot,
-        })
-          .toPromise()
-          .then((response) => {
-            this.$message.success('收款成功')
-            this.collectmoney=''
-            this.collectionDate=''
-            this.collectionScreenshot=''
-            this.collectForm = false
-            this.getList()
+      },
+      adoptRemarks() {
+        this.collectionManagement.remarks = this.remarks
+        this.$confirm(`确定要保存备注信息？`, {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
           })
-      })
-    },
-    //添加备注信息
-    adopt() {
-      this.remarks = this.remarks
-      this.paymentManagementList = this.collectList[0].paymentManagementList
-      if (this.modification.length == 0) {
-        this.$message.warning('请选择要备注的条目')
-      } else {
-        this.collectForm1 = true
-      }
-    },
-    adoptRemarks() {
-      this.collectionManagement.remarks = this.remarks
-      this.$confirm(`确定要保存备注信息？`, {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          remarksAdd({
-            paymentManagementList : this.modification,
-            remarks: this.remarks
-            })
-            .toPromise()
-            .then(() => {
-            this.collectForm1 = false
-            this.$message.success('添加备注信息成功')
-            this.paymentManagementList = {}
-            this.getList()
+          .then(() => {
+            remarksAdd({
+                paymentManagementList: this.modification,
+                remarks: this.remarks
+              })
+              .toPromise()
+              .then(() => {
+                this.collectForm1 = false
+                this.$message.success('添加备注信息成功')
+                this.paymentManagementList = {}
+                this.getList()
 
-            })
-            .catch(() => {
-              return false
-            })
-        })
-    },
-    handlePictureCardPreview1(file) {
-      this.collectionScreenshot = file.url
-    },
-    dataFilter(val) {
-      // console.log(val,"名")
-      this.contractNo = val 
-      if (val) {
-        //val存在
-        this.options = this.contractNoList.filter(item => {
-          if (
-            !!~item.contractNo.indexOf(val) ||
-            !!~item.contractNo.toUpperCase().indexOf(val.toUpperCase())
-          ) {
-            return true
-          }
-        })
-      } else {
-        //val为空时，还原数组
-        this.options = this.contractNoList
-      }
-    },
-    selectInit(row) {
-      //在这里一定要记得类型匹配的上。
-      if (row.approveStatus == null) {
-        return true
-      } else if (row.approveStatus != null) {
-        if (row.taskId == null) {
-          return false
+              })
+              .catch(() => {
+                return false
+              })
+          })
+      },
+      handlePictureCardPreview1(file) {
+        this.collectionScreenshot = file.url
+      },
+      dataFilter(val) {
+        // console.log(val,"名")
+        this.contractNo = val
+        if (val) {
+          //val存在
+          this.options = this.contractNoList.filter(item => {
+            if (
+              !!~item.contractNo.indexOf(val) ||
+              !!~item.contractNo.toUpperCase().indexOf(val.toUpperCase())
+            ) {
+              return true
+            }
+          })
         } else {
+          //val为空时，还原数组
+          this.options = this.contractNoList
+        }
+      },
+      selectInit(row) {
+        //在这里一定要记得类型匹配的上。
+        if (row.approveStatus == null) {
           return true
+        } else if (row.approveStatus != null) {
+          if (row.taskId == null) {
+            return false
+          } else {
+            return true
+          }
         }
-      }
-    },
-    getList(){
-     getcollection({
-       managementType : this.managementType,
-       currentPage:this.currentPage,
-       pageSize:this.pageSize,
-       searchKeyWord:this.searchKeyWord,
-       searchType:this.searchType,
-       warehouseName:this.warehouseName,
-       contractNo: this.contractNo,
-      }).toPromise().then((response) => {
+      },
+      getList() {
+        getcollection({
+          managementType: this.managementType,
+          currentPage: this.currentPage,
+          pageSize: this.pageSize,
+          searchKeyWord: this.searchKeyWord,
+          searchType: this.searchType,
+          warehouseName: this.warehouseName,
+          contractNo: this.contractNo,
+        }).toPromise().then((response) => {
           for (var i = 0; i < response.records.length; i++) {
             response.records[i].identification = 'false'
-            response.records[i].contractPrice =  response.records[i].contractPrice*1000
+            response.records[i].contractPrice = response.records[i].contractPrice * 1000
           }
-           this.collectList = response.records
-           this.deptBudgetTotal = response.total
+          this.collectList = response.records
+          this.deptBudgetTotal = response.total
         })
-      contractList({
-        compId: localStorage.getItem('ws-pf_compId'),
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-      })
-        .toPromise()
-        .then((response) => {
-          this.contractNoList = response
-          this.contractNoList.unshift({contractNo:'全部合同'})
-          this.options=this.contractNoList
-          console.log( this.options[0].listStatus)
-        })
-   },
-    handleRemove(file) {
-      console.log(file)
-    },
-    handleSelectionChange(val) {
-      this.modification = val
-      
-    },
-    selecttaskType() {},
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getList()
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val
-      console.log(`当前页: ${val}`)
-      this.getList()
+        contractList({
+            compId: localStorage.getItem('ws-pf_compId'),
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+          })
+          .toPromise()
+          .then((response) => {
+            this.contractNoList = response
+            this.contractNoList.unshift({
+              contractNo: '全部合同'
+            })
+            this.options = this.contractNoList
+            console.log(this.options[0].listStatus)
+          })
+      },
+      handleRemove(file) {
+        console.log(file)
+      },
+      handleSelectionChange(val) {
+        this.modification = val
+
+      },
+      selecttaskType() {},
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
     },
-},
-}
+  }
 </script>
 <style lang="scss" scoped>
-.ws-info-table {
-  border: none;
-}
-.ws-info-table .el-form-item {
-  width: 50%;
-  border: none;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  width: 30%;
-  text-align: center;
-  background: #ffffff;
-  color: #8890b1;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  border: none;
-}
-.title {
-  font-size: 16px;
-  font-weight: 600;
-}
-.formItem {
-  width: 70% !important;
-}
-/deep/.el-table .el-table__header .cell,
-.el-table .el-table__body .cell {
-  text-align: center;
-}
-/deep/.el-table--enable-row-transition .el-table__body td {
-  text-align: center;
-}
-/deep/.beizhu .el-input--small .el-input__inner {
-  height: 220px;
-  line-height: 28px;
-}
-.inputChenge {
-  width: 40%;
-  display: inline-flex;
-}
-.deal {
-  width: 66%;
-}
-.inputs {
-  margin: 0 auto;
-}
-.el-col-8 {
+  .ws-info-table {
+    border: none;
+  }
+
+  .ws-info-table .el-form-item {
+    width: 50%;
+    border: none;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__label {
+    width: 30%;
+    text-align: center;
+    background: #ffffff;
+    color: #8890b1;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__content {
+    border: none;
+  }
+
+  .title {
+    font-size: 16px;
+    font-weight: 600;
+  }
+
+  .formItem {
+    width: 70% !important;
+  }
+
+  /deep/.el-table .el-table__header .cell,
+  .el-table .el-table__body .cell {
+    text-align: center;
+  }
+
+  /deep/.el-table--enable-row-transition .el-table__body td {
+    text-align: center;
+  }
+
+  /deep/.beizhu .el-input--small .el-input__inner {
+    height: 220px;
+    line-height: 28px;
+  }
+
+  .inputChenge {
+    width: 40%;
+    display: inline-flex;
+  }
+
+  .deal {
+    width: 66%;
+  }
+
+  .inputs {
+    margin: 0 auto;
+  }
+
+  .el-col-8 {
     width: 33.33333%;
-}
-/deep/.findValue .el-input__inner {
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-  width: 385px;
-}
-/deep/.el-select .el-input .el-input--small .el-input--suffix {
+  }
+
+  /deep/.findValue .el-input__inner {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+    width: 385px;
+  }
+
+  /deep/.el-select .el-input .el-input--small .el-input--suffix {
     display: block;
     font-size: 13px;
     margin-left: -67px;
-}
-.imgList-style{
-  width: 50%;
-  display: inline-block;
-  .img{
-    width: 100%;
-    height: 300px;
   }
-}
-</style>
 
+  .imgList-style {
+    width: 50%;
+    display: inline-block;
+
+    .img {
+      width: 100%;
+      height: 300px;
+    }
+  }
+</style>

src/views/outboundManagement/qualityInspectionManagement.vue

@@ -3,53 +3,23 @@
   <div>
     <BaseHeaderLayout :leftSpan="12">
       <template slot="right">
-        <ws-select
-        style='margin-right:10px;'
-          v-model="warehouseName"
-          placeholder=""
-          @change="selecttaskType"
-          :value="searchType"
-        >
-          <ws-option
-            v-for="item in warehouseList"
-            :key="item.value"
-            :label="item.value"
-            :value="item.value"
-            style="color: #8890b1;"
-          />
+        <ws-select style='margin-right:10px;' v-model="warehouseName" placeholder="" @change="selecttaskType"
+          :value="searchType">
+          <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>
-        <ws-button class="find" type="primary" @click="find()"
-          ><img
-            width="16"
-            height="16"
-            style="
+        <ws-input class='findinput' @keyup.enter.native="find()" v-model="searchKeyWord" placeholder="可按合同编号、车牌号查找"
+          clearable maxlength="500" type="input"></ws-input>
+        <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>
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button>
       </template>
     </BaseHeaderLayout>
-    <el-table
-      :data="inspect"
-      style="width: 100%; margin-top: 20px"
-      ref="inspect"
-      border
-      height="780"
-    >
+    <el-table :data="inspect" style="width: 100%; margin-top: 20px" ref="inspect" border height="calc(100% - 110px)">
       <el-table-column type="index" label="序号" width="50">
         <template scope="scope">
           <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
@@ -59,7 +29,7 @@
       <el-table-column prop="contractNo" label="合同编号"></el-table-column>
       <el-table-column prop="carNumber" label="车牌号"></el-table-column>
       <el-table-column prop="goodsName" label="货名"></el-table-column>
-       <el-table-column prop="bulkDensity" label="容重(克/升)"></el-table-column>
+      <el-table-column prop="bulkDensity" label="容重(克/升)"></el-table-column>
       <el-table-column prop="waterContent" label="水分（%）"></el-table-column>
       <el-table-column prop="binNumber" label="仓位号"></el-table-column>
       <el-table-column prop="storageTagNo" label="囤位号"></el-table-column>
@@ -68,163 +38,182 @@
       <el-table-column prop="status" label="状态"></el-table-column>
       <el-table-column width="300" label="操作">
         <template slot-scope="scope">
-          <span v-if="scope.row.status == '已质检'" v-hasPermission=" `outbound.acquisitionQualityOut.view`"><el-button @click="qualityInspection(scope.row, 2)">查看</el-button></span>
-          <span v-if="scope.row.status == '已称毛重' || scope.row.status == '' || scope.row.status == null" v-hasPermission=" `outbound.acquisitionQualityOut.edit`"><el-button @click="qualityInspection(scope.row, 1)">质检</el-button></span>
+          <span v-if="scope.row.status == '已质检'" v-hasPermission=" `outbound.acquisitionQualityOut.view`">
+            <el-button @click="qualityInspection(scope.row, 2)">查看</el-button>
+          </span>
+          <span v-if="scope.row.status == '已称毛重' || scope.row.status == '' || scope.row.status == null"
+            v-hasPermission=" `outbound.acquisitionQualityOut.edit`">
+            <el-button @click="qualityInspection(scope.row, 1)">质检</el-button>
+          </span>
         </template>
       </el-table-column>
     </el-table>
     <div style="text-align: center">
-      <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 @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>
-import {
-  selectWarehouseSelf,
-  getinspectList,
-} from '@/model/outboundManagement/index'
+  import {
+    selectWarehouseSelf,
+    getinspectList,
+  } from '@/model/outboundManagement/index'
 
-export default {
-  components: {},
-  watch: {},
-  data() {
-    return {
-      //分页
-      currentPage: 1,
-      pageSize: 10,
-      deptCircularPage: {},
-      deptBudgetTotal: 0,
-      managementType:3,
-      searchKeyWord: '',
-      taskTypeList: [],
-      searchType: 0,
-      warehouseName: '',
-      inspect: [],
-      warehouseList: [],
-      cangid: '', //仓库id
-    }
-  },
-  activated() {
-    this.selectWarehouse()
-		this.showType = this.isShow
-  },
-  methods: {
-    find(){
-     this.getList()
+  export default {
+    components: {},
+    watch: {},
+    data() {
+      return {
+        //分页
+        currentPage: 1,
+        pageSize: 10,
+        deptCircularPage: {},
+        deptBudgetTotal: 0,
+        managementType: 3,
+        searchKeyWord: '',
+        taskTypeList: [],
+        searchType: 0,
+        warehouseName: '',
+        inspect: [],
+        warehouseList: [],
+        cangid: '', //仓库id
+      }
     },
-    qualityInspection(row, index) {
-      //添加/查看
-      console.log(row.id, 'id值')
-      this.$router.push({
-        path: 'qualityInspection',
-        query: { type: index, cangid: this.cangid, id: row.id ,warehouseName:this.warehouseName,count:this.warehouseCount,
-        warehouseNo:this.warehouseNo,contractNo:row.contractNo,binNumber:row.binNumber,carNumber:row.carNumber,
-        storageTagNo:row.storageTagNo,goodsName:row.goodsName},
-      })
+    activated() {
+      this.selectWarehouse()
+      this.showType = this.isShow
     },
-    selecttaskType(e) {
-      for (let i = 0; i < this.warehouseList.length; i++) {
-					if (this.warehouseList[i].value == e) {
-						this.cangid = this.warehouseList[i].cangid
-					}
-				}
-				this.getList()
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getList()
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val
-      console.log(`当前页: ${val}`)
-      this.getList()
-    },
-  selectWarehouse(){
-    selectWarehouseSelf({
-        compId: localStorage.getItem('ws-pf_compId'),
-      })
-        .toPromise()
-        .then((response) => {
-          this.warehouseList = []
-          for (let i = 0; i < response.length; i++) {
-            this.warehouseList.push({
-              value: response[i].warehouseName,
-              warehouseId: response[i].id,
-            })
-          }
-          this.warehouseName = response[0].warehouseName
-          this.cangid = response[0].id
-          this.getList()
-        })
-    },
-    getList() {
-      getinspectList({
-        compId: localStorage.getItem('ws-pf_compId'),
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        searchKeyWord: this.searchKeyWord,
-        warehouseName: this.warehouseName,
-        managementType : this.managementType,
-      })
-        .toPromise()
-        .then((response) => {
-          this.inspect = response.records
-          this.deptBudgetTotal = response.total
+    methods: {
+      find() {
+        this.getList()
+      },
+      qualityInspection(row, index) {
+        //添加/查看
+        console.log(row.id, 'id值')
+        this.$router.push({
+          path: 'qualityInspection',
+          query: {
+            type: index,
+            cangid: this.cangid,
+            id: row.id,
+            warehouseName: this.warehouseName,
+            count: this.warehouseCount,
+            warehouseNo: this.warehouseNo,
+            contractNo: row.contractNo,
+            binNumber: row.binNumber,
+            carNumber: row.carNumber,
+            storageTagNo: row.storageTagNo,
+            goodsName: row.goodsName
+          },
         })
+      },
+      selecttaskType(e) {
+        for (let i = 0; i < this.warehouseList.length; i++) {
+          if (this.warehouseList[i].value == e) {
+            this.cangid = this.warehouseList[i].cangid
+          }
+        }
+        this.getList()
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+      selectWarehouse() {
+        selectWarehouseSelf({
+            compId: localStorage.getItem('ws-pf_compId'),
+          })
+          .toPromise()
+          .then((response) => {
+            this.warehouseList = []
+            for (let i = 0; i < response.length; i++) {
+              this.warehouseList.push({
+                value: response[i].warehouseName,
+                warehouseId: response[i].id,
+              })
+            }
+            this.warehouseName = response[0].warehouseName
+            this.cangid = response[0].id
+            this.getList()
+          })
+      },
+      getList() {
+        getinspectList({
+            compId: localStorage.getItem('ws-pf_compId'),
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            searchKeyWord: this.searchKeyWord,
+            warehouseName: this.warehouseName,
+            managementType: this.managementType,
+          })
+          .toPromise()
+          .then((response) => {
+            this.inspect = response.records
+            this.deptBudgetTotal = response.total
+          })
+      },
     },
-  },
-}
+  }
 </script>
 <style lang="scss" scoped>
-.title {
-  font-size: 20px;
-  font-weight: 600;
-  margin: 20px 0 0 20px;
-}
-.tit {
-  font-size: 16px;
-  font-weight: 600;
-  margin: 20px;
-}
-.ws-info-table {
-  border: none;
-}
-.ws-info-table .el-form-item {
-  width: 50%;
-  border: none;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  width: 30%;
-  text-align: center;
-  background: #ffffff;
-  color: #8890b1;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  border: none;
-}
-/deep/.el-table .el-table__header .cell,
-.el-table .el-table__body .cell {
-  text-align: center;
-}
-/deep/.el-table--enable-row-transition .el-table__body td {
-  text-align: center;
-}
-/deep/.base_header_layout .find.el-button--primary {
-  width: 30px;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-}
-/deep/.base_header_layout .findinput input {
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
+  .title {
+    font-size: 20px;
+    font-weight: 600;
+    margin: 20px 0 0 20px;
+  }
+
+  .tit {
+    font-size: 16px;
+    font-weight: 600;
+    margin: 20px;
+  }
+
+  .ws-info-table {
+    border: none;
+  }
+
+  .ws-info-table .el-form-item {
+    width: 50%;
+    border: none;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__label {
+    width: 30%;
+    text-align: center;
+    background: #ffffff;
+    color: #8890b1;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__content {
+    border: none;
+  }
+
+  /deep/.el-table .el-table__header .cell,
+  .el-table .el-table__body .cell {
+    text-align: center;
+  }
+
+  /deep/.el-table--enable-row-transition .el-table__body td {
+    text-align: center;
+  }
+
+  /deep/.base_header_layout .find.el-button--primary {
+    width: 30px;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+
+  /deep/.base_header_layout .findinput input {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
 </style>

src/views/outboundManagement/weighingManagement.vue

@@ -1,313 +1,323 @@
 <!--检斤管理-->
 <template>
-	<div>
-		<BaseHeaderLayout :leftSpan="12">
-			<template slot="left">
-				<ws-button type="primary" @click="weighing(3)" v-hasPermission=" `outbound.acquisitionWeightOut.new`">添加皮重</ws-button>
-				<ws-button type="primary" @click="weighing(4)" v-hasPermission=" `outbound.acquisitionWeightOut.new`">添加毛重</ws-button>
-			</template>
-			<!-- <template slot="left"> </template> -->
-			<template slot="right">
-				<ws-select v-model="warehouseName" placeholder="" @change="warehouseNameChange" :value="searchType">
-					<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>
-				<ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
+  <div>
+    <BaseHeaderLayout :leftSpan="12">
+      <template slot="left">
+        <ws-button type="primary" @click="weighing(3)" v-hasPermission=" `outbound.acquisitionWeightOut.new`">添加皮重
+        </ws-button>
+        <ws-button type="primary" @click="weighing(4)" v-hasPermission=" `outbound.acquisitionWeightOut.new`">添加毛重
+        </ws-button>
+      </template>
+      <!-- <template slot="left"> </template> -->
+      <template slot="right">
+        <ws-select v-model="warehouseName" placeholder="" @change="warehouseNameChange" :value="searchType">
+          <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>
+        <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 :data="weighingList" style="width: 100%; margin-top: 20px" ref="weighingList" border height="780">
-			<el-table-column type="index" label="序号" width="50">
-				<template scope="scope">
-					<span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
-					<span v-else>{{ scope.$index + 1 }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column prop="contractNo" width="120" label="合同编号"></el-table-column>
-			<el-table-column prop="goodsName" label="货名"></el-table-column>
-			<el-table-column prop="carNumber" label="车牌号"></el-table-column>
-			<el-table-column prop="grossWeight" label="毛重（公斤）"></el-table-column>
-			<el-table-column prop="tare" label="皮重（公斤）"></el-table-column>
-			<el-table-column prop="netWeight" label="净重（公斤）"></el-table-column>
-			<el-table-column prop="binNumber" label="仓位号"></el-table-column>
-			<el-table-column prop="storageNumber" label="囤位号"></el-table-column>
-			<el-table-column prop="secretaryWeigher" label="司称员"></el-table-column>
-			<el-table-column prop="grossDate"  width="140" label="称重时间">
-				<template slot-scope="scope">
-					{{scope.row.grossDate}}
-					<span v-if="scope.row.grossDate == null">
-						{{scope.row.tareDate}}
-					</span>
-				</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 != null">
-						{{scope.row.addressUrlArray.length == 0? "":scope.row.addressUrlArray.length}}
-					</span>
-				</template>
-			</el-table-column>
-			<el-table-column prop="status" label="状态"></el-table-column>
-			<el-table-column width="300" prop="contractNo1" label="操作">
-				<template slot-scope="scope">
-					<el-button @click="weighing(scope.row, 1)" v-if="scope.row.status != '已质检'" v-hasPermission="`outbound.acquisitionWeightOut.mao`">毛重</el-button>
-					<el-button @click="weighing(scope.row, 2)" v-if="scope.row.status == '已称皮重'" v-hasPermission="`outbound.acquisitionWeightOut.weight`"> 皮重</el-button>
-					<el-button @click="del(scope.row)" v-if="scope.row.status == '已称皮重'" v-hasPermission="`outbound.acquisitionWeightOut.view`">删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table>
-		<div style="text-align: center">
-			<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>
-		<WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
-			@on-cancel="handleClose">
-			<ws-upload ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
-				accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
-		</WinseaContentModal>
-	</div>
+      </template>
+    </BaseHeaderLayout>
+    <el-table :data="weighingList" style="width: 100%; margin-top: 20px" ref="weighingList" border height="calc(100% - 110px)">
+      <el-table-column type="index" label="序号" width="50">
+        <template scope="scope">
+          <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+          <span v-else>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="contractNo" width="120" label="合同编号"></el-table-column>
+      <el-table-column prop="goodsName" label="货名"></el-table-column>
+      <el-table-column prop="carNumber" label="车牌号"></el-table-column>
+      <el-table-column prop="grossWeight" label="毛重（公斤）"></el-table-column>
+      <el-table-column prop="tare" label="皮重（公斤）"></el-table-column>
+      <el-table-column prop="netWeight" label="净重（公斤）"></el-table-column>
+      <el-table-column prop="binNumber" label="仓位号"></el-table-column>
+      <el-table-column prop="storageNumber" label="囤位号"></el-table-column>
+      <el-table-column prop="secretaryWeigher" label="司称员"></el-table-column>
+      <el-table-column prop="grossDate" width="140" label="称重时间">
+        <template slot-scope="scope">
+          {{scope.row.grossDate}}
+          <span v-if="scope.row.grossDate == null">
+            {{scope.row.tareDate}}
+          </span>
+        </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 != null">
+            {{scope.row.addressUrlArray.length == 0? "":scope.row.addressUrlArray.length}}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="status" label="状态"></el-table-column>
+      <el-table-column width="300" prop="contractNo1" label="操作">
+        <template slot-scope="scope">
+          <el-button @click="weighing(scope.row, 1)" v-if="scope.row.status != '已质检'"
+            v-hasPermission="`outbound.acquisitionWeightOut.mao`">毛重</el-button>
+          <el-button @click="weighing(scope.row, 2)" v-if="scope.row.status == '已称皮重'"
+            v-hasPermission="`outbound.acquisitionWeightOut.weight`"> 皮重</el-button>
+          <el-button @click="del(scope.row)" v-if="scope.row.status == '已称皮重'"
+            v-hasPermission="`outbound.acquisitionWeightOut.view`">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div style="text-align: center">
+      <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>
+    <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
+      @on-cancel="handleClose">
+      <ws-upload ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+    </WinseaContentModal>
+  </div>
 </template>
 <script>
-	import {
-		getweighingList,
-		selectWarehouseSelf,
-		delelteWeighing,
-	} from '@/model/outboundManagement/index'
-	import {EventBus} from 'base-core-lib'
-	import WsUpload from '@/components/WsUpload'
-	export default {
-		components: {
-			WsUpload,
-		},
-		data() {
-			return {
-				//分页
-				dialogViewSpareMoney: false,
-				currentPage: 1,
-				pageSize: 10,
-				deptCircularPage: {},
-				deptBudgetTotal: 0,
-				paymentForm: false,
-				paymentForm1: false,
-				weighingList: [],
-				searchKeyWord: '',
-				searchType: [],
-				warehouseName: '',
-				value1: '', //选择时间
-				warehouseList: [],
-				warehouseId: '',
-				accessoryTFs: false,
-				appendixIdss: [],
-				addressUrls: [],
-				compId: localStorage.getItem('ws-pf_compId'),
-			}
-		},
-		activated() {
-			this.selectWarehouse()
-			this.showType = this.isShow
-		},
-		methods: {
-			warehouseNameChange(e) {
-				// this.warehouseName = e
-				console.log(this.warehouseList)
-				for (let i = 0; i < this.warehouseList.length; i++) {
-					if (this.warehouseList[i].value == e) {
-						this.warehouseId = this.warehouseList[i].warehouseId
-					}
-				}
-				this.getList()
-			},
-			weighing(row, num) {
-				console.log
-				this.$router.push({
-					path: 'weighing',
-					query: {
-						typeNo: num,
-						id: row.id,
-						number: row.number,
-						binNumber: row.binNumber,
-						customer: row.customer,
-						storageNumber: row.storageNumber,
-						carNumber: row.carNumber,
-						goodsName: row.goodsName,
-						grossWeight: row.grossWeight,
-						tare: row.tare,
-						netWeight: row.netWeight,
-						relationId: row.relationId,
-						warehouseId: this.warehouseId,
-						warehouseName: this.warehouseName,
-					},
-				})
-			},
-			// Reacquire() {
-			//   //重新获取
-			// },
-			find() {
-				this.getList()
-			},
-			handleSizeChange(val) {
-				console.log(`每页 ${val} 条`)
-				this.pageSize = val
-				this.getList()
-			},
-			handleCurrentChange(val) {
-				this.currentPage = val
-				console.log(`当前页: ${val}`)
-				this.getList()
-			},
-			del(row) {
-				this.$confirm(`检斤信息删除后不可恢复，是否确定删除？`, {
-						cancelButtonText: '取消',
-						confirmButtonText: '确定',
-						type: 'warning',
-					})
-					.then(() => {
-						delelteWeighing({
-								id: row.id
-							})
-							.toPromise()
-							.then((response) => {
-								this.$notify.success({
-									title: '成功',
-									message: '删除成功',
-								})
-								this.getList()
-							})
-							.catch((response) => {})
-					})
-					.catch(() => {
-						return false
-					})
-			},
-			selectWarehouse() {
-				selectWarehouseSelf({
-						compId: localStorage.getItem('ws-pf_compId'),
-					})
-					.toPromise()
-					.then((response) => {
-						this.warehouseList = []
-						for (let i = 0; i < response.length; i++) {
-							this.warehouseList.push({
-								value: response[i].warehouseName,
-								warehouseId: response[i].id,
-							})
-						}
-						this.warehouseName = this.warehouseList[0].value
-						this.warehouseId = this.warehouseList[0].warehouseId
-						this.getList()
-					})
-			},
-			getList() {
-				getweighingList({
-						compId: localStorage.getItem('ws-pf_compId'),
-						currentPage: this.currentPage,
-						pageSize: this.pageSize,
-						searchKeyWord: this.searchKeyWord,
-						warehouseName: this.warehouseName,
-						managementType: 3,
-					})
-					.toPromise()
-					.then((response) => {
-						this.weighingList = response.records
-						this.deptBudgetTotal = response.total
-						for (var i = 0; i < response.records.length; i++) {
-							if (response.records[i].addressUrl != null) {
-								if (response.records[i].addressUrl) {
-									response.records[i].addressUrlArray = response.records[i].addressUrl.split(',')
-								}
-							} else {
-								response.records[i].addressUrlArray = []
-							}
-						}
-						for (var i = 0; i < response.records.length; i++) {
-							var arr = new Array()
-							this.addressUrls[i] = new Array()
-							if (this.weighingList.records[i].addressUrl !=
-								null) {
-								arr = this.weighingList.records[i].addressUrl.split(',')
-								this.addressUrls[i] = arr
-							}
-						}
-					})
-					.catch((response) => {
+  import {
+    getweighingList,
+    selectWarehouseSelf,
+    delelteWeighing,
+  } from '@/model/outboundManagement/index'
+  import {
+    EventBus
+  } from 'base-core-lib'
+  import WsUpload from '@/components/WsUpload'
+  export default {
+    components: {
+      WsUpload,
+    },
+    data() {
+      return {
+        //分页
+        dialogViewSpareMoney: false,
+        currentPage: 1,
+        pageSize: 10,
+        deptCircularPage: {},
+        deptBudgetTotal: 0,
+        paymentForm: false,
+        paymentForm1: false,
+        weighingList: [],
+        searchKeyWord: '',
+        searchType: [],
+        warehouseName: '',
+        value1: '', //选择时间
+        warehouseList: [],
+        warehouseId: '',
+        accessoryTFs: false,
+        appendixIdss: [],
+        addressUrls: [],
+        compId: localStorage.getItem('ws-pf_compId'),
+      }
+    },
+    activated() {
+      this.selectWarehouse()
+      this.showType = this.isShow
+    },
+    methods: {
+      warehouseNameChange(e) {
+        // this.warehouseName = e
+        console.log(this.warehouseList)
+        for (let i = 0; i < this.warehouseList.length; i++) {
+          if (this.warehouseList[i].value == e) {
+            this.warehouseId = this.warehouseList[i].warehouseId
+          }
+        }
+        this.getList()
+      },
+      weighing(row, num) {
+        console.log
+        this.$router.push({
+          path: 'weighing',
+          query: {
+            typeNo: num,
+            id: row.id,
+            number: row.number,
+            binNumber: row.binNumber,
+            customer: row.customer,
+            storageNumber: row.storageNumber,
+            carNumber: row.carNumber,
+            goodsName: row.goodsName,
+            grossWeight: row.grossWeight,
+            tare: row.tare,
+            netWeight: row.netWeight,
+            relationId: row.relationId,
+            warehouseId: this.warehouseId,
+            warehouseName: this.warehouseName,
+          },
+        })
+      },
+      // Reacquire() {
+      //   //重新获取
+      // },
+      find() {
+        this.getList()
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+      del(row) {
+        this.$confirm(`检斤信息删除后不可恢复，是否确定删除？`, {
+            cancelButtonText: '取消',
+            confirmButtonText: '确定',
+            type: 'warning',
+          })
+          .then(() => {
+            delelteWeighing({
+                id: row.id
+              })
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '删除成功',
+                })
+                this.getList()
+              })
+              .catch((response) => {})
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      selectWarehouse() {
+        selectWarehouseSelf({
+            compId: localStorage.getItem('ws-pf_compId'),
+          })
+          .toPromise()
+          .then((response) => {
+            this.warehouseList = []
+            for (let i = 0; i < response.length; i++) {
+              this.warehouseList.push({
+                value: response[i].warehouseName,
+                warehouseId: response[i].id,
+              })
+            }
+            this.warehouseName = this.warehouseList[0].value
+            this.warehouseId = this.warehouseList[0].warehouseId
+            this.getList()
+          })
+      },
+      getList() {
+        getweighingList({
+            compId: localStorage.getItem('ws-pf_compId'),
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            searchKeyWord: this.searchKeyWord,
+            warehouseName: this.warehouseName,
+            managementType: 3,
+          })
+          .toPromise()
+          .then((response) => {
+            this.weighingList = response.records
+            this.deptBudgetTotal = response.total
+            for (var i = 0; i < response.records.length; i++) {
+              if (response.records[i].addressUrl != null) {
+                if (response.records[i].addressUrl) {
+                  response.records[i].addressUrlArray = response.records[i].addressUrl.split(',')
+                }
+              } else {
+                response.records[i].addressUrlArray = []
+              }
+            }
+            for (var i = 0; i < response.records.length; i++) {
+              var arr = new Array()
+              this.addressUrls[i] = new Array()
+              if (this.weighingList.records[i].addressUrl !=
+                null) {
+                arr = this.weighingList.records[i].addressUrl.split(',')
+                this.addressUrls[i] = arr
+              }
+            }
+          })
+          .catch((response) => {
 
-					})
-			},
-			//附件
-			fujian(row) {
-				if (row.addressUrl === null || row.addressUrl === '') {
-					EventBus.$emit(
-						'warning',
-						this.$t('system.noticeCircular.NoInformation')
-					)
-				} else {
-					this.accessoryTFs = true
-				}
-				this.appendixIdss = row.addressUrl
-			},
-			handleClose() {
-				this.dialogViewSpareMoney = false
-			},
-		},
-	}
+          })
+      },
+      //附件
+      fujian(row) {
+        if (row.addressUrl === null || row.addressUrl === '') {
+          EventBus.$emit(
+            'warning',
+            this.$t('system.noticeCircular.NoInformation')
+          )
+        } else {
+          this.accessoryTFs = true
+        }
+        this.appendixIdss = row.addressUrl
+      },
+      handleClose() {
+        this.dialogViewSpareMoney = false
+      },
+    },
+  }
 </script>
 <style lang="scss" scoped>
-	.title {
-		font-size: 20px;
-		font-weight: 600;
-		margin: 20px;
-	}
+  .title {
+    font-size: 20px;
+    font-weight: 600;
+    margin: 20px;
+  }
 
-	.ws-info-table {
-		border: none;
-	}
+  .ws-info-table {
+    border: none;
+  }
 
-	.ws-info-table .el-form-item {
-		width: 50%;
-		border: none;
-	}
+  .ws-info-table .el-form-item {
+    width: 50%;
+    border: none;
+  }
 
-	/deep/.ws-info-table .el-form-item .el-form-item__label {
-		width: 30%;
-		text-align: center;
-		background: #ffffff;
-		color: #8890b1;
-	}
+  /deep/.ws-info-table .el-form-item .el-form-item__label {
+    width: 30%;
+    text-align: center;
+    background: #ffffff;
+    color: #8890b1;
+  }
 
-	/deep/.ws-info-table .el-form-item .el-form-item__content {
-		border: none;
-	}
+  /deep/.ws-info-table .el-form-item .el-form-item__content {
+    border: none;
+  }
 
-	/deep/.el-table .el-table__header .cell,
-	.el-table .el-table__body .cell {
-		text-align: center;
-	}
+  /deep/.el-table .el-table__header .cell,
+  .el-table .el-table__body .cell {
+    text-align: center;
+  }
 
-	/deep/.el-table--enable-row-transition .el-table__body td {
-		text-align: center;
-	}
+  /deep/.el-table--enable-row-transition .el-table__body td {
+    text-align: center;
+  }
 
-	.formItem {
-		width: 51% !important;
-	}
-	/deep/.base_header_layout .find.el-button--primary {
-  width: 30px;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-}
-/deep/.base_header_layout .findinput input {
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
+  .formItem {
+    width: 51% !important;
+  }
+
+  /deep/.base_header_layout .find.el-button--primary {
+    width: 30px;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+
+  /deep/.base_header_layout .findinput input {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
 </style>

src/views/platformaudit/driverreview.vue

@@ -4,135 +4,63 @@
     <BaseHeaderLayout :leftSpan="15">
       <template slot="left"> </template>
       <template slot="right">
-        <ws-select
-          v-model="searchTypeText"
-          placeholder=""
-          class="typeselect"
-          @change="selectExamineType"
-          :value="searchType"
-        >
-          <ws-option
-            v-for="item in searchTypeList"
-            :key="item.value"
-            :label="item.value"
-            :value="item.value"
-            style="color: #8890b1"
-          />
+        <ws-select v-model="searchTypeText" placeholder="" class="typeselect" @change="selectExamineType"
+          :value="searchType">
+          <ws-option v-for="item in searchTypeList" :key="item.value" :label="item.value" :value="item.value"
+            style="color: #8890b1" />
         </ws-select>
-        <ws-input
-        class='findinput'
-          v-model="searchKeyWord"
-           @keyup.enter.native="lookUp()"
-          placeholder="可按身份证号、手机号和姓名查找"
-          clearable
-          maxlength="500"
-          type="input"
-        ></ws-input>
-        <ws-button class="find" type="primary" @click="lookUp()"
-          ><img
-            width="16"
-            height="16"
-            style="
+        <ws-input class='findinput' v-model="searchKeyWord" @keyup.enter.native="lookUp()" placeholder="可按身份证号、手机号和姓名查找"
+          clearable maxlength="500" type="input"></ws-input>
+        <ws-button class="find" type="primary" @click="lookUp()"><img width="16" height="16" style="
               vertical-align: text-top;
               position: relative;
               top: 0px;
               left: -8px;
-            "
-            src="../../../public/img/sousuo.png"
-            alt=""
-        /></ws-button>
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button>
         <!-- </div> -->
       </template>
     </BaseHeaderLayout>
-    <div>
-      <el-table
-        class="wenzi"
-        :data="driverList.records"
-        style="width: 100%; margin-top: 20px"
-        fit
-        ref="expandstable"
-        :expand-row-keys="expands"
-        :row-key="getRowKeys"
-        height="680"
-      >
+      <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"
-                  >
+                  <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-else
-                    label="企业名称"
-                    span="1"
-                    prop="compName"
-                    class="el-car"
-                  >
+                  <ws-form-item :class="item.accountTypeFlag == 1 ? 'personage' : 'company'" v-else 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"
-                  >
+                  <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 }}
                     </div>
                   </ws-form-item>
-                  <ws-form-item
-                    :class="item.accountTypeFlag == 1 ? 'personage' : 'company'"
-                    label="开户行"
-                    span="1"
-                    prop="bankDeposit"
-                    class="el-car"
-                  >
-                    <span
-                      style="
+                  <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;
                         padding-right: 10px;
-                      "
-                      >{{ item.bankDeposit }}</span
-                    ><span
-                      style="
+                      ">{{ item.bankDeposit }}</span><span style="
                         margin: 10px;
                         padding: 0px;
                         display: inline-block;
                         word-wrap: break-word;
                         line-height: 20px;
                         white-space: normal;
-                      "
-                      >{{ item.bankDepositBranch }}</span
-                    >
+                      ">{{ item.bankDepositBranch }}</span>
                   </ws-form-item>
-                  <ws-form-item
-                    :class="item.accountTypeFlag == 1 ? 'personage' : 'company'"
-                    label="账号"
-                    span="1"
-                    prop="bankCard"
-                    class="el-car"
-                  >
-                   <img
-                        width="12"
-                        height="13"
-                        src="../../../public/img/fujian-grey.png"
-                        alt=""
-                        @click="fujian1(item)"
-                      />
+                  <ws-form-item :class="item.accountTypeFlag == 1 ? 'personage' : 'company'" label="账号" span="1"
+                    prop="bankCard" class="el-car">
+                    <img width="12" height="13" src="../../../public/img/fujian-grey.png" alt=""
+                      @click="fujian1(item)" />
                     <div style="width: 100%">{{ item.bankCard }}</div>
                   </ws-form-item>
                 </ws-info-table>
@@ -146,586 +74,568 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="driverName" label="姓名" >
+        <el-table-column prop="driverName" label="姓名">
         </el-table-column>
-        <el-table-column prop="numberCard" label="身份证号" >
+        <el-table-column prop="numberCard" label="身份证号">
         </el-table-column>
-        <el-table-column prop="driverPhone" label="手机号" >
+        <el-table-column prop="driverPhone" label="手机号">
         </el-table-column>
-        <el-table-column prop="carNumber" label="车牌号" >
+        <el-table-column prop="carNumber" label="车牌号">
           <template scope="scope">
-            <ws-select
-              v-model="scope.row.carNumber"
-              placeholder=""
-              @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 v-model="scope.row.carNumber" placeholder="" @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="carModel" label="车型" >
+        <el-table-column prop="carModel" label="车型">
         </el-table-column>
-        <el-table-column prop="carLength" label="车长(米)" >
+        <el-table-column prop="carLength" label="车长(米)">
         </el-table-column>
-        <el-table-column prop="carLoad" label="载重(吨)" >
+        <el-table-column prop="carLoad" label="载重(吨)">
         </el-table-column>
-        <el-table-column prop="yearManufacture" label="出厂年份" >
+        <el-table-column prop="yearManufacture" label="出厂年份">
         </el-table-column>
-        <el-table-column prop="binNumber" label="常驻城市" >
+        <el-table-column prop="binNumber" label="常驻城市">
           <template slot-scope="scope">
             {{ scope.row.residentCityProvincial
             }}{{ scope.row.residentCityMunicipal }}
           </template>
         </el-table-column>
-        <el-table-column prop="updateDate" label="更新时间" width="140" >
+        <el-table-column prop="updateDate" label="更新时间" width="140">
         </el-table-column>
-        <el-table-column prop="addressUrl" label="证件照" >
+        <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=""
-            />
+            <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 label="账户信息" >
+        <el-table-column label="账户信息">
           <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>
+            <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="address" label="审核">
           <template slot-scope="scope">
-            <el-button
-              size="medium"
-              type="text"
-              class="record"
-              v-if="scope.row.authenticationStatusKey==1"
+            <el-button size="medium" type="text" class="record" v-if="scope.row.authenticationStatusKey==1"
               v-hasPermission="
             `audit.driverMerchant.driverMerchantInfo.view`
-          "
-              @click="reject(scope.row)"
-              >驳回</el-button
-            >
-            <el-button
-              size="medium"
-              type="text"
-              class="record"
-              v-if="scope.row.authenticationStatusKey==1"
+          " @click="reject(scope.row)">驳回</el-button>
+            <el-button size="medium" type="text" class="record" v-if="scope.row.authenticationStatusKey==1"
               v-hasPermission="
             `audit.driverMerchant.driverMerchantInfo.view`
-          "
-              @click="adopt(scope.row)"
-              >通过</el-button
-            >
-             <template v-hasPermission="
+          " @click="adopt(scope.row)">通过</el-button>
+            <template v-hasPermission="
             `audit.driverMerchant.driverMerchantInfo.view`
           " v-else-if="scope.row.authenticationStatusKey == 3" slot-scope="scope">
               已驳回
             </template>
             <template v-hasPermission="
-            `audit.driverMerchant.driverMerchantInfo.view`" v-else slot-scope="scope"> 
-            {{ scope.row.authenticationStatus}}
-          </template>
+            `audit.driverMerchant.driverMerchantInfo.view`" v-else slot-scope="scope">
+              {{ scope.row.authenticationStatus}}
+            </template>
           </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 @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>
     <!-- 附件弹框 -->
-    <WinseaContentModal
-      v-model="accessoryTFs"
-      :title="$t('system.noticeCircular.information')"
-      @on-cancel="handleClose"
-    >
+    <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
+      @on-cancel="handleClose">
       <p>查看附件</p>
-      <div
-        style="display: inline-block; margin: 5px"
-        v-for="item in appendixIdss"
-      >
+      <div style="display: inline-block; margin: 5px" v-for="item in appendixIdss">
         <img width="100" height="100" :src="item" alt="" />
       </div>
     </WinseaContentModal>
-    <WinseaContentModal
-      v-model="accesscard"
-      :title="$t('system.noticeCircular.information')"
-      @on-cancel="handleClose1"
-    >
+    <WinseaContentModal v-model="accesscard" :title="$t('system.noticeCircular.information')" @on-cancel="handleClose1">
       <p>查看附件</p>
       <img width="100" height="100" :src="accessurl" alt="" />
     </WinseaContentModal>
   </div>
 </template>
 <script>
-import {
-  driverList,
-  getDriver,
-} from '@/model/platformaudit/index'
-import Pagination from '@/components/Pagination'
-import { provinceAndCityData, CodeToText } from 'element-china-area-data'
-import WsUpload from '@/components/WsUpload'
-import { dayjs, fmoney, EventBus } from 'base-core-lib'
-export default {
-  name: 'viewSpareMoney',
-  components: {
-    WsUpload,
-    Pagination,
-  },
-  watch: {
-    vesselId(val) {
-      this.getList()
+  import {
+    driverList,
+    getDriver,
+  } from '@/model/platformaudit/index'
+  import Pagination from '@/components/Pagination'
+  import {
+    provinceAndCityData,
+    CodeToText
+  } from 'element-china-area-data'
+  import WsUpload from '@/components/WsUpload'
+  import {
+    dayjs,
+    fmoney,
+    EventBus
+  } from 'base-core-lib'
+  export default {
+    name: 'viewSpareMoney',
+    components: {
+      WsUpload,
+      Pagination,
     },
-    isShow(val) {
-      this.showType = val
-    },
-  },
-  data() {
-    return {
-      //弹出框
-      dialogViewSpareMoney: false,
-      dialogApproveFormVisible: false,
-      options_: provinceAndCityData,
-      // 表格显示数据
-      tableDate: [],
-      // 是否显示
-      showType: true,
-      // 年
-      year: '',
-      deptBudgetTotal: 0,
-      currentPage: 1,
-      pageSize: 10,
-      searchType: 1,
-      searchKeyWord: '',
-      contractType: 2,
-      startDate: null,
-      endDate: null,
-      carNumber: '',
-      searchTypeText: '待审核',
-      outerVisible: false,
-      //图片
-      fileList: [],
-      // 提交类型
-      submitType: true,
-      size: 10,
-      spanArr: [],
-      compId: localStorage.getItem('ws-pf_compId'),
-      deptCircularPage: {},
-      date: {
-        year: dayjs().format('YYYY'),
-        month: dayjs().format('MM'),
-      },
-      disablieForm: {},
-      expands: [], //只展开一行放入当前行id
-      getRowKeys: (row) => {
-        //获取当前行id
-        // console.log(row)
-        return row.id //这里看这一行中需要根据哪个属性值是id
-      },
-      driverList: [],
-      deptBudgetList: {},
-      historyList: [],
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          return time.getTime() > Date.now()
-        },
+    watch: {
+      vesselId(val) {
+        this.getList()
       },
-      appendixIdss: [],
-      accessoryTFs: false,
-      accesscard: false,
-      accessurl: '',
-      residentCityProvincial: '',
-      residentCityMunicipal: '',
-      searchTypeList: [
-        { value: '待审核', type: 1 },
-        { value: '已通过', type: 2 },
-        { value: '全部', type: '' },
-      ],
-      driverViewInfo:{
-        id: '',
-        flag: '',
+      isShow(val) {
+        this.showType = val
       },
-    }
-  },
-  activated() {
-    this.getList()
-    this.showType = this.isShow
-  },
-  methods: {
-    expandsHandle(row) {
-      row.expandsStatus = !row.expandsStatus
-      this.$refs.expandstable.toggleRowExpansion(row)
-    },
-    edit(row) {
-      this.$router.push({
-        name: 'driverManagementedit',
-        query: { id: row.id },
-      })
     },
-    //查找
-    handleLook() {
-      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 = ''
+    data() {
+      return {
+        //弹出框
+        dialogViewSpareMoney: false,
+        dialogApproveFormVisible: false,
+        options_: provinceAndCityData,
+        // 表格显示数据
+        tableDate: [],
+        // 是否显示
+        showType: true,
+        // 年
+        year: '',
+        deptBudgetTotal: 0,
+        currentPage: 1,
+        pageSize: 10,
+        searchType: 1,
+        searchKeyWord: '',
+        contractType: 2,
+        startDate: null,
+        endDate: null,
+        carNumber: '',
+        searchTypeText: '待审核',
+        outerVisible: false,
+        //图片
+        fileList: [],
+        // 提交类型
+        submitType: true,
+        size: 10,
+        spanArr: [],
+        compId: localStorage.getItem('ws-pf_compId'),
+        deptCircularPage: {},
+        date: {
+          year: dayjs().format('YYYY'),
+          month: dayjs().format('MM'),
+        },
+        disablieForm: {},
+        expands: [], //只展开一行放入当前行id
+        getRowKeys: (row) => {
+          //获取当前行id
+          // console.log(row)
+          return row.id //这里看这一行中需要根据哪个属性值是id
+        },
+        driverList: [],
+        deptBudgetList: {},
+        historyList: [],
+        pickerBeginDateBefore: {
+          disabledDate: (time) => {
+            return time.getTime() > Date.now()
+          },
+        },
+        appendixIdss: [],
+        accessoryTFs: false,
+        accesscard: false,
+        accessurl: '',
+        residentCityProvincial: '',
+        residentCityMunicipal: '',
+        searchTypeList: [{
+            value: '待审核',
+            type: 1
+          },
+          {
+            value: '已通过',
+            type: 2
+          },
+          {
+            value: '全部',
+            type: ''
+          },
+        ],
+        driverViewInfo: {
+          id: '',
+          flag: '',
+        },
       }
-      this.currentPage = 1
-      this.getList()
-    },
-    look(row) {
-      this.$router.push({
-        name: 'driverManagementview',
-        query: { id: row.id },
-      })
     },
-    //查找
-    lookUp() {
-      this.currentPage = 1
-      this.getList()
-    },
-    handlestatus(status) {
-      this.searchType = status
-      if (status == 1) {
-        this.primary = 1
-      } else if (status == 2) {
-        this.primary = 2
-      } else {
-        this.primary = 3
-      }
+    activated() {
       this.getList()
+      this.showType = this.isShow
     },
-    selectcar(e, row) {
-      console.log(e, row)
-      for (var i = 0; i < row.driverCarInfoList.length; i++) {
-        if (e == row.driverCarInfoList[i].carNumber) {
-          row.carModel = row.driverCarInfoList[i].carModel
-          row.carLength = row.driverCarInfoList[i].carLength
-          row.carLoad = row.driverCarInfoList[i].carLoad
-          row.yearManufacture = row.driverCarInfoList[i].yearManufacture
-        }
-      }
-    },
-    stop(row) {
-      this.outerVisible = true
-      this.disablieForm.id = row.id
-    },
-    //审核通过
-    adopt(row) {
-      this.driverViewInfo.id = row.id
-      this.driverViewInfo.flag = 1
-      this.$confirm(`确定通过该认证信息？`, '提示', {
-        confirmButtonText: '通过',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          getDriver(this.driverViewInfo)
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '通过成功',
-              })
-              this.getList()
-            })
-            .catch((response) => {
-              console.log(response)
-              EventBus.$emit('error', response.message)
-            })
+    methods: {
+      expandsHandle(row) {
+        row.expandsStatus = !row.expandsStatus
+        this.$refs.expandstable.toggleRowExpansion(row)
+      },
+      edit(row) {
+        this.$router.push({
+          name: 'driverManagementedit',
+          query: {
+            id: row.id
+          },
         })
-        .catch(() => {
-          return false
+      },
+      //查找
+      handleLook() {
+        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()
+      },
+      look(row) {
+        this.$router.push({
+          name: 'driverManagementview',
+          query: {
+            id: row.id
+          },
         })
-    },
-    //审核驳回  
-    reject(row) {
-      this.driverViewInfo.id = row.id
-      this.driverViewInfo.flag = 2
-      this.$confirm(`确定驳回该认证信息？`, '提示', {
-        confirmButtonText: '驳回',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          getDriver(this.driverViewInfo)
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '驳回成功',
+      },
+      //查找
+      lookUp() {
+        this.currentPage = 1
+        this.getList()
+      },
+      handlestatus(status) {
+        this.searchType = status
+        if (status == 1) {
+          this.primary = 1
+        } else if (status == 2) {
+          this.primary = 2
+        } else {
+          this.primary = 3
+        }
+        this.getList()
+      },
+      selectcar(e, row) {
+        console.log(e, row)
+        for (var i = 0; i < row.driverCarInfoList.length; i++) {
+          if (e == row.driverCarInfoList[i].carNumber) {
+            row.carModel = row.driverCarInfoList[i].carModel
+            row.carLength = row.driverCarInfoList[i].carLength
+            row.carLoad = row.driverCarInfoList[i].carLoad
+            row.yearManufacture = row.driverCarInfoList[i].yearManufacture
+          }
+        }
+      },
+      stop(row) {
+        this.outerVisible = true
+        this.disablieForm.id = row.id
+      },
+      //审核通过
+      adopt(row) {
+        this.driverViewInfo.id = row.id
+        this.driverViewInfo.flag = 1
+        this.$confirm(`确定通过该认证信息？`, '提示', {
+            confirmButtonText: '通过',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            getDriver(this.driverViewInfo)
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '通过成功',
+                })
+                this.getList()
               })
-              this.getList()
-            })
-            .catch((response) => {
-              console.log(response)
-              EventBus.$emit('error', response.message)
-            })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    handleClose() {
-      this.accessoryTFs = 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() {
-      driverList({
-        compId: localStorage.getItem('ws-pf_compId'),
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        searchType: this.searchType,
-        searchKeyWord: this.searchKeyWord,
-        id: this.id,
-        flag: this.flag,
-      })
-        .toPromise()
-        .then((response) => {
-          for (var i = 0; i < response.records.length; i++) {
-            response.records[i].carNumber =''
-            response.records[i].carModel =''
-            response.records[i].carLength =''
-             response.records[i].carLoad =''
-              response.records[i].yearManufacture =''
-            response.records[i].expandsStatus = false
-            if (response.records[i].addressUrl != null) {
-              response.records[i].addressUrlArray =
-                response.records[i].addressUrl.split(',')
-              this.fileList[i] = response.records[i].addressUrl.split(',')
-            } else {
-              response.records[i].addressUrlArray = []
-            }
-            if(response.records[i].driverCarInfoList.length>0){
-              response.records[i].carNumber =
-              response.records[i].driverCarInfoList[0].carNumber
-              response.records[i].carModel =
-              response.records[i].driverCarInfoList[0].carModel
-              response.records[i].carLength =
-              response.records[i].driverCarInfoList[0].carLength
-              response.records[i].carLoad =
-              response.records[i].driverCarInfoList[0].carLoad
-              response.records[i].yearManufacture =
-              response.records[i].driverCarInfoList[0].yearManufacture
+              .catch((response) => {
+                console.log(response)
+                EventBus.$emit('error', response.message)
+              })
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      //审核驳回
+      reject(row) {
+        this.driverViewInfo.id = row.id
+        this.driverViewInfo.flag = 2
+        this.$confirm(`确定驳回该认证信息？`, '提示', {
+            confirmButtonText: '驳回',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            getDriver(this.driverViewInfo)
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '驳回成功',
+                })
+                this.getList()
+              })
+              .catch((response) => {
+                console.log(response)
+                EventBus.$emit('error', response.message)
+              })
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      handleClose() {
+        this.accessoryTFs = 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() {
+        driverList({
+            compId: localStorage.getItem('ws-pf_compId'),
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            searchType: this.searchType,
+            searchKeyWord: this.searchKeyWord,
+            id: this.id,
+            flag: this.flag,
+          })
+          .toPromise()
+          .then((response) => {
+            for (var i = 0; i < response.records.length; i++) {
+              response.records[i].carNumber = ''
+              response.records[i].carModel = ''
+              response.records[i].carLength = ''
+              response.records[i].carLoad = ''
+              response.records[i].yearManufacture = ''
+              response.records[i].expandsStatus = false
+              if (response.records[i].addressUrl != null) {
+                response.records[i].addressUrlArray =
+                  response.records[i].addressUrl.split(',')
+                this.fileList[i] = response.records[i].addressUrl.split(',')
+              } else {
+                response.records[i].addressUrlArray = []
+              }
+              if (response.records[i].driverCarInfoList.length > 0) {
+                response.records[i].carNumber =
+                  response.records[i].driverCarInfoList[0].carNumber
+                response.records[i].carModel =
+                  response.records[i].driverCarInfoList[0].carModel
+                response.records[i].carLength =
+                  response.records[i].driverCarInfoList[0].carLength
+                response.records[i].carLoad =
+                  response.records[i].driverCarInfoList[0].carLoad
+                response.records[i].yearManufacture =
+                  response.records[i].driverCarInfoList[0].yearManufacture
+              }
             }
+
+            this.deptCircularPage.currentPage = response.current
+            this.deptCircularPage.pageSize = response.size
+            this.deptBudgetTotal = response.total
+            this.driverList = response
+          })
+      },
+      selectExamineType(e) {
+        for (var i = 0; i < this.searchTypeList.length; i++) {
+          if (this.searchTypeList[i].value == e) {
+            this.searchType = this.searchTypeList[i].type
           }
-            
-          this.deptCircularPage.currentPage = response.current
-          this.deptCircularPage.pageSize = response.size
-          this.deptBudgetTotal = response.total
-          this.driverList = response
-        })
-    },
-    selectExamineType(e) {
-      for (var i = 0; i < this.searchTypeList.length; i++) {
-        if (this.searchTypeList[i].value == e) {
-          this.searchType = this.searchTypeList[i].type
         }
-      }
-      this.getList()
-    },
-    fujian(row) {
-      if (row.addressUrl === null || row.addressUrl === '') {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
-      } else {
-        this.accessoryTFs = true
-      }
-      this.appendixIdss = row.addressUrlArray
-    },
-    fujian1(item) {
-      if (item.cardAddressUrl === null || item.cardAddressUrl === '') {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
-      } else {
-        this.accesscard = true
-      }
-      this.accessurl = item.cardAddressUrl
-    },
-    handleExamine(row) {
-      this.$router.push({
-        name: 'salesContractExamine',
-        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
+        this.getList()
+      },
+      fujian(row) {
+        if (row.addressUrl === null || row.addressUrl === '') {
+          EventBus.$emit(
+            'warning',
+            this.$t('system.noticeCircular.NoInformation')
+          )
+        } else {
+          this.accessoryTFs = true
+        }
+        this.appendixIdss = row.addressUrlArray
+      },
+      fujian1(item) {
+        if (item.cardAddressUrl === null || item.cardAddressUrl === '') {
+          EventBus.$emit(
+            'warning',
+            this.$t('system.noticeCircular.NoInformation')
+          )
+        } else {
+          this.accesscard = true
+        }
+        this.accessurl = item.cardAddressUrl
+      },
+      handleExamine(row) {
+        this.$router.push({
+          name: 'salesContractExamine',
+          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() {
+        this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
+        this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
+        this.currentPage = 1
+        this.getList()
+      },
     },
-    find() {
-      this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
-      this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
-      this.currentPage = 1
-      this.getList()
-    },
-  },
-}
+  }
 </script>
 <style lang="scss" scoped>
-.connert {
-  width: 90%;
-  margin: 0 auto;
-}
-.vertical-text-left {
-  width: 62px;
-  text-align: right;
-}
-.findValue {
-  margin: 0 10px;
-}
-/deep/.el-icon-arrow-right {
-  display: none;
-}
+  .connert {
+    width: 90%;
+    margin: 0 auto;
+  }
+
+  .vertical-text-left {
+    width: 62px;
+    text-align: right;
+  }
+
+  .findValue {
+    margin: 0 10px;
+  }
+
+  /deep/.el-icon-arrow-right {
+    display: none;
+  }
+
+  /deep/.el-pagination {
+    text-align: center;
+  }
+
+  .ws-info-table {
+    border-left: 1px solid #e9ecf7;
+    border-top: 1px solid #e9ecf7;
+  }
+
+  /deep/.ws-info-table .el-form-item {
+    border-right: 1px solid #e9ecf7;
+    border-bottom: 1px solid #e9ecf7;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__label {
+    text-align: center;
+    background: #f6f7fc;
+    color: #8890b1;
+    font-size: 12px;
+  }
+
+  .typeselect {
+    margin-right: 10px;
+  }
+
+  /deep/.ws-info-table .el-form-item.company,
+  /deep/.ws-info-table .el-form-item.personage {
+    width: 33.333%;
+  }
+
+  /deep/.ws-info-table .el-form-item.name {
+    width: 15.665%;
+  }
+
+  /deep/.ws-info-table .el-form-item.card {
+    width: 17.665%;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__content {
+    text-align: center;
+    border-left: 1px solid #e9ecf7;
+  }
+
+  /deep/.el-table .el-table__header .cell,
+  /deep/.el-table .el-table__body .cell {
+    text-align: center;
+  }
+
+  /deep/.el-table th.is-leaf,
+  .el-table td {
+    border-right: 1px solid #eee;
+  }
+
+  .el-button--text {
+    color: #5878e8;
+  }
+
+  .el-button--primary {
+    background: #5878e8;
+  }
+
+  //操作按钮
+  .record,
+  .adjustment,
+  .record1 {
+    display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+    font-size: 14px;
+  }
+
+  .record1 {
+    width: 38px;
+    height: 32px;
+  }
+
+  .record:after {
+    position: absolute;
+    content: '';
+    display: block;
+    top: 9px;
+    right: -7px;
+    width: 1px;
+    height: 12px;
+    background: #e9ecf7;
+  }
+
+  /deep/.el-table td {
+    border-right: 1px solid #eee;
+  }
+
+  /deep/.base_header_layout .find.el-button--primary {
+    width: 30px;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
 
-/deep/.el-pagination {
-  text-align: center;
-}
-.ws-info-table {
-  border-left: 1px solid #e9ecf7;
-  border-top: 1px solid #e9ecf7;
-}
-/deep/.ws-info-table .el-form-item {
-  border-right: 1px solid #e9ecf7;
-  border-bottom: 1px solid #e9ecf7;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  text-align: center;
-  background: #f6f7fc;
-  color: #8890b1;
-  font-size: 12px;
-}
-.typeselect{
-  margin-right:10px;
-}
-/deep/.ws-info-table .el-form-item.company,
-/deep/.ws-info-table .el-form-item.personage {
-  width: 33.333%;
-}
-/deep/.ws-info-table .el-form-item.name {
-  width: 15.665%;
-}
-/deep/.ws-info-table .el-form-item.card {
-  width: 17.665%;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  text-align: center;
-  border-left: 1px solid #e9ecf7;
-}
-/deep/.el-table .el-table__header .cell,
-/deep/.el-table .el-table__body .cell {
-  text-align: center;
-}
-/deep/.el-table th.is-leaf,
-.el-table td {
-  border-right: 1px solid #eee;
-}
-.el-button--text {
-  color: #5878e8;
-}
-.el-button--primary {
-  background: #5878e8;
-}
-//操作按钮
-.record,
-.adjustment,
-.record1 {
-  display: inline-block;
-  color: #5878e8;
-  padding: 0 4px !important;
-  position: relative;
-  font-size: 14px;
-}
-.record1 {
-  width: 38px;
-  height: 32px;
-}
-.record:after {
-  position: absolute;
-  content: '';
-  display: block;
-  top: 9px;
-  right: -7px;
-  width: 1px;
-  height: 12px;
-  background: #e9ecf7;
-}
-/deep/.el-table td {
-  border-right: 1px solid #eee;
-}
-/deep/.base_header_layout .find.el-button--primary {
-  width: 30px;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-}
-/deep/.base_header_layout .findinput input {
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
+  /deep/.base_header_layout .findinput input {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
 </style>

src/views/platformaudit/grainPulseDynamic.vue

@@ -3,53 +3,23 @@
   <div>
     <BaseHeaderLayout :leftSpan="15">
       <template slot="right">
-        <ws-select
-          v-model="searchTypeText"
-          placeholder=""
-          class="typeselect"
-          @change="selectExamineType"
-          :value="searchType"
-        >
-          <ws-option
-            v-for="item in searchTypeList"
-            :key="item.value"
-            :label="item.value"
-            :value="item.value"
-            style="color: #8890b1"
-          />
+        <ws-select v-model="searchTypeText" placeholder="" class="typeselect" @change="selectExamineType"
+          :value="searchType">
+          <ws-option v-for="item in searchTypeList" :key="item.value" :label="item.value" :value="item.value"
+            style="color: #8890b1" />
         </ws-select>
-        <ws-input
-        class='findinput'
-          v-model="searchKeyWord"
-          placeholder="可按账号、发布主体查找"
-          clearable
-          maxlength="500"
-           @keyup.enter.native="lookUp()"
-          type="input"
-        ></ws-input>
-        <ws-button class="find" type="primary" @click="lookUp()"
-          ><img
-            width="16"
-            height="16"
-            style="
+        <ws-input class='findinput' v-model="searchKeyWord" placeholder="可按账号、发布主体查找" clearable maxlength="500"
+          @keyup.enter.native="lookUp()" type="input"></ws-input>
+        <ws-button class="find" type="primary" @click="lookUp()"><img width="16" height="16" style="
               vertical-align: text-top;
               position: relative;
               top: 0px;
               left: -8px;
-            "
-            src="../../../public/img/sousuo.png"
-            alt=""
-        /></ws-button>
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button>
         <!-- </div> -->
       </template>
     </BaseHeaderLayout>
-    <div class="container">
-      <el-table
-        class="wenzi"
-        :data="dynamicsList.records"
-        style="width: 100%"
-        height="680"
-      >
+      <el-table class="wenzi" :data="dynamicsList.records" style="width: 100%" height="calc(100% - 110px)">
         <el-table-column type="index" label="序号" width="50">
           <template scope="scope">
             <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
@@ -64,18 +34,12 @@
         </el-table-column>
         <el-table-column prop="" label="操作" width="180">
           <template slot-scope="scope">
-            <div
-              class="record"
-              @click="nocomplete(scope.row)"
-              v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`"
-            >
+            <div class="record" @click="nocomplete(scope.row)"
+              v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`">
               查看
             </div>
-            <div
-              class="record"
-              @click="deleteclick(scope.row)"
-              v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`"
-            >
+            <div class="record" @click="deleteclick(scope.row)"
+              v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`">
               删除
             </div>
           </template>
@@ -84,49 +48,26 @@
           <!-- class="record"
            class="record" -->
           <template slot-scope="scope">
-            <div
-              class="record"
-              v-if="scope.row.statusFlag == 1"
-              @click="rejectList(scope.row)"
-            >
+            <div class="record" v-if="scope.row.statusFlag == 1" @click="rejectList(scope.row)">
               驳回
             </div>
-            <div
-              class="record"
-               v-if="scope.row.statusFlag == 1"
-              @click="adoptList(scope.row)"
-              v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`"
-            >
+            <div class="record" v-if="scope.row.statusFlag == 1" @click="adoptList(scope.row)"
+              v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`">
               通过
             </div>
-            <template
-              v-else
-              v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`"
-              slot-scope="scope"
-            >
+            <template v-else v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`" slot-scope="scope">
               {{ scope.row.status }}
             </template>
           </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 @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>
     <!--动态信息-->
-    <el-dialog
-      width="40%"
-      title="查看动态信息"
-      :visible.sync="dialogFormVisible"
-      :append-to-body="true"
-    >
-      <el-form class="customer"  :model="form">
+    <el-dialog width="40%" title="查看动态信息" :visible.sync="dialogFormVisible" :append-to-body="true">
+      <el-form class="customer" :model="form">
         <el-form-item label="发布主体" :label-width="formLabelWidth">
           {{ SettledCompanyDynamicsList.compName }}
         </el-form-item>
@@ -141,496 +82,534 @@
         </el-form-item>
         <el-form-item label="附件" :label-width="formLabelWidth">
           <div :key="index" v-for="(item, index) in SettledCompanyDynamicsList.address">
-          <img  style="float:left" v-if="item" :src="item" class="avatar">
+            <img style="float:left" v-if="item" :src="item" class="avatar">
           </div>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <span v-if="SettledCompanyDynamicsList.statusFlag == '1'">
-          <el-button @click="reject(id)" >驳回</el-button>
-          <el-button @click="adopt(id)" >通过</el-button>
+          <el-button @click="reject(id)">驳回</el-button>
+          <el-button @click="adopt(id)">通过</el-button>
         </span>
-        <span v-else-if="SettledCompanyDynamicsList.statusFlag != '1'"
-          ><el-button @click="dialogFormVisible = fase">关闭</el-button>
+        <span v-else-if="SettledCompanyDynamicsList.statusFlag != '1'">
+          <el-button @click="dialogFormVisible = fase">关闭</el-button>
         </span>
       </div>
     </el-dialog>
-    
+
   </div>
 </template>
 <script>
-import {
-  dynamicsList,
-  dynamicsLook,
-  dynamicsDelete,
-  dynamicsExamine,
-} from '@/model/platformaudit/index'
-import Pagination from '@/components/Pagination'
-import WsUpload from '@/components/WsUpload'
-import { EventBus } from 'base-core-lib'
-export default {
-  name: 'viewSpareMoney',
-  components: {
-    WsUpload,
-    Pagination,
-  },
-  watch: {
-    vesselId(val) {
-      this.getList()
+  import {
+    dynamicsList,
+    dynamicsLook,
+    dynamicsDelete,
+    dynamicsExamine,
+  } from '@/model/platformaudit/index'
+  import Pagination from '@/components/Pagination'
+  import WsUpload from '@/components/WsUpload'
+  import {
+    EventBus
+  } from 'base-core-lib'
+  export default {
+    name: 'viewSpareMoney',
+    components: {
+      WsUpload,
+      Pagination,
     },
-    isShow(val) {
-      this.showType = val
-    },
-  },
-  data() {
-    return {
-      //弹出框
-      dialogFormVisible: false,
-      dialogViewSpareMoney: false,
-      // 表格显示数据
-      tableDate: [],
-      wrapstatus:false,
-      // 是否显示
-      showType: true,
-      // 年
-      year: '',
-      currentPage: 1,
-      pageSize: 10,
-      deptBudgetTotal: 0,
-      searchTypeText: '待审核',
-      searchKeyWord: '',
-      imgUrl:'',
-      // 提交类型
-      submitType: true,
-      size: 10,
-      spanArr: [],
-      searchType: 1,
-      compId: localStorage.getItem('ws-pf_compId'),
-      deptCircularPage: {},
-      dynamicsList: [],
-      pcFlag: 1,
-      formLabelWidth: '120px',
-      form: {},
-      SettledCompanyDynamicsList: {
-        compName: '',
-        title: '',
-        content: '',
-        address: '',
-        city: '',
+    watch: {
+      vesselId(val) {
+        this.getList()
       },
-      deptBudgetList: {},
-      searchTypeList: [
-        { value: '待审核', type: 1 },
-        { value: '已通过', type: 2 },
-        { value: '全部', type: '' },
-      ],
-      settledCompanyDynamicsInfo: {
-        id: '',
-        flag: '',
+      isShow(val) {
+        this.showType = val
       },
-      accessoryTFs: false,
-    }
-  },
-  activated() {
-    this.getList()
-    this.showType = this.isShow
-  },
-  methods: {
-    
-    getSpanArr(data) {
-      let that = this
-      //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
-      that.spanArr = []
-      that.pos = 0
-      //遍历数据
-      data.forEach((item, index) => {
-        //判断是否是第一项
-
-        // if (index === 0) {
-        //   this.spanArr.push(1)
-        //   this.pos = 0
-        // } else {
-        //不是第一项时，就根据标识去存储
-        if (data[index].warehouseNumViewList.length > 1) {
-          // 查找到符合条件的数据时每次要把之前存储的数据+1
-          this.spanArr[this.pos] = data[index].warehouseNumViewList.length
-          this.spanArr.push(0)
-        } else {
-          // 没有符合的数据时，要记住当前的index
-          this.spanArr.push(1)
-          this.pos = index
-        }
-        // }
-      })
     },
-    //     close(index) {
-    //   this.addressUrls.splice(index, 1)
-    // },
-    //删除
-    deleteclick(row) {
-      this.$confirm(`动态信息删除后不可恢复，是否确定删除？`, {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          dynamicsDelete({
-            id: row.id,
-          })
-            .toPromise()
-            .then((response) => {
-              this.getList()
-            })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    //查看//传参
-    nocomplete(row) {
-      dynamicsLook({
-        id: row.id,
-      })
-        .toPromise()
-        .then((response) => {
-          this.SettledCompanyDynamicsList = response
-           if(response.address!=null){
-          this.SettledCompanyDynamicsList.address=response.address.split(',')
-          }
-          this.id = response.id
-        })
-      this.dialogFormVisible = true
+    data() {
+      return {
+        //弹出框
+        dialogFormVisible: false,
+        dialogViewSpareMoney: false,
+        // 表格显示数据
+        tableDate: [],
+        wrapstatus: false,
+        // 是否显示
+        showType: true,
+        // 年
+        year: '',
+        currentPage: 1,
+        pageSize: 10,
+        deptBudgetTotal: 0,
+        searchTypeText: '待审核',
+        searchKeyWord: '',
+        imgUrl: '',
+        // 提交类型
+        submitType: true,
+        size: 10,
+        spanArr: [],
+        searchType: 1,
+        compId: localStorage.getItem('ws-pf_compId'),
+        deptCircularPage: {},
+        dynamicsList: [],
+        pcFlag: 1,
+        formLabelWidth: '120px',
+        form: {},
+        SettledCompanyDynamicsList: {
+          compName: '',
+          title: '',
+          content: '',
+          address: '',
+          city: '',
+        },
+        deptBudgetList: {},
+        searchTypeList: [{
+            value: '待审核',
+            type: 1
+          },
+          {
+            value: '已通过',
+            type: 2
+          },
+          {
+            value: '全部',
+            type: ''
+          },
+        ],
+        settledCompanyDynamicsInfo: {
+          id: '',
+          flag: '',
+        },
+        accessoryTFs: false,
+      }
     },
-    //查找
-    lookUp() {
-      this.currentPage = 1
+    activated() {
       this.getList()
+      this.showType = this.isShow
     },
-    selectExamineType(e) {
-      for (var i = 0; i < this.searchTypeList.length; i++) {
-        if (this.searchTypeList[i].value == e) {
-          this.searchType = this.searchTypeList[i].type
+    methods: {
+
+      getSpanArr(data) {
+        let that = this
+        //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
+        that.spanArr = []
+        that.pos = 0
+        //遍历数据
+        data.forEach((item, index) => {
+          //判断是否是第一项
+
+          // if (index === 0) {
+          //   this.spanArr.push(1)
+          //   this.pos = 0
+          // } else {
+          //不是第一项时，就根据标识去存储
+          if (data[index].warehouseNumViewList.length > 1) {
+            // 查找到符合条件的数据时每次要把之前存储的数据+1
+            this.spanArr[this.pos] = data[index].warehouseNumViewList.length
+            this.spanArr.push(0)
+          } else {
+            // 没有符合的数据时，要记住当前的index
+            this.spanArr.push(1)
+            this.pos = index
+          }
+          // }
+        })
+      },
+      //     close(index) {
+      //   this.addressUrls.splice(index, 1)
+      // },
+      //删除
+      deleteclick(row) {
+        this.$confirm(`动态信息删除后不可恢复，是否确定删除？`, {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            dynamicsDelete({
+                id: row.id,
+              })
+              .toPromise()
+              .then((response) => {
+                this.getList()
+              })
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      //查看//传参
+      nocomplete(row) {
+        dynamicsLook({
+            id: row.id,
+          })
+          .toPromise()
+          .then((response) => {
+            this.SettledCompanyDynamicsList = response
+            if (response.address != null) {
+              this.SettledCompanyDynamicsList.address = response.address.split(',')
+            }
+            this.id = response.id
+          })
+        this.dialogFormVisible = true
+      },
+      //查找
+      lookUp() {
+        this.currentPage = 1
+        this.getList()
+      },
+      selectExamineType(e) {
+        for (var i = 0; i < this.searchTypeList.length; i++) {
+          if (this.searchTypeList[i].value == e) {
+            this.searchType = this.searchTypeList[i].type
+          }
         }
-      }
-      this.currentPage = 1
-      this.getList()
-    },
-    //审核通过
-    adopt(id) {
-      this.settledCompanyDynamicsInfo.flag = 1
-      this.settledCompanyDynamicsInfo.id = id
-      this.$confirm(`确定通过该动态信息？`, '提示', {
-        confirmButtonText: '通过',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          dynamicsExamine(this.settledCompanyDynamicsInfo)
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '通过成功',
+        this.currentPage = 1
+        this.getList()
+      },
+      //审核通过
+      adopt(id) {
+        this.settledCompanyDynamicsInfo.flag = 1
+        this.settledCompanyDynamicsInfo.id = id
+        this.$confirm(`确定通过该动态信息？`, '提示', {
+            confirmButtonText: '通过',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            dynamicsExamine(this.settledCompanyDynamicsInfo)
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '通过成功',
+                })
+                this.dialogFormVisible = false
+                this.getList()
               })
-              this.dialogFormVisible = false
-              this.getList()
-            })
-            .catch((response) => {
-              EventBus.$emit('error', response.message)
-            })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    //列表审核通过
-    adoptList(row) {
-      this.settledCompanyDynamicsInfo.flag = 1
-      this.settledCompanyDynamicsInfo.id = row.id
-      this.$confirm(`确定通过该动态信息？`, '提示', {
-        confirmButtonText: '通过',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          dynamicsExamine(this.settledCompanyDynamicsInfo)
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '通过成功',
+              .catch((response) => {
+                EventBus.$emit('error', response.message)
               })
-              this.getList()
-            })
-            .catch((response) => {
-              EventBus.$emit('error', response.message)
-            })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    //审核驳回
-    reject(id) {
-      this.settledCompanyDynamicsInfo.flag = 2
-      this.settledCompanyDynamicsInfo.id = id
-      this.$confirm(`确定驳回该动态信息？`, '提示', {
-        confirmButtonText: '驳回',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          dynamicsExamine(this.settledCompanyDynamicsInfo)
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '驳回成功',
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      //列表审核通过
+      adoptList(row) {
+        this.settledCompanyDynamicsInfo.flag = 1
+        this.settledCompanyDynamicsInfo.id = row.id
+        this.$confirm(`确定通过该动态信息？`, '提示', {
+            confirmButtonText: '通过',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            dynamicsExamine(this.settledCompanyDynamicsInfo)
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '通过成功',
+                })
+                this.getList()
               })
-              this.dialogFormVisible = false
-              this.getList()
-            })
-            .catch((response) => {
-              console.log(response)
-              EventBus.$emit('error', response.message)
-            })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    //列表审核驳回
-    rejectList(row) {
-      this.settledCompanyDynamicsInfo.flag = 2
-      this.settledCompanyDynamicsInfo.id = row.id
-      this.$confirm(`确定驳回该动态信息？`, '提示', {
-        confirmButtonText: '驳回',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          dynamicsExamine(this.settledCompanyDynamicsInfo)
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '驳回成功',
+              .catch((response) => {
+                EventBus.$emit('error', response.message)
               })
-              this.getList()
-            })
-            .catch((response) => {
-              console.log(response)
-              EventBus.$emit('error', response.message)
-            })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    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')
-          )
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      //审核驳回
+      reject(id) {
+        this.settledCompanyDynamicsInfo.flag = 2
+        this.settledCompanyDynamicsInfo.id = id
+        this.$confirm(`确定驳回该动态信息？`, '提示', {
+            confirmButtonText: '驳回',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            dynamicsExamine(this.settledCompanyDynamicsInfo)
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '驳回成功',
+                })
+                this.dialogFormVisible = false
+                this.getList()
+              })
+              .catch((response) => {
+                console.log(response)
+                EventBus.$emit('error', response.message)
+              })
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      //列表审核驳回
+      rejectList(row) {
+        this.settledCompanyDynamicsInfo.flag = 2
+        this.settledCompanyDynamicsInfo.id = row.id
+        this.$confirm(`确定驳回该动态信息？`, '提示', {
+            confirmButtonText: '驳回',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            dynamicsExamine(this.settledCompanyDynamicsInfo)
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '驳回成功',
+                })
+                this.getList()
+              })
+              .catch((response) => {
+                console.log(response)
+                EventBus.$emit('error', response.message)
+              })
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      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()          // 秒
+          // 有其他格式化字符需求可以继续添加，必须转化成字符串
         }
-      }
-      return fmt
-    },
-    handleClose() {
-      this.accessoryTFs = false
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getList()
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val
-      console.log(`当前页: ${val}`)
-      this.getList()
-    },
-    //粮脉动态列表
-    getList() {
-      dynamicsList({
-        searchType: this.searchType,
-        // phone: this.phone,
-        pcFlag: this.pcFlag,
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        searchKeyWord: this.searchKeyWord,
-      })
-        .toPromise()
-        .then((response) => {
-          this.dynamicsList = response
-          this.deptCircularPage.currentPage = response.current
-          this.deptCircularPage.pageSize = response.size
-          this.deptBudgetTotal = response.total
-        })
-    },
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    handleCloe() {
-      this.dialogViewSpareMoney = false
+        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.accessoryTFs = false
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+      //粮脉动态列表
+      getList() {
+        dynamicsList({
+            searchType: this.searchType,
+            // phone: this.phone,
+            pcFlag: this.pcFlag,
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            searchKeyWord: this.searchKeyWord,
+          })
+          .toPromise()
+          .then((response) => {
+            this.dynamicsList = response
+            this.deptCircularPage.currentPage = response.current
+            this.deptCircularPage.pageSize = response.size
+            this.deptBudgetTotal = response.total
+          })
+      },
+      // 关闭 dialog时 处理文件url 初始化upload组件
+      handleCloe() {
+        this.dialogViewSpareMoney = false
+      },
     },
-  },
-}
+  }
 </script>
 <style lang="scss" scoped>
-.container {
-  width: 100%;
-  margin: 0 auto;
-}
-.vertical-text-left {
-  width: 62px;
-  text-align: right;
-}
-.el-button--primary {
-  background-color: #5878e8;
-  border-color: #5878e8;
-}
-.el-button--default {
-  color: #8890b1;
-  border-color: #e8eaf1;
-}
-/deep/.base_header_layout .grid-content.right .find.el-button--primary {
-  width: 30px;
-  margin-left: 0;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-}
-/deep/.findValue .el-input__inner {
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
-//操作按钮
-.record,
-.adjustment {
-  display: inline-block;
-  color: #5878e8;
-  padding: 0 4px !important;
-  position: relative;
-  font-size: 14px;
-}
-.record:after {
-  position: absolute;
-  content: '';
-  display: block;
-  top: 5px;
-  right: -2px;
-  width: 1px;
-  height: 12px;
-  background: #e9ecf7;
-}
-//状态样式
-.executory,
-.inExecution,
-.done {
-  width: 6px;
-  height: 6px;
-  display: inline-block;
-  border-radius: 50%;
-  position: relative;
-  top: -1px;
-  font-size: 14px;
-}
-.executory {
-  background: #ff9f24;
-}
-.inExecution {
-  background: #5878e8;
-}
-.done {
-  background: #50cad4;
-}
-.putstorage.el-button--default,
-.deliverystorage.el-button--default {
-  border-color: #8890b1;
-  background-color: #fff;
-  color: #8890b1;
-}
-/deep/.el-table td,
-/deep/.el-table th.is-leaf {
-  border-right: 1px solid #e9ecf7;
-  text-align: center;
-}
-/deep/.el-table tr td:first-child,
-/deep/.el-table tr th.is-leaf:first-child {
-  border-left: 1px solid #e9ecf7;
-}
-.el-row {
-  height: 60px;
-}
-.base_header_layout .grid-content {
-  margin-top: 80px;
-}
-
-.el-input--small .el-input__inner {
-  margin-left: 20px;
-}
-.el-range-editor--small.el-input__inner {
-  height: 32px;
-  margin: 0 10px;
-}
-/deep/.el-pagination {
-  text-align: center;
-  white-space: nowrap;
-  padding: 2px 5px;
-  color: #303133;
-  font-weight: 700;
-  margin-bottom: 20px;
-}
-.el-select {
-  width: 30%;
-  margin-right: 10px;
-}
-.el-tag + .el-tag {
-  margin-left: 10px;
-}
-.button-new-tag {
-  margin-left: 10px;
-  height: 32px;
-  line-height: 30px;
-  padding-top: 0;
-  padding-bottom: 0;
-}
-.input-new-tag {
-  width: 90px;
-  margin-left: 10px;
-  vertical-align: bottom;
-}
-.customer .el-form-item {
-  border-bottom: 1px solid #ccc;
-}
-/deep/.typeselect .el-input__inner {
-  color: #8890b1;
-}
-.avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
-.shade{
-background:rgba(0,0,0,0.1);
-}
-/deep/.base_header_layout .find.el-button--primary {
-  width: 30px;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-}
-/deep/.base_header_layout .findinput input {
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
+  .container {
+    width: 100%;
+    margin: 0 auto;
+  }
+
+  .vertical-text-left {
+    width: 62px;
+    text-align: right;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+  }
+
+  .el-button--default {
+    color: #8890b1;
+    border-color: #e8eaf1;
+  }
+
+  /deep/.base_header_layout .grid-content.right .find.el-button--primary {
+    width: 30px;
+    margin-left: 0;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+
+  /deep/.findValue .el-input__inner {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
+
+  //操作按钮
+  .record,
+  .adjustment {
+    display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+    font-size: 14px;
+  }
+
+  .record:after {
+    position: absolute;
+    content: '';
+    display: block;
+    top: 5px;
+    right: -2px;
+    width: 1px;
+    height: 12px;
+    background: #e9ecf7;
+  }
+
+  //状态样式
+  .executory,
+  .inExecution,
+  .done {
+    width: 6px;
+    height: 6px;
+    display: inline-block;
+    border-radius: 50%;
+    position: relative;
+    top: -1px;
+    font-size: 14px;
+  }
+
+  .executory {
+    background: #ff9f24;
+  }
+
+  .inExecution {
+    background: #5878e8;
+  }
+
+  .done {
+    background: #50cad4;
+  }
+
+  .putstorage.el-button--default,
+  .deliverystorage.el-button--default {
+    border-color: #8890b1;
+    background-color: #fff;
+    color: #8890b1;
+  }
+
+  /deep/.el-table td,
+  /deep/.el-table th.is-leaf {
+    border-right: 1px solid #e9ecf7;
+    text-align: center;
+  }
+
+  /deep/.el-table tr td:first-child,
+  /deep/.el-table tr th.is-leaf:first-child {
+    border-left: 1px solid #e9ecf7;
+  }
+
+  .el-row {
+    height: 60px;
+  }
+
+  .base_header_layout .grid-content {
+    margin-top: 80px;
+  }
+
+  .el-input--small .el-input__inner {
+    margin-left: 20px;
+  }
+
+  .el-range-editor--small.el-input__inner {
+    height: 32px;
+    margin: 0 10px;
+  }
+
+  /deep/.el-pagination {
+    text-align: center;
+    white-space: nowrap;
+    padding: 2px 5px;
+    color: #303133;
+    font-weight: 700;
+    margin-bottom: 20px;
+  }
+
+  .el-select {
+    width: 30%;
+    margin-right: 10px;
+  }
+
+  .el-tag+.el-tag {
+    margin-left: 10px;
+  }
+
+  .button-new-tag {
+    margin-left: 10px;
+    height: 32px;
+    line-height: 30px;
+    padding-top: 0;
+    padding-bottom: 0;
+  }
+
+  .input-new-tag {
+    width: 90px;
+    margin-left: 10px;
+    vertical-align: bottom;
+  }
+
+  .customer .el-form-item {
+    border-bottom: 1px solid #ccc;
+  }
+
+  /deep/.typeselect .el-input__inner {
+    color: #8890b1;
+  }
+
+  .avatar {
+    width: 178px;
+    height: 178px;
+    display: block;
+  }
+
+  .shade {
+    background: rgba(0, 0, 0, 0.1);
+  }
+
+  /deep/.base_header_layout .find.el-button--primary {
+    width: 30px;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+
+  /deep/.base_header_layout .findinput input {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
 </style>

src/views/platformaudit/grainmerchantreview.vue

@@ -4,287 +4,156 @@
     <BaseHeaderLayout :leftSpan="15">
       <template slot="left"> </template>
       <template slot="right">
-        <ws-select
-          v-model="searchTypeText"
-          placeholder=""
-          class="typeselect"
-          @change="selectExamineType"
-          :value="searchType"
-        >
-          <ws-option
-            v-for="item in searchTypeList"
-            :key="item.value"
-            :label="item.value"
-            :value="item.value"
-            style="color: #8890b1"
-          />
+        <ws-select v-model="searchTypeText" placeholder="" class="typeselect" @change="selectExamineType"
+          :value="searchType">
+          <ws-option v-for="item in searchTypeList" :key="item.value" :label="item.value" :value="item.value"
+            style="color: #8890b1" />
         </ws-select>
-        <ws-input
-        style='findinput'
-         @keyup.enter.native="lookUp()"
-          v-model="searchKeyWord"
-          placeholder="可按身份证号、手机号和姓名查找"
-          clearable
-          maxlength="500"
-          type="input"
-        ></ws-input>
-        <ws-button class="find" type="primary" @click="lookUp()"
-          ><img
-            width="16"
-            height="16"
-            style="
+        <ws-input style='findinput' @keyup.enter.native="lookUp()" v-model="searchKeyWord" placeholder="可按身份证号、手机号和姓名查找"
+          clearable maxlength="500" type="input"></ws-input>
+        <ws-button class="find" type="primary" @click="lookUp()"><img width="16" height="16" style="
               vertical-align: text-top;
               position: relative;
               top: 0px;
               left: -8px;
-            "
-            src="../../../public/img/sousuo.png"
-            alt=""
-        /></ws-button>
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button>
         <!-- </div> -->
       </template>
     </BaseHeaderLayout>
-    <div>
-      <el-table
-        class="wenzi"
-        :data="driverList.records"
-        style="width: 100%; margin-top: 20px"
-        fit
-        ref="expandstable"
-        :expand-row-keys="expands"
-        :row-key="getRowKeys"
-        height="680"
-      >
-        <el-table-column type="expand">
-          <template slot-scope="props">
-            <ws-form>
-              <ws-info-table>
-                <ws-form-item
-                  :class="
+    <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>
+            <ws-info-table>
+              <ws-form-item :class="
                     props.row.customerTypeFlag == 1 ? 'personage' : 'company'
-                  "
-                  v-if="props.row.customerTypeFlag == 1"
-                  label="收款人"
-                  span="1"
-                  prop="payeeName"
-                  class="el-car name"
-                >
-                  <div style="width: 100%">{{ props.row.payeeName }}</div>
-                </ws-form-item>
-                <ws-form-item
-                  :class="
+                  " v-if="props.row.customerTypeFlag == 1" label="收款人" span="1" prop="payeeName" class="el-car name">
+                <div style="width: 100%">{{ props.row.payeeName }}</div>
+              </ws-form-item>
+              <ws-form-item :class="
                     props.row.customerTypeFlag == 1 ? 'personage' : 'company'
-                  "
-                  v-if="props.row.customerTypeFlag == 2"
-                  label="企业名称"
-                  span="1"
-                  prop="compName"
-                  class="el-car"
-                >
-                  <div style="width: 100%">{{ props.row.compName }}</div>
-                </ws-form-item>
-                <ws-form-item
-                  :class="
+                  " v-if="props.row.customerTypeFlag == 2" label="企业名称" span="1" prop="compName" class="el-car">
+                <div style="width: 100%">{{ props.row.compName }}</div>
+              </ws-form-item>
+              <ws-form-item :class="
                     props.row.customerTypeFlag == 1 ? 'personage' : 'company'
-                  "
-                  v-if="props.row.customerTypeFlag == 1"
-                  label="身份证"
-                  span="1"
-                  prop="payeeNumberCard"
-                  class="el-car card"
-                >
-                  <div style="width: 100%">
-                    {{ props.row.payeeNumberCard }}
-                  </div>
-                </ws-form-item>
-                <ws-form-item
-                  :class="
+                  " v-if="props.row.customerTypeFlag == 1" label="身份证" span="1" prop="payeeNumberCard"
+                class="el-car card">
+                <div style="width: 100%">
+                  {{ props.row.payeeNumberCard }}
+                </div>
+              </ws-form-item>
+              <ws-form-item :class="
                     props.row.customerTypeFlag == 1 ? 'personage' : 'company'
-                  "
-                  label="开户行"
-                  span="1"
-                  prop="bankDeposit"
-                  class="el-car"
-                >
-                  <span
-                      style="
+                  " label="开户行" span="1" prop="bankDeposit" class="el-car">
+                <span style="
                         margin: 10px;
                         display: inline-block;
                         border-right: 1px solid #e9ecf7;
                         padding-right: 10px;
-                      "
-                      >{{ props.row.bankDeposit }}</span
-                    ><span
-                      style="
+                      ">{{ props.row.bankDeposit }}</span><span style="
                         margin: 10px;
                         padding: 0px;
                         display: inline-block;
                         word-wrap: break-word;
                         line-height: 20px;
                         white-space: normal;
-                      "
-                      >{{ props.row.bankDepositBranch }}</span
-                    >
-                </ws-form-item>
-                <ws-form-item
-                  :class="
+                      ">{{ props.row.bankDepositBranch }}</span>
+              </ws-form-item>
+              <ws-form-item :class="
                     props.row.customerTypeFlag == 1 ? 'personage' : 'company'
-                  "
-                  label="账号"
-                  span="1"
-                  prop="bankCard"
-                  class="el-car"
-                >
-                  <div style="width: 100%">{{ props.row.bankCard }}</div>
-                </ws-form-item>
-              </ws-info-table>
-            </ws-form>
-          </template>
-        </el-table-column>
-        <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="customerType" label="类型"> </el-table-column>
-        <el-table-column prop="customerName" label="姓名"> </el-table-column>
-        <el-table-column prop="customerNumberCard" label="身份证号">
-        </el-table-column>
-        <el-table-column prop="customerPhone" label="手机号"> </el-table-column>
-        <el-table-column prop="payTaxesCard" label="纳税人识别号">
-        </el-table-column>
-        <el-table-column prop="compAddress" label="地址"> </el-table-column>
-        <el-table-column prop="updateDate" label="更新时间"> </el-table-column>
-        <el-table-column prop="businessLicenseAddressUrl" label="附件">
-          <template slot-scope="scope">
-            <img
-              width="18"
-              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">{{
+                  " label="账号" span="1" prop="bankCard" class="el-car">
+                <div style="width: 100%">{{ props.row.bankCard }}</div>
+              </ws-form-item>
+            </ws-info-table>
+          </ws-form>
+        </template>
+      </el-table-column>
+      <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="customerType" label="类型"> </el-table-column>
+      <el-table-column prop="customerName" label="姓名"> </el-table-column>
+      <el-table-column prop="customerNumberCard" label="身份证号">
+      </el-table-column>
+      <el-table-column prop="customerPhone" label="手机号"> </el-table-column>
+      <el-table-column prop="payTaxesCard" label="纳税人识别号">
+      </el-table-column>
+      <el-table-column prop="compAddress" label="地址"> </el-table-column>
+      <el-table-column prop="updateDate" label="更新时间"> </el-table-column>
+      <el-table-column prop="businessLicenseAddressUrl" label="附件">
+        <template slot-scope="scope">
+          <img width="18" 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 label="账户信息">
-          <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="address" label="审核">
-          <template slot-scope="scope">
-            <el-button
-              size="medium"
-              type="text"
-              class="record"
-              v-if="scope.row.authenticationStatusKey == 1"
-              v-hasPermission="
-            `audit.grainMerchant.grainMerchantInfo.view`"
-              @click="reject(scope.row)"
-              >驳回</el-button
-            >
-            <el-button
-              size="medium"
-              type="text"
-              class="record"
-              v-if="scope.row.authenticationStatusKey == 1"
-              v-hasPermission="
-            `audit.grainMerchant.grainMerchantInfo.view`"
-              @click="adopt(scope.row)"
-              >通过</el-button
-            >
-             <template v-else-if="scope.row.authenticationStatusKey == 3"
-             v-hasPermission="
-            `audit.grainMerchant.grainMerchantInfo.view`" slot-scope="scope">
-              已驳回
-            </template>
-            <template v-else
+        </template>
+      </el-table-column>
+      <el-table-column label="账户信息">
+        <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="address" label="审核">
+        <template slot-scope="scope">
+          <el-button size="medium" type="text" class="record" v-if="scope.row.authenticationStatusKey == 1"
+            v-hasPermission="
+            `audit.grainMerchant.grainMerchantInfo.view`" @click="reject(scope.row)">驳回</el-button>
+          <el-button size="medium" type="text" class="record" v-if="scope.row.authenticationStatusKey == 1"
             v-hasPermission="
+            `audit.grainMerchant.grainMerchantInfo.view`" @click="adopt(scope.row)">通过</el-button>
+          <template v-else-if="scope.row.authenticationStatusKey == 3" v-hasPermission="
             `audit.grainMerchant.grainMerchantInfo.view`" slot-scope="scope">
-              {{ scope.row.authenticationStatus }}
-            </template>
+            已驳回
           </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 v-else v-hasPermission="
+            `audit.grainMerchant.grainMerchantInfo.view`" slot-scope="scope">
+            {{ scope.row.authenticationStatus }}
+          </template>
+        </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"
-    >
+    <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
+      @on-cancel="handleClose">
       <p>查看附件</p>
-      <div
-        style="display: inline-block; margin: 5px"
-        v-if='accessoryimages.businessLicenseAddressUrl'
-      >
-        <img  @click='magnify(accessoryimages.businessLicenseAddressUrl)' width="100" height="100" :src="accessoryimages.businessLicenseAddressUrl" alt="" />
+      <div style="display: inline-block; margin: 5px" v-if='accessoryimages.businessLicenseAddressUrl'>
+        <img @click='magnify(accessoryimages.businessLicenseAddressUrl)' width="100" height="100"
+          :src="accessoryimages.businessLicenseAddressUrl" alt="" />
       </div>
-      <div
-        style="display: inline-block; margin: 5px"
-      >
-        <img @click='magnify(accessoryimages.cardAddressUrl)' width="100" height="100" :src="accessoryimages.cardAddressUrl" alt="" />
+      <div style="display: inline-block; margin: 5px">
+        <img @click='magnify(accessoryimages.cardAddressUrl)' width="100" height="100"
+          :src="accessoryimages.cardAddressUrl" alt="" />
       </div>
-      <div
-        style="display: inline-block; margin: 5px"
-      >
-        <img @click='magnify(accessoryimages.cardAddressUrl1)' width="100" height="100" :src="accessoryimages.cardAddressUrl1" alt="" />
+      <div style="display: inline-block; margin: 5px">
+        <img @click='magnify(accessoryimages.cardAddressUrl1)' width="100" height="100"
+          :src="accessoryimages.cardAddressUrl1" alt="" />
       </div>
-      <div
-        style="display: inline-block; margin: 5px"
-      >
-        <img @click='magnify(accessoryimages.payeeAddressUrl)' width="100" height="100" :src="accessoryimages.payeeAddressUrl" alt="" />
+      <div style="display: inline-block; margin: 5px">
+        <img @click='magnify(accessoryimages.payeeAddressUrl)' width="100" height="100"
+          :src="accessoryimages.payeeAddressUrl" alt="" />
       </div>
-      <div
-        style="display: inline-block; margin: 5px"
-      >
-        <img @click='magnify(accessoryimages.payeeAddressUrl1)' width="100" height="100" :src="accessoryimages.payeeAddressUrl1" alt="" />
+      <div style="display: inline-block; margin: 5px">
+        <img @click='magnify(accessoryimages.payeeAddressUrl1)' width="100" height="100"
+          :src="accessoryimages.payeeAddressUrl1" alt="" />
       </div>
     </WinseaContentModal>
-    <WinseaContentModal
-      v-model="accesscard"
-      :title="$t('system.noticeCircular.information')"
-      @on-cancel="handleClose1"
-    >
+    <WinseaContentModal v-model="accesscard" :title="$t('system.noticeCircular.information')" @on-cancel="handleClose1">
       <p>查看附件</p>
       <img @click='magnify(item)' width="100" height="100" :src="accessurl" alt="" />
     </WinseaContentModal>
@@ -294,435 +163,479 @@
   </div>
 </template>
 <script>
-import {
-  grainMerchantsList,
-  billoperatehis,
-  getGrainMerchants,
-} from '@/model/platformaudit/index'
-import Pagination from '@/components/Pagination'
-import { provinceAndCityData, CodeToText } from 'element-china-area-data'
-import WsUpload from '@/components/WsUpload'
-import { dayjs, fmoney, EventBus } from 'base-core-lib'
-export default {
-  name: 'viewSpareMoney',
-  components: {
-    WsUpload,
-    Pagination,
-  },
-  watch: {
-    vesselId(val) {
-      this.getList()
+  import {
+    grainMerchantsList,
+    billoperatehis,
+    getGrainMerchants,
+  } from '@/model/platformaudit/index'
+  import Pagination from '@/components/Pagination'
+  import {
+    provinceAndCityData,
+    CodeToText
+  } from 'element-china-area-data'
+  import WsUpload from '@/components/WsUpload'
+  import {
+    dayjs,
+    fmoney,
+    EventBus
+  } from 'base-core-lib'
+  export default {
+    name: 'viewSpareMoney',
+    components: {
+      WsUpload,
+      Pagination,
     },
-    isShow(val) {
-      this.showType = val
-    },
-  },
-  data() {
-    return {
-      //弹出框
-      dialogViewSpareMoney: false,
-      dialogApproveFormVisible: false,
-      options_: provinceAndCityData,
-      // 表格显示数据
-      tableDate: [],
-      // 是否显示
-      showType: true,
-      wrapstatus:false,
-      // 年
-      year: '',
-      accessoryimages:{},
-      deptBudgetTotal: 0,
-      currentPage: 1,
-      pageSize: 10,
-      searchType: 1,
-      searchKeyWord: '',
-      contractType: 2,
-      startDate: null,
-      endDate: null,
-      carNumber: '',
-      searchTypeText: '待审核',
-      outerVisible: false,
-      //图片
-      fileList: [],
-      // 提交类型
-      submitType: true,
-      size: 10,
-      spanArr: [],
-      compId: localStorage.getItem('ws-pf_compId'),
-      deptCircularPage: {},
-      date: {
-        year: dayjs().format('YYYY'),
-        month: dayjs().format('MM'),
+    watch: {
+      vesselId(val) {
+        this.getList()
       },
-      disablieForm: {},
-      expands: [], //只展开一行放入当前行id
-      getRowKeys: (row) => {
-        //获取当前行id
-        // console.log(row)
-        return row.id //这里看这一行中需要根据哪个属性值是id
+      isShow(val) {
+        this.showType = val
       },
-      driverList: [],
-      deptBudgetList: {},
-      historyList: [],
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          return time.getTime() > Date.now()
-        },
-      },
-      appendixIdss: [],
-      accessoryTFs: false,
-      accesscard: false,
-      accessurl: '',
-      residentCityProvincial: '',
-      residentCityMunicipal: '',
-      searchTypeList: [
-        { value: '待审核', type: 1 },
-        { value: '已通过', type: 2 },
-        { value: '全部', type: '' },
-      ],
-      identityAuthenticationInfo: {
-        id: '',
-        flag: '',
-      },
-    }
-  },
-  activated() {
-    this.getList()
-    this.showType = this.isShow
-  },
-  methods: {
-    magnify(item){
-      this.wrapstatus=true
-      this.imgUrl=item
-    },
-    colseshade(){
-      this.wrapstatus=false
     },
-    expandsHandle(row) {
-      row.expandsStatus = !row.expandsStatus
-      this.$refs.expandstable.toggleRowExpansion(row)
-    },
-
-    //查找
-    lookUp() {
-      this.currentPage = 1
-      this.getList()
-    },
-    //查找
-    handleLook() {
-      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 = ''
+    data() {
+      return {
+        //弹出框
+        dialogViewSpareMoney: false,
+        dialogApproveFormVisible: false,
+        options_: provinceAndCityData,
+        // 表格显示数据
+        tableDate: [],
+        // 是否显示
+        showType: true,
+        wrapstatus: false,
+        // 年
+        year: '',
+        accessoryimages: {},
+        deptBudgetTotal: 0,
+        currentPage: 1,
+        pageSize: 10,
+        searchType: 1,
+        searchKeyWord: '',
+        contractType: 2,
+        startDate: null,
+        endDate: null,
+        carNumber: '',
+        searchTypeText: '待审核',
+        outerVisible: false,
+        //图片
+        fileList: [],
+        // 提交类型
+        submitType: true,
+        size: 10,
+        spanArr: [],
+        compId: localStorage.getItem('ws-pf_compId'),
+        deptCircularPage: {},
+        date: {
+          year: dayjs().format('YYYY'),
+          month: dayjs().format('MM'),
+        },
+        disablieForm: {},
+        expands: [], //只展开一行放入当前行id
+        getRowKeys: (row) => {
+          //获取当前行id
+          // console.log(row)
+          return row.id //这里看这一行中需要根据哪个属性值是id
+        },
+        driverList: [],
+        deptBudgetList: {},
+        historyList: [],
+        pickerBeginDateBefore: {
+          disabledDate: (time) => {
+            return time.getTime() > Date.now()
+          },
+        },
+        appendixIdss: [],
+        accessoryTFs: false,
+        accesscard: false,
+        accessurl: '',
+        residentCityProvincial: '',
+        residentCityMunicipal: '',
+        searchTypeList: [{
+            value: '待审核',
+            type: 1
+          },
+          {
+            value: '已通过',
+            type: 2
+          },
+          {
+            value: '全部',
+            type: ''
+          },
+        ],
+        identityAuthenticationInfo: {
+          id: '',
+          flag: '',
+        },
       }
-      this.currentPage = 1
+    },
+    activated() {
       this.getList()
+      this.showType = this.isShow
     },
-    //审核通过
-    adopt(row) {
-      this.identityAuthenticationInfo.id = row.id
-      this.identityAuthenticationInfo.flag = 1
-      this.$confirm(`确定通过该认证信息？`, '提示', {
-        confirmButtonText: '通过',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          getGrainMerchants(this.identityAuthenticationInfo)
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '通过成功',
+    methods: {
+      magnify(item) {
+        this.wrapstatus = true
+        this.imgUrl = item
+      },
+      colseshade() {
+        this.wrapstatus = false
+      },
+      expandsHandle(row) {
+        row.expandsStatus = !row.expandsStatus
+        this.$refs.expandstable.toggleRowExpansion(row)
+      },
+
+      //查找
+      lookUp() {
+        this.currentPage = 1
+        this.getList()
+      },
+      //查找
+      handleLook() {
+        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()
+      },
+      //审核通过
+      adopt(row) {
+        this.identityAuthenticationInfo.id = row.id
+        this.identityAuthenticationInfo.flag = 1
+        this.$confirm(`确定通过该认证信息？`, '提示', {
+            confirmButtonText: '通过',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            getGrainMerchants(this.identityAuthenticationInfo)
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '通过成功',
+                })
+                this.getList()
               })
-              this.getList()
-            })
-            .catch((response) => {
-              console.log(response)
-              EventBus.$emit('error', response.message)
-            })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    //审核驳回
-    reject(row) {
-      this.identityAuthenticationInfo.id = row.id
-      this.identityAuthenticationInfo.flag = 2
-      this.$confirm(`确定驳回该认证信息？`, '提示', {
-        confirmButtonText: '驳回',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          getGrainMerchants(this.identityAuthenticationInfo)
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '驳回成功',
+              .catch((response) => {
+                console.log(response)
+                EventBus.$emit('error', response.message)
               })
-              this.getList()
-            })
-            .catch((response) => {
-              console.log(response)
-              EventBus.$emit('error', response.message)
-            })
-        })
-        .catch(() => {
-          return false
-        })
-    },
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      //审核驳回
+      reject(row) {
+        this.identityAuthenticationInfo.id = row.id
+        this.identityAuthenticationInfo.flag = 2
+        this.$confirm(`确定驳回该认证信息？`, '提示', {
+            confirmButtonText: '驳回',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            getGrainMerchants(this.identityAuthenticationInfo)
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '驳回成功',
+                })
+                this.getList()
+              })
+              .catch((response) => {
+                console.log(response)
+                EventBus.$emit('error', response.message)
+              })
+          })
+          .catch(() => {
+            return false
+          })
+      },
 
-    handleClose() {
-      this.accessoryTFs = 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() {
-      grainMerchantsList({
-        compId: localStorage.getItem('ws-pf_compId'),
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        searchType: this.searchType,
-        searchKeyWord: this.searchKeyWord,
-      })
-        .toPromise()
-        .then((response) => {
-          for (var i = 0; i < response.records.length; i++) {
-            response.records[i].expandsStatus = false
-            if (response.records[i].addressUrl != null) {
-              response.records[i].addressUrlArray =
-                response.records[i].addressUrl.split(',')
-              this.fileList[i] = response.records[i].addressUrl.split(',')
-            } else {
-              response.records[i].addressUrlArray = []
+      handleClose() {
+        this.accessoryTFs = 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() {
+        grainMerchantsList({
+            compId: localStorage.getItem('ws-pf_compId'),
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            searchType: this.searchType,
+            searchKeyWord: this.searchKeyWord,
+          })
+          .toPromise()
+          .then((response) => {
+            for (var i = 0; i < response.records.length; i++) {
+              response.records[i].expandsStatus = false
+              if (response.records[i].addressUrl != null) {
+                response.records[i].addressUrlArray =
+                  response.records[i].addressUrl.split(',')
+                this.fileList[i] = 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.driverList = response
-        })
-    },
-    editClick(row) {
-      var status = ''
-      if (row.status == '待执行' || row.status == '已完成') {
-        status = '执行中'
-      } else if (row.status == '执行中') {
-        status = '已完成'
-      }
-      //cancelButtonClass: "btn-custom-cancel"
-      this.$confirm(`是否将状态改为${status}`, {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          editstatus({ id: row.id })
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '状态修改成功',
+            this.deptCircularPage.currentPage = response.current
+            this.deptCircularPage.pageSize = response.size
+            this.deptBudgetTotal = response.total
+            this.driverList = response
+          })
+      },
+      editClick(row) {
+        var status = ''
+        if (row.status == '待执行' || row.status == '已完成') {
+          status = '执行中'
+        } else if (row.status == '执行中') {
+          status = '已完成'
+        }
+        //cancelButtonClass: "btn-custom-cancel"
+        this.$confirm(`是否将状态改为${status}`, {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            editstatus({
+                id: row.id
               })
-              this.getList()
-            })
-            .catch((response) => {
-              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-            })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    selectExamineType(e) {
-      for (var i = 0; i < this.searchTypeList.length; i++) {
-        if (this.searchTypeList[i].value == e) {
-          this.searchType = this.searchTypeList[i].type
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '状态修改成功',
+                })
+                this.getList()
+              })
+              .catch((response) => {
+                // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              })
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      selectExamineType(e) {
+        for (var i = 0; i < this.searchTypeList.length; i++) {
+          if (this.searchTypeList[i].value == e) {
+            this.searchType = this.searchTypeList[i].type
+          }
         }
-      }
-      this.getList()
-    },
-    handlestatus(status) {
-      this.searchType = status
-      if (status == 1) {
-        this.primary = 1
-      } else if (status == 2) {
-        this.primary = 2
-      } else {
-        this.primary = 3
-      }
-      this.getList()
-    },
-    fujian(row) {
-      if(row.customerTypeFlag==2){
-        this.accessoryimages.businessLicenseAddressUrl=row.businessLicenseAddressUrl
-      }
-      this.accessoryimages.cardAddressUrl=row.cardAddressUrl.split(',')[0]
-      this.accessoryimages.cardAddressUrl1=row.cardAddressUrl.split(',')[1]
-      this.accessoryimages.payeeAddressUrl=row.payeeAddressUrl.split(',')[0]
-      this.accessoryimages.payeeAddressUrl1=row.payeeAddressUrl.split(',')[1]
-      this.accessoryTFs=true
-    },
-    handleExamine(row) {
-      this.$router.push({
-        name: 'salesContractExamine',
-        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
+        this.getList()
+      },
+      handlestatus(status) {
+        this.searchType = status
+        if (status == 1) {
+          this.primary = 1
+        } else if (status == 2) {
+          this.primary = 2
+        } else {
+          this.primary = 3
+        }
+        this.getList()
+      },
+      fujian(row) {
+        if (row.customerTypeFlag == 2) {
+          this.accessoryimages.businessLicenseAddressUrl = row.businessLicenseAddressUrl
+        }
+        this.accessoryimages.cardAddressUrl = row.cardAddressUrl.split(',')[0]
+        this.accessoryimages.cardAddressUrl1 = row.cardAddressUrl.split(',')[1]
+        this.accessoryimages.payeeAddressUrl = row.payeeAddressUrl.split(',')[0]
+        this.accessoryimages.payeeAddressUrl1 = row.payeeAddressUrl.split(',')[1]
+        this.accessoryTFs = true
+      },
+      handleExamine(row) {
+        this.$router.push({
+          name: 'salesContractExamine',
+          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() {
+        this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
+        this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
+        this.currentPage = 1
+        this.getList()
+      },
     },
-    find() {
-      this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
-      this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
-      this.currentPage = 1
-      this.getList()
-    },
-  },
-}
+  }
 </script>
 <style lang="scss" scoped>
-.typeselect{
-  margin-right:10px;
-}
-.connert {
-  width: 90%;
-  margin: 0 auto;
-}
-.vertical-text-left {
-  width: 62px;
-  text-align: right;
-}
-.findValue {
-  margin: 0 10px;
-}
-/deep/.el-icon-arrow-right {
-  display: none;
-}
+  .typeselect {
+    margin-right: 10px;
+  }
+
+  .connert {
+    width: 90%;
+    margin: 0 auto;
+  }
+
+  .vertical-text-left {
+    width: 62px;
+    text-align: right;
+  }
+
+  .findValue {
+    margin: 0 10px;
+  }
+
+  /deep/.el-icon-arrow-right {
+    display: none;
+  }
+
+  /deep/.el-pagination {
+    text-align: center;
+  }
+
+  .ws-info-table {
+    border-left: 1px solid #e9ecf7;
+    border-top: 1px solid #e9ecf7;
+  }
+
+  /deep/.ws-info-table .el-form-item {
+    border-right: 1px solid #e9ecf7;
+    border-bottom: 1px solid #e9ecf7;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__label {
+    text-align: center;
+    background: #f6f7fc;
+    color: #8890b1;
+    font-size: 12px;
+  }
+
+  /deep/.ws-info-table .el-form-item.company,
+  /deep/.ws-info-table .el-form-item.personage {
+    width: 33.333%;
+  }
+
+  /deep/.ws-info-table .el-form-item.name {
+    width: 15.665%;
+  }
+
+  /deep/.ws-info-table .el-form-item.card {
+    width: 17.665%;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__content {
+    text-align: center;
+    border-left: 1px solid #e9ecf7;
+  }
+
+  /deep/.el-table .el-table__header .cell,
+  /deep/.el-table .el-table__body .cell {
+    text-align: center;
+  }
+
+  /deep/.el-table th.is-leaf,
+  .el-table td {
+    border-right: 1px solid #eee;
+  }
+
+  .el-button--text {
+    color: #5878e8;
+  }
+
+  .el-button--primary {
+    background: #5878e8;
+  }
+
+  //操作按钮
+  .record,
+  .adjustment,
+  .record1 {
+    display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+    font-size: 14px;
+  }
+
+  .record1 {
+    width: 38px;
+    height: 32px;
+  }
+
+  .record:after {
+    position: absolute;
+    content: '';
+    display: block;
+    top: 9px;
+    right: -7px;
+    width: 1px;
+    height: 12px;
+    background: #e9ecf7;
+  }
+
+  /deep/.el-table td {
+    border-right: 1px solid #eee;
+  }
+
+  .shade {
+    background: rgba(0, 0, 0, 0.1);
+    position: fixed;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    left: 0;
+    z-index: 1026;
+    text-align: center;
+    overflow: scroll;
+  }
+
+  .shade img {
+    position: absolute;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    margin: auto;
+  }
 
-/deep/.el-pagination {
-  text-align: center;
-}
-.ws-info-table {
-  border-left: 1px solid #e9ecf7;
-  border-top: 1px solid #e9ecf7;
-}
-/deep/.ws-info-table .el-form-item {
-  border-right: 1px solid #e9ecf7;
-  border-bottom: 1px solid #e9ecf7;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  text-align: center;
-  background: #f6f7fc;
-  color: #8890b1;
-  font-size: 12px;
-}
+  /deep/.base_header_layout .find.el-button--primary {
+    width: 30px;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
 
-/deep/.ws-info-table .el-form-item.company,
-/deep/.ws-info-table .el-form-item.personage {
-  width: 33.333%;
-}
-/deep/.ws-info-table .el-form-item.name {
-  width: 15.665%;
-}
-/deep/.ws-info-table .el-form-item.card {
-  width: 17.665%;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  text-align: center;
-  border-left: 1px solid #e9ecf7;
-}
-/deep/.el-table .el-table__header .cell,
-/deep/.el-table .el-table__body .cell {
-  text-align: center;
-}
-/deep/.el-table th.is-leaf,
-.el-table td {
-  border-right: 1px solid #eee;
-}
-.el-button--text {
-  color: #5878e8;
-}
-.el-button--primary {
-  background: #5878e8;
-}
-//操作按钮
-.record,
-.adjustment,
-.record1 {
-  display: inline-block;
-  color: #5878e8;
-  padding: 0 4px !important;
-  position: relative;
-  font-size: 14px;
-}
-.record1 {
-  width: 38px;
-  height: 32px;
-}
-.record:after {
-  position: absolute;
-  content: '';
-  display: block;
-  top: 9px;
-  right: -7px;
-  width: 1px;
-  height: 12px;
-  background: #e9ecf7;
-}
-/deep/.el-table td {
-  border-right: 1px solid #eee;
-}
-.shade{
-background:rgba(0,0,0,0.1);
-position:fixed;
-width:100%;
-height:100%;
-top:0;left:0;
-z-index:1026;
-text-align:center;
-overflow: scroll;
-}
-.shade img{
-  position:absolute;
-  top:0;
-  left:0;
-  bottom:0;
-  right:0;
-  margin:auto;
-}
-/deep/.base_header_layout .find.el-button--primary {
-  width: 30px;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-}
-/deep/.base_header_layout .findinput input {
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
+  /deep/.base_header_layout .findinput input {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
 </style>

src/views/platformaudit/grainpulseenterprisereview.vue

@@ -3,1046 +3,978 @@
   <div>
     <BaseHeaderLayout :leftSpan="15">
       <template slot="right">
-        <ws-select
-          v-model="searchTypeText"
-          placeholder=""
-          class="typeselect"
-          @change="selectExamineType"
-          :value="searchType"
-        >
-          <ws-option
-            v-for="item in searchTypeList"
-            :key="item.value"
-            :label="item.value"
-            :value="item.value"
-            style="color: #8890b1"
-          />
+        <ws-select v-model="searchTypeText" placeholder="" class="typeselect" @change="selectExamineType"
+          :value="searchType">
+          <ws-option v-for="item in searchTypeList" :key="item.value" :label="item.value" :value="item.value"
+            style="color: #8890b1" />
         </ws-select>
-        <ws-input
-        class='findinput'
-          v-model="searchKeyWord"
-          placeholder="可按账号、企业名称查找"
-          clearable
-           @keyup.enter.native="lookUp()"
-          maxlength="500"
-          type="input"
-        ></ws-input>
-        <ws-button class="find" type="primary" @click="lookUp()"
-          ><img
-            width="16"
-            height="16"
-            style="
+        <ws-input class='findinput' v-model="searchKeyWord" placeholder="可按账号、企业名称查找" clearable
+          @keyup.enter.native="lookUp()" maxlength="500" type="input"></ws-input>
+        <ws-button class="find" type="primary" @click="lookUp()"><img width="16" height="16" style="
               vertical-align: text-top;
               position: relative;
               top: 0px;
               left: -8px;
-            "
-            src="../../../public/img/sousuo.png"
-            alt=""
-        /></ws-button>
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button>
         <!-- </div> -->
       </template>
     </BaseHeaderLayout>
-    <div class="container">
-      <el-table
-        class="wenzi"
-        :data="grainList.records"
-        style="width: 100%"
-        height="680"
-      >
-        <el-table-column type="index" label="序号" width="50">
-          <template scope="scope">
-            <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
-            <span v-else>{{ scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="userName" label="昵称"> </el-table-column>
-        <el-table-column prop="createPhone" label="账号"> </el-table-column>
-        <el-table-column prop="compName" label="企业名称"> </el-table-column>
-        <el-table-column prop="address" label="地址">
-        </el-table-column>
-        <el-table-column prop="updateDate" label="更新时间" width="140">
-        </el-table-column>
-        <el-table-column prop="" label="操作" width="240">
-          <template slot-scope="scope">
-            <div
-              class="record"
-              @click="nocomplete(scope.row)"
-              v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`"
-            >
-              查看
-            </div>
-            <div
-              class="record"
-              @click="delivery(scope.row)"
-              v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`"
-            >
-              编辑
-            </div>
-            <div
-              class="record"
-              @click="deleteclick(scope.row)"
-              v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`"
-            >
-              删除
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="address" label="审核" width="180">
-          <template slot-scope="scope">
-            <el-button
-              size="medium"
-              type="text"
-              class="record"
-              v-if="scope.row.statusFlag == 1"
-              v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`"
-              @click="reject(scope.row)"
-              >驳回</el-button
-            >
-            <el-button
-              size="medium"
-              type="text"
-              class="record"
-              v-if="scope.row.statusFlag == 1"
-              @click="adopt(scope.row)"
-              v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`"
-              >通过</el-button
-            >
-            <template
-              v-else
-              v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`"
-              slot-scope="scope"
-            >
-              {{ scope.row.status }}
-            </template>
+    <el-table class="wenzi" :data="grainList.records" style="width: 100%" height="calc(100% - 110px)">
+      <el-table-column type="index" label="序号" width="50">
+        <template scope="scope">
+          <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+          <span v-else>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="userName" label="昵称"> </el-table-column>
+      <el-table-column prop="createPhone" label="账号"> </el-table-column>
+      <el-table-column prop="compName" label="企业名称"> </el-table-column>
+      <el-table-column prop="address" label="地址">
+      </el-table-column>
+      <el-table-column prop="updateDate" label="更新时间" width="140">
+      </el-table-column>
+      <el-table-column prop="" label="操作" width="240">
+        <template slot-scope="scope">
+          <div class="record" @click="nocomplete(scope.row)"
+            v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`">
+            查看
+          </div>
+          <div class="record" @click="delivery(scope.row)" v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`">
+            编辑
+          </div>
+          <div class="record" @click="deleteclick(scope.row)"
+            v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`">
+            删除
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="address" label="审核" width="180">
+        <template slot-scope="scope">
+          <el-button size="medium" type="text" class="record" v-if="scope.row.statusFlag == 1"
+            v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`" @click="reject(scope.row)">驳回</el-button>
+          <el-button size="medium" type="text" class="record" v-if="scope.row.statusFlag == 1" @click="adopt(scope.row)"
+            v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`">通过</el-button>
+          <template v-else v-hasPermission="`audit.tranMerchant.tranMerchantInfo.view`" slot-scope="scope">
+            {{ scope.row.status }}
           </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
-        width="40%"
-        title="查看企业信息"
-        :visible.sync="dialogFormVisible1"
-        :append-to-body="true"
-      >
-        <el-form class="customer" :model="form">
-          <h3 style="margin-left: 30px">基本信息</h3>
-          <el-form-item label="公司名称" :label-width="formLabelWidth">
-            {{ companyList.compName }}
-          </el-form-item>
-          <el-form-item label="主营类型" :label-width="formLabelWidth">
-            {{ companyList.mainBusinessType }}
-          </el-form-item>
-          <el-form-item label="标题" :label-width="formLabelWidth">
-            {{ companyList.title }}
-          </el-form-item>
-          <el-form-item label="封面简介" :label-width="formLabelWidth">
-            {{ companyList.companyProfile }}
-          </el-form-item>
-          <el-form-item label="坐标" :label-width="formLabelWidth">
-            <span>经度:{{ companyList.longitude }}</span>
-            <span>纬度:{{ companyList.latitude }}</span>
-          </el-form-item>
-          <el-form-item label="所在区域" :label-width="formLabelWidth">
-            {{ companyList.province }}{{ companyList.city }}{{ companyList.area }}
-          </el-form-item>
-          <el-form-item label="详细地址" :label-width="formLabelWidth">
-            {{ companyList.detailedAddress }}
-          </el-form-item>
-          <el-form-item label="封面图片" :label-width="formLabelWidth">
-            <!-- <img width="50%" :src="companyList.attachmentAddress" alt /> -->
-            <el-image 
-              style="width: 50%"
-              :src="companyList.attachmentAddress" 
-              :preview-src-list="srcList">
-            </el-image>
-          </el-form-item>
-          <el-form-item label="营业执照" :label-width="formLabelWidth">
-            <img width="50%" :src="companyList.licenseAddress" alt />
-          </el-form-item>
-          <h3 style="margin-left: 30px">附加信息</h3>
-          <el-form-item label="企业概况" :label-width="formLabelWidth">
-            {{ companyList.companyContant }}
-          </el-form-item>
-          <el-form-item label="标签" :label-width="formLabelWidth">
-            {{ companyList.label }}
-          </el-form-item>
-          <el-form-item label="场地图片" :label-width="formLabelWidth">
-             <div :key="index" v-for="(item, index) in companyList.sitePhotoAddress">
-              <img style="float:left" v-if="item" :src="item" class="avatar">
-           </div>
-          </el-form-item>
-          <h3 style="margin-left: 30px">联系方式</h3>
-          <div
-          v-for="(item, index) in companyList.settledCompanyContacts"
-          :key="index">
+        </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 width="40%" title="查看企业信息" :visible.sync="dialogFormVisible1" :append-to-body="true">
+      <el-form class="customer" :model="form">
+        <h3 style="margin-left: 30px">基本信息</h3>
+        <el-form-item label="公司名称" :label-width="formLabelWidth">
+          {{ companyList.compName }}
+        </el-form-item>
+        <el-form-item label="主营类型" :label-width="formLabelWidth">
+          {{ companyList.mainBusinessType }}
+        </el-form-item>
+        <el-form-item label="标题" :label-width="formLabelWidth">
+          {{ companyList.title }}
+        </el-form-item>
+        <el-form-item label="封面简介" :label-width="formLabelWidth">
+          {{ companyList.companyProfile }}
+        </el-form-item>
+        <el-form-item label="坐标" :label-width="formLabelWidth">
+          <span>经度:{{ companyList.longitude }}</span>
+          <span>纬度:{{ companyList.latitude }}</span>
+        </el-form-item>
+        <el-form-item label="所在区域" :label-width="formLabelWidth">
+          {{ companyList.province }}{{ companyList.city }}{{ companyList.area }}
+        </el-form-item>
+        <el-form-item label="详细地址" :label-width="formLabelWidth">
+          {{ companyList.detailedAddress }}
+        </el-form-item>
+        <el-form-item label="封面图片" :label-width="formLabelWidth">
+          <!-- <img width="50%" :src="companyList.attachmentAddress" alt /> -->
+          <el-image style="width: 50%" :src="companyList.attachmentAddress" :preview-src-list="srcList">
+          </el-image>
+        </el-form-item>
+        <el-form-item label="营业执照" :label-width="formLabelWidth">
+          <img width="50%" :src="companyList.licenseAddress" alt />
+        </el-form-item>
+        <h3 style="margin-left: 30px">附加信息</h3>
+        <el-form-item label="企业概况" :label-width="formLabelWidth">
+          {{ companyList.companyContant }}
+        </el-form-item>
+        <el-form-item label="标签" :label-width="formLabelWidth">
+          {{ companyList.label }}
+        </el-form-item>
+        <el-form-item label="场地图片" :label-width="formLabelWidth">
+          <div :key="index" v-for="(item, index) in companyList.sitePhotoAddress">
+            <img style="float:left" v-if="item" :src="item" class="avatar">
+          </div>
+        </el-form-item>
+        <h3 style="margin-left: 30px">联系方式</h3>
+        <div v-for="(item, index) in companyList.settledCompanyContacts" :key="index">
           <el-form-item label="联系人" :label-width="formLabelWidth">
             {{ item.contacts }}
           </el-form-item>
           <el-form-item label="电话" :label-width="formLabelWidth">
             {{ item.contactsPhone }}
           </el-form-item>
-          </div>
-          <el-form-item label="邮箱" :label-width="formLabelWidth">
-            {{ companyList.email }}
-          </el-form-item>
-          <el-form-item label="传真" :label-width="formLabelWidth">
-            {{ companyList.fax }}
-          </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button v-if="companyList.statusFlag != 1" @click="dialogFormVisible1 = false" type="primary">关闭</el-button>
-          <el-button v-if="companyList.statusFlag == 1" @click="reject1(id)" type="danger">驳回</el-button>
-          <el-button v-if="companyList.statusFlag == 1" @click="adopt1(id)"  type="primary">通过</el-button>     
         </div>
-      </el-dialog>
-      <!--编辑-->
-      <el-dialog
-        width="40%"
-        title="编辑企业信息"
-        :visible.sync="dialogFormVisible2"
-        :append-to-body="true"
-      >
-        <el-form class="" :model="form1">
-          <h3 style="margin-left: 30px">基本信息(必填)</h3>
-          <el-form-item label="公司名称" :label-width="formLabelWidth" prop="compName">
-            <el-input v-model="companyList1.compName" placeholder="请输入公司名称"></el-input>
-          </el-form-item>
-          <el-form-item label="主营类型(可多选，必须为真实经营类型)" prop="mainBusinessType">
-            <el-checkbox-group v-model="companyList1.mainBusinessType">
-              <el-checkbox-button label="粮库" name="Type"></el-checkbox-button>
-              <el-checkbox-button label="加工厂" name="Type"></el-checkbox-button>
-              <el-checkbox-button label="烘干塔" name="Type"></el-checkbox-button>
-              <el-checkbox-button label="饲料厂" name="Type"></el-checkbox-button>
-              <el-checkbox-button label="养殖场" name="Type"></el-checkbox-button>
-              <el-checkbox-button label="粮贸" name="Type"></el-checkbox-button>
-              <el-checkbox-button label="期货" name="Type"></el-checkbox-button>
-            </el-checkbox-group>
-          </el-form-item>
-          <el-form-item label="标题" :label-width="formLabelWidth" prop="title">
-            <el-input v-model="companyList1.title" placeholder="请输入标题"></el-input>
-          </el-form-item>
-          <el-form-item label="封面简介" :label-width="formLabelWidth" prop="companyProfile">
-            <el-input type="textarea" v-model="companyList1.companyProfile" placeholder="请输入封面简介"></el-input>
-          </el-form-item>
-          <el-form-item label="坐标" :label-width="formLabelWidth" >
-            <span>经度:{{ companyList1.longitude }}</span>
-            <span>纬度:{{ companyList1.latitude }}</span>
-          </el-form-item>
-          <el-form-item label="所在区域" :label-width="formLabelWidth" >
-            {{ companyList1.province }}{{ companyList1.city }}{{ companyList1.area }}
-          </el-form-item>
-          <el-form-item label="详细地址" :label-width="formLabelWidth" prop="detailedAddress">
-            <el-input v-model="companyList1.detailedAddress" placeholder="请输入详细地址"></el-input>
-          </el-form-item>
-          <el-form-item label="上传封面图片" :label-width="formLabelWidth" prop="attachmentAddress">
-            <el-upload
-            class="avatar-uploader"
-            action="https://www.zthymaoyi.com/upload/admin"
-            :show-file-list="false"
-            :on-success="handleAvatarSuccess"
-            :before-upload="beforeAvatarUpload">
+        <el-form-item label="邮箱" :label-width="formLabelWidth">
+          {{ companyList.email }}
+        </el-form-item>
+        <el-form-item label="传真" :label-width="formLabelWidth">
+          {{ companyList.fax }}
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button v-if="companyList.statusFlag != 1" @click="dialogFormVisible1 = false" type="primary">关闭
+        </el-button>
+        <el-button v-if="companyList.statusFlag == 1" @click="reject1(id)" type="danger">驳回</el-button>
+        <el-button v-if="companyList.statusFlag == 1" @click="adopt1(id)" type="primary">通过</el-button>
+      </div>
+    </el-dialog>
+    <!--编辑-->
+    <el-dialog width="40%" title="编辑企业信息" :visible.sync="dialogFormVisible2" :append-to-body="true">
+      <el-form class="" :model="form1">
+        <h3 style="margin-left: 30px">基本信息(必填)</h3>
+        <el-form-item label="公司名称" :label-width="formLabelWidth" prop="compName">
+          <el-input v-model="companyList1.compName" placeholder="请输入公司名称"></el-input>
+        </el-form-item>
+        <el-form-item label="主营类型(可多选，必须为真实经营类型)" prop="mainBusinessType">
+          <el-checkbox-group v-model="companyList1.mainBusinessType">
+            <el-checkbox-button label="粮库" name="Type"></el-checkbox-button>
+            <el-checkbox-button label="加工厂" name="Type"></el-checkbox-button>
+            <el-checkbox-button label="烘干塔" name="Type"></el-checkbox-button>
+            <el-checkbox-button label="饲料厂" name="Type"></el-checkbox-button>
+            <el-checkbox-button label="养殖场" name="Type"></el-checkbox-button>
+            <el-checkbox-button label="粮贸" name="Type"></el-checkbox-button>
+            <el-checkbox-button label="期货" name="Type"></el-checkbox-button>
+          </el-checkbox-group>
+        </el-form-item>
+        <el-form-item label="标题" :label-width="formLabelWidth" prop="title">
+          <el-input v-model="companyList1.title" placeholder="请输入标题"></el-input>
+        </el-form-item>
+        <el-form-item label="封面简介" :label-width="formLabelWidth" prop="companyProfile">
+          <el-input type="textarea" v-model="companyList1.companyProfile" placeholder="请输入封面简介"></el-input>
+        </el-form-item>
+        <el-form-item label="坐标" :label-width="formLabelWidth">
+          <span>经度:{{ companyList1.longitude }}</span>
+          <span>纬度:{{ companyList1.latitude }}</span>
+        </el-form-item>
+        <el-form-item label="所在区域" :label-width="formLabelWidth">
+          {{ companyList1.province }}{{ companyList1.city }}{{ companyList1.area }}
+        </el-form-item>
+        <el-form-item label="详细地址" :label-width="formLabelWidth" prop="detailedAddress">
+          <el-input v-model="companyList1.detailedAddress" placeholder="请输入详细地址"></el-input>
+        </el-form-item>
+        <el-form-item label="上传封面图片" :label-width="formLabelWidth" prop="attachmentAddress">
+          <el-upload class="avatar-uploader" action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false"
+            :on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
             <img v-if="companyList1.attachmentAddress" :src="companyList1.attachmentAddress" class="avatar">
             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-            </el-upload>
-          </el-form-item>
-          <el-form-item label="营业执照" :label-width="formLabelWidth" prop="licenseAddress">
-            <el-upload
-            class="avatar-uploader"
-            action="https://www.zthymaoyi.com/upload/admin"
-            :show-file-list="false"
-            :on-success="handleAvatarSuccess1"
-            :before-upload="beforeAvatarUpload">
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="营业执照" :label-width="formLabelWidth" prop="licenseAddress">
+          <el-upload class="avatar-uploader" action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false"
+            :on-success="handleAvatarSuccess1" :before-upload="beforeAvatarUpload">
             <img v-if="companyList1.licenseAddress" :src="companyList1.licenseAddress" class="avatar">
             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-            </el-upload>
-          </el-form-item>
-          <h3 style="margin-left: 30px">附加信息(选填)</h3>
-          <el-form-item label="企业概况" :label-width="formLabelWidth" prop="companyContant">
-            <el-input type="textarea" v-model="companyList1.companyContant" maxlength="300" placeholder="请输入企业概况，如经营项目、产品类型、企业规模等，不超过300字"></el-input>
-          </el-form-item>
-          <el-form-item label="标签(标签应突出企业特色，最多6个)" prop="label" >
-           <el-tag
-              :key="tag"
-              v-for="tag in companyList1.label"
-              closable
-              :disable-transitions="false"
-              @close="handleClose(tag)">
-              {{tag}}
-              </el-tag>
-              <el-input
-              class="input-new-tag"
-              v-if="inputVisible"
-              v-model="label"
-              ref="saveTagInput"
-              maxlength="6"
-              placeholder="请输入标签内容，不超过6个字符"
-              size="medium"
-              @keyup.enter.native="handleInputConfirm"
-              @blur="handleInputConfirm"
-              >
-              </el-input>
-              <el-button v-else class="button-new-tag" size="small" @click="showInput">添加</el-button>
-          </el-form-item>
-          <el-form-item label="场地图片(图片清晰，最多9张)" :label-width="formLabelWidth" prop="sitePhotoAddress">
+          </el-upload>
+        </el-form-item>
+        <h3 style="margin-left: 30px">附加信息(选填)</h3>
+        <el-form-item label="企业概况" :label-width="formLabelWidth" prop="companyContant">
+          <el-input type="textarea" v-model="companyList1.companyContant" maxlength="300"
+            placeholder="请输入企业概况，如经营项目、产品类型、企业规模等，不超过300字"></el-input>
+        </el-form-item>
+        <el-form-item label="标签(标签应突出企业特色，最多6个)" prop="label">
+          <el-tag :key="tag" v-for="tag in companyList1.label" closable :disable-transitions="false"
+            @close="handleClose(tag)">
+            {{tag}}
+          </el-tag>
+          <el-input class="input-new-tag" v-if="inputVisible" v-model="label" ref="saveTagInput" maxlength="6"
+            placeholder="请输入标签内容，不超过6个字符" size="medium" @keyup.enter.native="handleInputConfirm"
+            @blur="handleInputConfirm">
+          </el-input>
+          <el-button v-else class="button-new-tag" size="small" @click="showInput">添加</el-button>
+        </el-form-item>
+        <el-form-item label="场地图片(图片清晰，最多9张)" :label-width="formLabelWidth" prop="sitePhotoAddress">
           <div :key="index" v-for="(item, index) in companyList1.sitePhotoAddress">
-           <img style="float:left" v-if="item" :src="item" class="avatar">
-           </div>
-          <el-upload
-            action="https://www.zthymaoyi.com/upload/admin"
-            :show-file-list="false"
-            :limit="9"
-            :on-success="handlePictureCardPreview"
-            :on-remove="handleRemove"
-          >
+            <img style="float:left" v-if="item" :src="item" class="avatar">
+          </div>
+          <el-upload action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false" :limit="9"
+            :on-success="handlePictureCardPreview" :on-remove="handleRemove">
             <i class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
           <!-- <el-dialog :visible.sync="dialogVisible3">
             <img width="100%" :src="companyList1.sitePhotoAddress" alt="" />
           </el-dialog> -->
+        </el-form-item>
+        <h3 style="margin-left: 30px">联系方式</h3>
+
+        <div :key="index" v-for="(item, index) in companyList1.settledCompanyContacts">
+          <el-form-item label="联系人" :label-width="formLabelWidth" prop="contacts">
+            <el-input v-model="item.contacts" placeholder="请输入联系人姓名"></el-input>
           </el-form-item>
-          <h3 style="margin-left: 30px">联系方式</h3>
-          
-          <div :key="index" v-for="(item, index) in companyList1.settledCompanyContacts">
-            <el-form-item label="联系人" :label-width="formLabelWidth" prop="contacts">
-              <el-input v-model="item.contacts" placeholder="请输入联系人姓名"></el-input>
-            </el-form-item>
-            <el-form-item label="电话" :label-width="formLabelWidth" prop="createPhone">
-              <el-input v-model="item.contactsPhone" placeholder="请输入联系人电话"></el-input>
-            </el-form-item>
-            <img
-              width="22"
-              height="22"
-              class="add"
-              @click="add()"
-              src="../../../public/img/add.png"
-              alt=""
-            />
-            <img
-              width="22"
-              height="22"
-              class="del"
-              @click="del(index)"
-              src="../../../public/img/del.png"
-              alt=""
-            />
-          </div>
-          <el-form-item label="邮箱" :label-width="formLabelWidth" prop="email">
-            <el-input v-model="companyList1.email" placeholder="请输入电子邮箱"></el-input>
-          </el-form-item>
-          <el-form-item label="传真" :label-width="formLabelWidth" prop="fax">
-            <el-input v-model="companyList1.fax" placeholder="请输入传真号"></el-input>
+          <el-form-item label="电话" :label-width="formLabelWidth" prop="createPhone">
+            <el-input v-model="item.contactsPhone" placeholder="请输入联系人电话"></el-input>
           </el-form-item>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button @click="submit(id)" type="primary">提交</el-button>
+          <img width="22" height="22" class="add" @click="add()" src="../../../public/img/add.png" alt="" />
+          <img width="22" height="22" class="del" @click="del(index)" src="../../../public/img/del.png" alt="" />
         </div>
-      </el-dialog>
-    </div>
+        <el-form-item label="邮箱" :label-width="formLabelWidth" prop="email">
+          <el-input v-model="companyList1.email" placeholder="请输入电子邮箱"></el-input>
+        </el-form-item>
+        <el-form-item label="传真" :label-width="formLabelWidth" prop="fax">
+          <el-input v-model="companyList1.fax" placeholder="请输入传真号"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="submit(id)" type="primary">提交</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
-import { settledList,getSettled,editSettled,settledExamine,deleteSettled  } from '@/model/platformaudit/index'
-import Pagination from '@/components/Pagination'
-import WsUpload from '@/components/WsUpload'
-import { EventBus } from 'base-core-lib'
-export default {
-  name: 'viewSpareMoney',
-  components: {
-    WsUpload,
-    Pagination,
-  },
-  watch: {
-    vesselId(val) {
-      this.getList()
-    },
-    isShow(val) {
-      this.showType = val
+  import {
+    settledList,
+    getSettled,
+    editSettled,
+    settledExamine,
+    deleteSettled
+  } from '@/model/platformaudit/index'
+  import Pagination from '@/components/Pagination'
+  import WsUpload from '@/components/WsUpload'
+  import {
+    EventBus
+  } from 'base-core-lib'
+  export default {
+    name: 'viewSpareMoney',
+    components: {
+      WsUpload,
+      Pagination,
     },
-  },
-  data() {
-    return {
-      //标签
-      dynamicTags: [],
-      inputVisible: false,
-      label: '',
-      //图片
-      dialogImageUrl: '',
-      dialogVisible1: false,
-      dialogVisible2: false,
-      dialogVisible3: false,
-      //弹窗
-      dialogFormVisible1: false,
-      dialogFormVisible2: false,
-      checkboxGroup2: [],
-      // 是否显示
-      showType: true,
-      // 年
-      year: '',
-      currentPage: 1,
-      pageSize: 10,
-      deptBudgetTotal: 0,
-      searchTypeText: '待审核',
-      searchKeyWord: '',
-      // 提交类型
-      submitType: true,
-      size: 10,
-      address:'',
-      searchType: 1,
-      formLabelWidth: '120px',
-      form: {
-        
-      },
-      form1: {
-        Type: [],
-        textarea: '',
-
+    watch: {
+      vesselId(val) {
+        this.getList()
       },
-      srcList: [
-          
-        ],
-      compId: localStorage.getItem('ws-pf_compId'),
-      deptCircularPage: {},
-      grainList: [],
-      searchTypeList: [
-        { value: '待审核', type: 1 },
-        { value: '已通过', type: 2 },
-        { value: '未通过', type: 3 },
-        { value: '全部', type: '' },
-      ],
-      companyList: {
-      },
-      companyList1: {
-        id:'',
-        label:'',
-        attachmentAddress: '',
-        licenseAddress: '',
-        sitePhotoAddress: '',
-      },
-      settledCompanyInfo: {
-        id: '',
-        flag: '',
-      },
-      freightspace: [{}],
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          return time.getTime() > Date.now()
-        },
+      isShow(val) {
+        this.showType = val
       },
-    }
-  },
-  activated() {
-    this.getList()
-    this.showType = this.isShow
-  },
-  methods: {
-    handleAvatarSuccess(res, file) {
-      this.companyList1.attachmentAddress = file.response.url;
     },
-    handleAvatarSuccess1(res, file) {
-      this.companyList1.licenseAddress = file.response.url;
-    },
-    beforeAvatarUpload(file) {
-      const isJPG = file.type === 'image/jpeg';
-      const isLt2M = file.size / 1024 / 1024 < 2;
+    data() {
+      return {
+        //标签
+        dynamicTags: [],
+        inputVisible: false,
+        label: '',
+        //图片
+        dialogImageUrl: '',
+        dialogVisible1: false,
+        dialogVisible2: false,
+        dialogVisible3: false,
+        //弹窗
+        dialogFormVisible1: false,
+        dialogFormVisible2: false,
+        checkboxGroup2: [],
+        // 是否显示
+        showType: true,
+        // 年
+        year: '',
+        currentPage: 1,
+        pageSize: 10,
+        deptBudgetTotal: 0,
+        searchTypeText: '待审核',
+        searchKeyWord: '',
+        // 提交类型
+        submitType: true,
+        size: 10,
+        address: '',
+        searchType: 1,
+        formLabelWidth: '120px',
+        form: {
 
-      if (!isJPG) {
-        this.$message.error('上传图片只能是 JPG 格式!');
-      }
-      if (!isLt2M) {
-        this.$message.error('上传图片大小不能超过 2MB!');
+        },
+        form1: {
+          Type: [],
+          textarea: '',
+
+        },
+        srcList: [
+
+        ],
+        compId: localStorage.getItem('ws-pf_compId'),
+        deptCircularPage: {},
+        grainList: [],
+        searchTypeList: [{
+            value: '待审核',
+            type: 1
+          },
+          {
+            value: '已通过',
+            type: 2
+          },
+          {
+            value: '未通过',
+            type: 3
+          },
+          {
+            value: '全部',
+            type: ''
+          },
+        ],
+        companyList: {},
+        companyList1: {
+          id: '',
+          label: '',
+          attachmentAddress: '',
+          licenseAddress: '',
+          sitePhotoAddress: '',
+        },
+        settledCompanyInfo: {
+          id: '',
+          flag: '',
+        },
+        freightspace: [{}],
+        pickerBeginDateBefore: {
+          disabledDate: (time) => {
+            return time.getTime() > Date.now()
+          },
+        },
       }
-      return isJPG && isLt2M;
     },
-    //图片
-    handleRemove(file, fileList) {
-      console.log(file, fileList)
+    activated() {
+      this.getList()
+      this.showType = this.isShow
     },
-    handlePictureCardPreview(res, file) {
-      let url = file.response.url;
-      if(this.companyList1.sitePhotoAddress.length>=9){
-         this.$message({
-          message: '最多上传九张图片！',
-          type: 'warning',
-        })
-        return
-      }
-      else{
+    methods: {
+      handleAvatarSuccess(res, file) {
+        this.companyList1.attachmentAddress = file.response.url;
+      },
+      handleAvatarSuccess1(res, file) {
+        this.companyList1.licenseAddress = file.response.url;
+      },
+      beforeAvatarUpload(file) {
+        const isJPG = file.type === 'image/jpeg';
+        const isLt2M = file.size / 1024 / 1024 < 2;
+
+        if (!isJPG) {
+          this.$message.error('上传图片只能是 JPG 格式!');
+        }
+        if (!isLt2M) {
+          this.$message.error('上传图片大小不能超过 2MB!');
+        }
+        return isJPG && isLt2M;
+      },
+      //图片
+      handleRemove(file, fileList) {
+        console.log(file, fileList)
+      },
+      handlePictureCardPreview(res, file) {
+        let url = file.response.url;
+        if (this.companyList1.sitePhotoAddress.length >= 9) {
+          this.$message({
+            message: '最多上传九张图片！',
+            type: 'warning',
+          })
+          return
+        } else {
           this.companyList1.sitePhotoAddress.push(url)
-      }
+        }
 
-    },
-    close(index) {
-      this.addressUrls.splice(index, 1)
-    },
-    //联系人
-    add() {
-      this.companyList1.settledCompanyContacts.push({})
-    },
-    del(index) {
-      if (this.companyList1.settledCompanyContacts.length > 1) {
-        this.companyList1.settledCompanyContacts.splice(index, 1)
-      }
-    },
-    //列表
-    getList() {
-      settledList({
-        compId: localStorage.getItem('ws-pf_compId'),
-        searchType: this.searchType,
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        searchKeyWord: this.searchKeyWord,
-      })
-        .toPromise()
-        .then((response) => {
-          this.grainList = response
-          for(var i=0;i<this.grainList.records.length;i++){
-            this.grainList.records[i].address=this.grainList.records[i].province+this.grainList.records[i].city+this.grainList.records[i].area+this.grainList.records[i].detailedAddress
-          }
-          this.deptCircularPage.currentPage = response.current
-          this.deptCircularPage.pageSize = response.size
-          this.deptBudgetTotal = response.total
-        })
-    },
-    //删除
-    deleteclick(row) {
-      this.$confirm(`企业信息删除后不可恢复，是否确定删除？`, {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          deleteSettled({
-            id: row.id,
+      },
+      close(index) {
+        this.addressUrls.splice(index, 1)
+      },
+      //联系人
+      add() {
+        this.companyList1.settledCompanyContacts.push({})
+      },
+      del(index) {
+        if (this.companyList1.settledCompanyContacts.length > 1) {
+          this.companyList1.settledCompanyContacts.splice(index, 1)
+        }
+      },
+      //列表
+      getList() {
+        settledList({
+            compId: localStorage.getItem('ws-pf_compId'),
+            searchType: this.searchType,
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            searchKeyWord: this.searchKeyWord,
           })
-            .toPromise()
-            .then((response) => {
-              this.getList()
-            })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    //查看
-    nocomplete(row) {
-      getSettled({ id: row.id })
-        .toPromise()
-        .then((response) => {
-          this.companyList = response
-          if(response.sitePhotoAddress!=null){
-          this.companyList.sitePhotoAddress=response.sitePhotoAddress.split(',')
-          }
-          this.id=response.id
-          this.dialogFormVisible1 = true
-        })
-    },
-    //编辑
-    delivery(row) {
-      getSettled({ id: row.id })
-        .toPromise()
-        .then((response) => {
-          this.companyList1 = response
-          this.id=response.id
-          if(response.mainBusinessType!=null){
-          this.companyList1.mainBusinessType=response.mainBusinessType.split(',')
-          }
-          if(response.label!=null){
-             this.companyList1.label=response.label.split(',')
-          }
-          else{
-             this.companyList1.label=[]
-          }
-          if(response.sitePhotoAddress!=null){
-          this.companyList1.sitePhotoAddress=response.sitePhotoAddress.split(',')
-          }
-          else{
-             this.companyList1.sitePhotoAddress=[]
-          }
-          if(response.settledCompanyContacts.length==0){
+          .toPromise()
+          .then((response) => {
+            this.grainList = response
+            for (var i = 0; i < this.grainList.records.length; i++) {
+              this.grainList.records[i].address = this.grainList.records[i].province + this.grainList.records[i]
+                .city + this.grainList.records[i].area + this.grainList.records[i].detailedAddress
+            }
+            this.deptCircularPage.currentPage = response.current
+            this.deptCircularPage.pageSize = response.size
+            this.deptBudgetTotal = response.total
+          })
+      },
+      //删除
+      deleteclick(row) {
+        this.$confirm(`企业信息删除后不可恢复，是否确定删除？`, {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            deleteSettled({
+                id: row.id,
+              })
+              .toPromise()
+              .then((response) => {
+                this.getList()
+              })
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      //查看
+      nocomplete(row) {
+        getSettled({
+            id: row.id
+          })
+          .toPromise()
+          .then((response) => {
+            this.companyList = response
+            if (response.sitePhotoAddress != null) {
+              this.companyList.sitePhotoAddress = response.sitePhotoAddress.split(',')
+            }
+            this.id = response.id
+            this.dialogFormVisible1 = true
+          })
+      },
+      //编辑
+      delivery(row) {
+        getSettled({
+            id: row.id
+          })
+          .toPromise()
+          .then((response) => {
+            this.companyList1 = response
+            this.id = response.id
+            if (response.mainBusinessType != null) {
+              this.companyList1.mainBusinessType = response.mainBusinessType.split(',')
+            }
+            if (response.label != null) {
+              this.companyList1.label = response.label.split(',')
+            } else {
+              this.companyList1.label = []
+            }
+            if (response.sitePhotoAddress != null) {
+              this.companyList1.sitePhotoAddress = response.sitePhotoAddress.split(',')
+            } else {
+              this.companyList1.sitePhotoAddress = []
+            }
+            if (response.settledCompanyContacts.length == 0) {
               this.companyList1.settledCompanyContacts.push({})
-          }
-          this.dialogFormVisible2 = true
-        })
-    },
-    submit(id){
-      if (!this.companyList1.compName) {
-        this.$message({
-          message: '公司名称不能为空！',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        this.companyList1.compName.length > 25 ||
-        this.companyList1.compName.length < 2
-      ) {
-        this.$message({
-          message: '公司名称输入错误！',
-          type: 'warning',
-        })
-        return
-      }
-      if (this.companyList1.mainBusinessType.length<1) {
-        this.$message({
-          message: '至少选择一个主营类型',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.companyList1.title) {
-        this.$message({
-          message: '标题不能为空！',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        this.companyList1.title.length > 16 ||
-        this.companyList1.title.length < 2
-      ) {
-        this.$message({
-          message: '标题长度2-16个字',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.companyList1.companyProfile) {
-        this.$message({
-          message: '简介不能为空！',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        this.companyList1.companyProfile.length > 60 ||
-        this.companyList1.companyProfile.length < 10
-      ) {
-        this.$message({
-          message: '简介长度10-60个字',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.companyList1.detailedAddress) {
-        this.$message({
-          message: '详细地址不能为空！',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        this.companyList1.detailedAddress.length > 12 ||
-        this.companyList1.detailedAddress.length < 2
-      ) {
-        this.$message({
-          message: '详细地址2-12个字',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.companyList1.attachmentAddress) {
-        this.$message({
-          message: '封面照片不能为空！',
-          type: 'warning',
-        })
-        return
-      }
-      if (!this.companyList1.licenseAddress) {
-        this.$message({
-          message: '营业执照不能为空！',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        this.companyList1.contacts > 10 ||
-        this.companyList1.contacts < 2
-      ) {
-        this.$message({
-          message: '联系人姓名2-10个字',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        this.companyList1.createPhone.length > 15 ||
-        this.companyList1.createPhone.length < 7
-      ) {
-        this.$message({
-          message: '联系人电话7-15位数字',
-          type: 'warning',
-        })
-        return
-      }
-      // if (
-      //   this.companyList1.fax.length > 20 ||
-      //   this.companyList1.fax.length < 6
-      // ) {
-      //   this.$message({
-      //     message: '传真输入错误',
-      //     type: 'warning',
-      //   })
-      //   return
-      // }
-      this.companyList1.id = id
-      this.companyList1.mainBusinessType=this.companyList1.mainBusinessType.toString()
-      this.companyList1.label=this.companyList1.label.toString()
-      this.companyList1.sitePhotoAddress=this.companyList1.sitePhotoAddress.toString()
-      this.$confirm(`确定提交企业信息？`, {
-        cancelButtonText: '取消',
-        confirmButtonText: '确定',
-        type: 'warning'
-      })
-      .then(() => {
-          editSettled(this.companyList1)
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '提交成功',
+            }
+            this.dialogFormVisible2 = true
+          })
+      },
+      submit(id) {
+        if (!this.companyList1.compName) {
+          this.$message({
+            message: '公司名称不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (
+          this.companyList1.compName.length > 25 ||
+          this.companyList1.compName.length < 2
+        ) {
+          this.$message({
+            message: '公司名称输入错误！',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.companyList1.mainBusinessType.length < 1) {
+          this.$message({
+            message: '至少选择一个主营类型',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.companyList1.title) {
+          this.$message({
+            message: '标题不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (
+          this.companyList1.title.length > 16 ||
+          this.companyList1.title.length < 2
+        ) {
+          this.$message({
+            message: '标题长度2-16个字',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.companyList1.companyProfile) {
+          this.$message({
+            message: '简介不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (
+          this.companyList1.companyProfile.length > 60 ||
+          this.companyList1.companyProfile.length < 10
+        ) {
+          this.$message({
+            message: '简介长度10-60个字',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.companyList1.detailedAddress) {
+          this.$message({
+            message: '详细地址不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (
+          this.companyList1.detailedAddress.length > 12 ||
+          this.companyList1.detailedAddress.length < 2
+        ) {
+          this.$message({
+            message: '详细地址2-12个字',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.companyList1.attachmentAddress) {
+          this.$message({
+            message: '封面照片不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (!this.companyList1.licenseAddress) {
+          this.$message({
+            message: '营业执照不能为空！',
+            type: 'warning',
+          })
+          return
+        }
+        if (
+          this.companyList1.contacts > 10 ||
+          this.companyList1.contacts < 2
+        ) {
+          this.$message({
+            message: '联系人姓名2-10个字',
+            type: 'warning',
+          })
+          return
+        }
+        if (
+          this.companyList1.createPhone.length > 15 ||
+          this.companyList1.createPhone.length < 7
+        ) {
+          this.$message({
+            message: '联系人电话7-15位数字',
+            type: 'warning',
+          })
+          return
+        }
+        // if (
+        //   this.companyList1.fax.length > 20 ||
+        //   this.companyList1.fax.length < 6
+        // ) {
+        //   this.$message({
+        //     message: '传真输入错误',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        this.companyList1.id = id
+        this.companyList1.mainBusinessType = this.companyList1.mainBusinessType.toString()
+        this.companyList1.label = this.companyList1.label.toString()
+        this.companyList1.sitePhotoAddress = this.companyList1.sitePhotoAddress.toString()
+        this.$confirm(`确定提交企业信息？`, {
+            cancelButtonText: '取消',
+            confirmButtonText: '确定',
+            type: 'warning'
+          })
+          .then(() => {
+            editSettled(this.companyList1)
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '提交成功',
+                })
+                this.dialogFormVisible2 = false
+                this.getList()
               })
-              this.dialogFormVisible2 = false
-              this.getList()
-            })
-            .catch((response) => {
-              EventBus.$emit('error', response.message)
-            })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    //查找
-    lookUp() {
-      this.currentPage = 1
-      this.getList()
-    },
-    selectExamineType(e) {
-      for (var i = 0; i < this.searchTypeList.length; i++) {
-        if (this.searchTypeList[i].value == e) {
-          this.searchType = this.searchTypeList[i].type
+              .catch((response) => {
+                EventBus.$emit('error', response.message)
+              })
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      //查找
+      lookUp() {
+        this.currentPage = 1
+        this.getList()
+      },
+      selectExamineType(e) {
+        for (var i = 0; i < this.searchTypeList.length; i++) {
+          if (this.searchTypeList[i].value == e) {
+            this.searchType = this.searchTypeList[i].type
+          }
         }
-      }
-      this.currentPage = 1
-      this.getList()
-    },
-    //查看审核通过
-    adopt1(id) {
-      this.settledCompanyInfo.id = id
-      this.settledCompanyInfo.flag = 1
-      this.$confirm(`确定通过该入驻申请？`, '提示', {
-        confirmButtonText: '通过',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          settledExamine(this.settledCompanyInfo)
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '通过成功',
+        this.currentPage = 1
+        this.getList()
+      },
+      //查看审核通过
+      adopt1(id) {
+        this.settledCompanyInfo.id = id
+        this.settledCompanyInfo.flag = 1
+        this.$confirm(`确定通过该入驻申请？`, '提示', {
+            confirmButtonText: '通过',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            settledExamine(this.settledCompanyInfo)
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '通过成功',
+                })
+                this.getList()
               })
-              this.getList()
-            })
-            .catch((response) => {
-              EventBus.$emit('error', response.message)
-            })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    //查看审核驳回
-    reject1(id) {
-      this.settledCompanyInfo.id = id
-      this.settledCompanyInfo.flag = 2
-      this.$confirm(`确定驳回该入驻申请？`, '提示', {
-        confirmButtonText: '驳回',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          settledExamine(this.settledCompanyInfo)
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '驳回成功',
+              .catch((response) => {
+                EventBus.$emit('error', response.message)
               })
-              this.getList()
-            })
-            .catch((response) => {
-              EventBus.$emit('error', response.message)
-            })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    //审核通过
-    adopt(row) {
-      this.settledCompanyInfo.id = row.id
-      this.settledCompanyInfo.flag = 1
-      this.$confirm(`确定通过该入驻申请？`, '提示', {
-        confirmButtonText: '通过',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          settledExamine(this.settledCompanyInfo)
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '通过成功',
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      //查看审核驳回
+      reject1(id) {
+        this.settledCompanyInfo.id = id
+        this.settledCompanyInfo.flag = 2
+        this.$confirm(`确定驳回该入驻申请？`, '提示', {
+            confirmButtonText: '驳回',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            settledExamine(this.settledCompanyInfo)
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '驳回成功',
+                })
+                this.getList()
               })
-              this.getList()
-            })
-            .catch((response) => {
-              EventBus.$emit('error', response.message)
-            })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    //审核驳回
-    reject(row) {
-      this.settledCompanyInfo.id = row.id
-      this.settledCompanyInfo.flag = 2
-      this.$confirm(`确定驳回该入驻申请？`, '提示', {
-        confirmButtonText: '驳回',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          settledExamine(this.settledCompanyInfo)
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '驳回成功',
+              .catch((response) => {
+                EventBus.$emit('error', response.message)
               })
-              this.getList()
-            })
-            .catch((response) => {
-              EventBus.$emit('error', response.message)
-            })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getList()
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val
-      console.log(`当前页: ${val}`)
-      this.getList()
-    },
-    //标签
-    handleClose(tag) {
-      this.companyList1.label.splice(this.companyList1.label.indexOf(tag), 1)
-    },
-
-    showInput() {
-      this.inputVisible = true
-      this.$nextTick((_) => {
-        this.$refs.saveTagInput.$refs.input.focus()
-      })
-    },
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      //审核通过
+      adopt(row) {
+        this.settledCompanyInfo.id = row.id
+        this.settledCompanyInfo.flag = 1
+        this.$confirm(`确定通过该入驻申请？`, '提示', {
+            confirmButtonText: '通过',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            settledExamine(this.settledCompanyInfo)
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '通过成功',
+                })
+                this.getList()
+              })
+              .catch((response) => {
+                EventBus.$emit('error', response.message)
+              })
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      //审核驳回
+      reject(row) {
+        this.settledCompanyInfo.id = row.id
+        this.settledCompanyInfo.flag = 2
+        this.$confirm(`确定驳回该入驻申请？`, '提示', {
+            confirmButtonText: '驳回',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            settledExamine(this.settledCompanyInfo)
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '驳回成功',
+                })
+                this.getList()
+              })
+              .catch((response) => {
+                EventBus.$emit('error', response.message)
+              })
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+      //标签
+      handleClose(tag) {
+        this.companyList1.label.splice(this.companyList1.label.indexOf(tag), 1)
+      },
 
-    handleInputConfirm() {
-      let label = this.label;
-      if (label) {
-        if(this.companyList1.label.length>5){
-         this.$message({
-          message: '最多添加六个标签！',
-          type: 'warning',
+      showInput() {
+        this.inputVisible = true
+        this.$nextTick((_) => {
+          this.$refs.saveTagInput.$refs.input.focus()
         })
-        return
-      }
-      else{
-          this.companyList1.label.push(label)
-      }
-      }
-      this.inputVisible = false
-      this.label = ''
+      },
+
+      handleInputConfirm() {
+        let label = this.label;
+        if (label) {
+          if (this.companyList1.label.length > 5) {
+            this.$message({
+              message: '最多添加六个标签！',
+              type: 'warning',
+            })
+            return
+          } else {
+            this.companyList1.label.push(label)
+          }
+        }
+        this.inputVisible = false
+        this.label = ''
+      },
     },
-  },
-}
+  }
 </script>
 <style lang="scss" scoped>
-.container {
-  width: 100%;
-  margin: 0 auto;
-}
-.vertical-text-left {
-  width: 62px;
-  text-align: right;
-}
-.el-button--primary {
-  background-color: #5878e8;
-  border-color: #5878e8;
-}
-.el-button--default {
-  color: #8890b1;
-  border-color: #e8eaf1;
-}
-/deep/.base_header_layout .find.el-button--primary {
-  width: 30px;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-}
-/deep/.base_header_layout .findinput input {
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
-/deep/.findValue .el-input__inner {
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
-//操作按钮
-.record,
-.adjustment {
-  display: inline-block;
-  color: #5878e8;
-  padding: 0 4px !important;
-  position: relative;
-  font-size: 14px;
-}
-.record:after {
-  position: absolute;
-  content: '';
-  display: block;
-  top: 5px;
-  right: -2px;
-  width: 1px;
-  height: 12px;
-  background: #e9ecf7;
-}
-//状态样式
-.executory,
-.inExecution,
-.done {
-  width: 6px;
-  height: 6px;
-  display: inline-block;
-  border-radius: 50%;
-  position: relative;
-  top: -1px;
-  font-size: 14px;
-}
-.executory {
-  background: #ff9f24;
-}
-.inExecution {
-  background: #5878e8;
-}
-.done {
-  background: #50cad4;
-}
-.putstorage.el-button--default,
-.deliverystorage.el-button--default {
-  border-color: #8890b1;
-  background-color: #fff;
-  color: #8890b1;
-}
-/deep/.el-table td,
-/deep/.el-table th.is-leaf {
-  border-right: 1px solid #e9ecf7;
-  text-align: center;
-}
-/deep/.el-table tr td:first-child,
-/deep/.el-table tr th.is-leaf:first-child {
-  border-left: 1px solid #e9ecf7;
-}
-.el-row {
-  height: 60px;
-}
-.base_header_layout .grid-content {
-  margin-top: 80px;
-}
+  .container {
+    width: 100%;
+    margin: 0 auto;
+  }
+
+  .vertical-text-left {
+    width: 62px;
+    text-align: right;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+  }
+
+  .el-button--default {
+    color: #8890b1;
+    border-color: #e8eaf1;
+  }
+
+  /deep/.base_header_layout .find.el-button--primary {
+    width: 30px;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+
+  /deep/.base_header_layout .findinput input {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
+
+  /deep/.findValue .el-input__inner {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
+
+  //操作按钮
+  .record,
+  .adjustment {
+    display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+    font-size: 14px;
+  }
+
+  .record:after {
+    position: absolute;
+    content: '';
+    display: block;
+    top: 5px;
+    right: -2px;
+    width: 1px;
+    height: 12px;
+    background: #e9ecf7;
+  }
+
+  //状态样式
+  .executory,
+  .inExecution,
+  .done {
+    width: 6px;
+    height: 6px;
+    display: inline-block;
+    border-radius: 50%;
+    position: relative;
+    top: -1px;
+    font-size: 14px;
+  }
+
+  .executory {
+    background: #ff9f24;
+  }
+
+  .inExecution {
+    background: #5878e8;
+  }
+
+  .done {
+    background: #50cad4;
+  }
+
+  .putstorage.el-button--default,
+  .deliverystorage.el-button--default {
+    border-color: #8890b1;
+    background-color: #fff;
+    color: #8890b1;
+  }
+
+  /deep/.el-table td,
+  /deep/.el-table th.is-leaf {
+    border-right: 1px solid #e9ecf7;
+    text-align: center;
+  }
+
+  /deep/.el-table tr td:first-child,
+  /deep/.el-table tr th.is-leaf:first-child {
+    border-left: 1px solid #e9ecf7;
+  }
+
+  .el-row {
+    height: 60px;
+  }
+
+  .base_header_layout .grid-content {
+    margin-top: 80px;
+  }
+
+  .el-input--small .el-input__inner {
+    margin-left: 20px;
+  }
+
+  .el-range-editor--small.el-input__inner {
+    height: 32px;
+    margin: 0 10px;
+  }
+
+  /deep/.el-pagination {
+    text-align: center;
+    white-space: nowrap;
+    padding: 2px 5px;
+    color: #303133;
+    font-weight: 700;
+    margin-bottom: 20px;
+  }
+
+  .el-select {
+    width: 30%;
+    margin-right: 10px;
+  }
+
+  .el-tag+.el-tag {
+    margin-left: 10px;
+  }
+
+  .button-new-tag {
+    margin-left: 10px;
+    height: 32px;
+    line-height: 30px;
+    padding-top: 0;
+    padding-bottom: 0;
+  }
+
+  .input-new-tag {
+    width: 240px;
+    margin-left: 10px;
+    vertical-align: bottom;
+  }
+
+  .customer .el-form-item {
+    border-bottom: 1px solid #ccc;
+  }
+
+  /deep/.typeselect .el-input__inner {
+    color: #8890b1;
+  }
+
+  .add {
+    margin-left: 10%;
+  }
+
+  .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+  }
 
-.el-input--small .el-input__inner {
-  margin-left: 20px;
-}
-.el-range-editor--small.el-input__inner {
-  height: 32px;
-  margin: 0 10px;
-}
-/deep/.el-pagination {
-  text-align: center;
-  white-space: nowrap;
-  padding: 2px 5px;
-  color: #303133;
-  font-weight: 700;
-  margin-bottom: 20px;
-}
-.el-select {
-  width: 30%;
-  margin-right: 10px;
-}
-.el-tag + .el-tag {
-  margin-left: 10px;
-}
-.button-new-tag {
-  margin-left: 10px;
-  height: 32px;
-  line-height: 30px;
-  padding-top: 0;
-  padding-bottom: 0;
-}
-.input-new-tag {
-  width: 240px;
-  margin-left: 10px;
-  vertical-align: bottom;
-}
-.customer .el-form-item {
-  border-bottom: 1px solid #ccc;
-}
-/deep/.typeselect .el-input__inner {
-  color: #8890b1;
-}
-.add{
-  margin-left: 10%;
-}
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-.avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
-}
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  line-height: 178px;
-  text-align: center;
-}
-.avatar {
-  width: 178px;
-  height: 178px;
-  display: block;
-}
+  .avatar {
+    width: 178px;
+    height: 178px;
+    display: block;
+  }
 </style>

src/views/platformaudit/saletransactioninformationreview.vue

@@ -3,477 +3,449 @@
   <div>
     <BaseHeaderLayout :leftSpan="15">
       <template slot="right">
-        <ws-select
-          v-model="searchTypeText"
-          placeholder=""
-          class="typeselect"
-          @change="selectExamineType"
-          :value="searchType"
-        >
-          <ws-option
-            v-for="item in searchTypeList"
-            :key="item.value"
-            :label="item.value"
-            :value="item.value"
-            style="color: #8890b1"
-          />
+        <ws-select v-model="searchTypeText" placeholder="" class="typeselect" @change="selectExamineType"
+          :value="searchType">
+          <ws-option v-for="item in searchTypeList" :key="item.value" :label="item.value" :value="item.value"
+            style="color: #8890b1" />
         </ws-select>
-        <ws-input
-        class='findinput'
-          v-model="searchKeyWord"
-          placeholder="可按编号、发布方和货名查找"
-          clearable
-          maxlength="500"
-           @keyup.enter.native="lookUp()"
-          type="input"
-        ></ws-input>
-        <ws-button class="find" type="primary" @click="lookUp()"
-          ><img
-            width="16"
-            height="16"
-            style="
+        <ws-input class='findinput' v-model="searchKeyWord" placeholder="可按编号、发布方和货名查找" clearable maxlength="500"
+          @keyup.enter.native="lookUp()" type="input"></ws-input>
+        <ws-button class="find" type="primary" @click="lookUp()"><img width="16" height="16" style="
               vertical-align: text-top;
               position: relative;
               top: 0px;
               left: -8px;
-            "
-            src="../../../public/img/sousuo.png"
-            alt=""
-        /></ws-button>
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button>
         <!-- </div> -->
       </template>
     </BaseHeaderLayout>
-    <div class="container">
-      <el-table
-        class="wenzi"
-        :data="tranManagementList.records"
-        style="width: 100%"
-        height="680"
-      >
+      <el-table class="wenzi" :data="tranManagementList.records" style="width: 100%" height="calc(100% - 110px)">
         <el-table-column type="index" label="序号" width="50">
           <template scope="scope">
             <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="salePlanNo" label="编号" > </el-table-column>
-        <el-table-column prop="seller" label="发布企业/发布人" >
+        <el-table-column prop="salePlanNo" label="编号"> </el-table-column>
+        <el-table-column prop="seller" label="发布企业/发布人">
         </el-table-column>
-        <el-table-column label="发布平台" > 
+        <el-table-column label="发布平台">
           <template scope="scope">
             <span v-if="scope.row.pcFlag==1">PC端</span>
             <span v-else>移动端</span>
           </template>
         </el-table-column>
-        <el-table-column prop="goodsName" label="货名" > </el-table-column>
-        <el-table-column prop="plannedSaleVolume" label="重量（吨）" > </el-table-column>
-        <el-table-column prop="salePlanType" label="交易类型" > </el-table-column>
-        <el-table-column prop="basisPrice" label="基差(元/吨)" > </el-table-column>
-        <el-table-column prop="salePrice" label="价格(元/吨)" > </el-table-column>
-        <el-table-column prop="sellerPhone" label="电话" > </el-table-column>
+        <el-table-column prop="goodsName" label="货名"> </el-table-column>
+        <el-table-column prop="plannedSaleVolume" label="重量（吨）"> </el-table-column>
+        <el-table-column prop="salePlanType" label="交易类型"> </el-table-column>
+        <el-table-column prop="basisPrice" label="基差(元/吨)"> </el-table-column>
+        <el-table-column prop="salePrice" label="价格(元/吨)"> </el-table-column>
+        <el-table-column prop="sellerPhone" label="电话"> </el-table-column>
         <el-table-column prop="updateDate" label="更新时间" width="140"> </el-table-column>
         <el-table-column prop="" label="操作" width="180">
           <template slot-scope="scope">
-            <div
-              class="record"
-              @click="nocomplete(scope.row)"
-              v-hasPermission="
+            <div class="record" @click="nocomplete(scope.row)" v-hasPermission="
            `audit.tranMerchant.tranMerchantInfo.view`
-          "
-            >查看</div>
-            <div
-              class="record"
-              @click="delivery(scope.row)"
-              v-hasPermission="
+          ">查看</div>
+            <div class="record" @click="delivery(scope.row)" v-hasPermission="
            `audit.tranMerchant.tranMerchantInfo.view`
-          "
-            >编辑</div>
-            <div
-              class="record"
-              @click="deleteclick(scope.row)"
-              v-hasPermission="
+          ">编辑</div>
+            <div class="record" @click="deleteclick(scope.row)" v-hasPermission="
            `audit.tranMerchant.tranMerchantInfo.view`
-          "
-            >删除</div>
+          ">删除</div>
           </template>
         </el-table-column>
-        <el-table-column prop="address" label="审核" >
+        <el-table-column prop="address" label="审核">
           <template slot-scope="scope">
-            <el-button
-              size="medium"
-              type="text"
-              class="record"
-              v-if="scope.row.statusFlag==1"
-              v-hasPermission="
+            <el-button size="medium" type="text" class="record" v-if="scope.row.statusFlag==1" v-hasPermission="
            `audit.tranMerchant.tranMerchantInfo.view`
-          "
-              @click="reject(scope.row)"
-              >驳回</el-button
-            >
-            <el-button
-              size="medium"
-              type="text"
-              class="record"
-              v-if="scope.row.statusFlag==1"
-              @click="adopt(scope.row)"
+          " @click="reject(scope.row)">驳回</el-button>
+            <el-button size="medium" type="text" class="record" v-if="scope.row.statusFlag==1" @click="adopt(scope.row)"
               v-hasPermission="
            `audit.tranMerchant.tranMerchantInfo.view`
-          "
-              >通过</el-button
-            >
+          ">通过</el-button>
             <template v-else v-hasPermission="
            `audit.tranMerchant.tranMerchantInfo.view`
-          " slot-scope="scope"> 
-            {{ scope.row.status}}
-          </template>
+          " slot-scope="scope">
+              {{ scope.row.status}}
+            </template>
           </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 @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>
-import { saleList ,deletesale ,saleexamine} from '@/model/platformaudit/index'
-import Pagination from '@/components/Pagination'
-import WsUpload from '@/components/WsUpload'
-import { EventBus } from 'base-core-lib'
-export default {
-  name: 'viewSpareMoney',
-  components: {
-    WsUpload,
-    Pagination,
-  },
-  watch: {
-    vesselId(val) {
-      this.getList()
+  import {
+    saleList,
+    deletesale,
+    saleexamine
+  } from '@/model/platformaudit/index'
+  import Pagination from '@/components/Pagination'
+  import WsUpload from '@/components/WsUpload'
+  import {
+    EventBus
+  } from 'base-core-lib'
+  export default {
+    name: 'viewSpareMoney',
+    components: {
+      WsUpload,
+      Pagination,
     },
-    isShow(val) {
-      this.showType = val
-    },
-  },
-  data() {
-    return {
-      //弹出框
-      dialogViewSpareMoney: false,
-      dialogApproveFormVisible: false,
-      // 船舶类型
-      monetaryKey: null,
-      // 表格显示数据
-      tableDate: [],
-
-      // 是否显示
-      showType: true,
-      // 年
-      year: '',
-      currentPage: 1,
-      pageSize: 10,
-      deptBudgetTotal: 0,
-      searchTypeText: '待审核',
-      searchKeyWord: '',
-      // 提交类型
-      submitType: true,
-      size: 10,
-      spanArr: [],
-      warehouseName: '',
-      searchType: 1,
-      startDate: null,
-      endDate: null,
-      compId: localStorage.getItem('ws-pf_compId'),
-      deptCircularPage: {},
-      tranManagementList: [],
-      deptBudgetList: {},
-      historyList: [],
-      inOutDate: [],
-      searchTypeList: [
-        { value: '待审核', type: 1 },
-        { value: '已通过', type: 2 },
-        { value: '全部', type: '' },
-      ],
-      salePlanInfo:{
-        id: '',
-        flag: '',
+    watch: {
+      vesselId(val) {
+        this.getList()
       },
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          return time.getTime() > Date.now()
-        },
+      isShow(val) {
+        this.showType = val
       },
-      accessoryTFs: false,
-    }
-  },
-  activated() {
-    //cg.viewBudget
-    //cg.viewSpareMoney
-    // this.getVesselData();
-    this.getList()
-    this.showType = this.isShow
-  },
-  methods: {
-    //删除
-    deleteclick(row) {
-      //cancelButtonClass: "btn-custom-cancel"
-      this.$confirm(`交易信息删除后不可恢复，是否确定删除？`, {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          deletesale ({
-            id: row.id
-          })
-            .toPromise()
-            .then(response => {
-              this.getList()
-            })
-        })
-        .catch(() => {
-          return false
-        })
     },
-    //查看//传参
-    nocomplete(row) {
-      this.$router.push({
-        name: 'salesPlanLook',
-        query: {
-          id: row.id,
+    data() {
+      return {
+        //弹出框
+        dialogViewSpareMoney: false,
+        dialogApproveFormVisible: false,
+        // 船舶类型
+        monetaryKey: null,
+        // 表格显示数据
+        tableDate: [],
+
+        // 是否显示
+        showType: true,
+        // 年
+        year: '',
+        currentPage: 1,
+        pageSize: 10,
+        deptBudgetTotal: 0,
+        searchTypeText: '待审核',
+        searchKeyWord: '',
+        // 提交类型
+        submitType: true,
+        size: 10,
+        spanArr: [],
+        warehouseName: '',
+        searchType: 1,
+        startDate: null,
+        endDate: null,
+        compId: localStorage.getItem('ws-pf_compId'),
+        deptCircularPage: {},
+        tranManagementList: [],
+        deptBudgetList: {},
+        historyList: [],
+        inOutDate: [],
+        searchTypeList: [{
+            value: '待审核',
+            type: 1
+          },
+          {
+            value: '已通过',
+            type: 2
+          },
+          {
+            value: '全部',
+            type: ''
+          },
+        ],
+        salePlanInfo: {
+          id: '',
+          flag: '',
         },
-      })
-    },
-    //编辑
-     delivery(row) {
-      this.$router.push({
-        name: 'salesPlanEdit',
-        query: {
-          id: row.id,
+        pickerBeginDateBefore: {
+          disabledDate: (time) => {
+            return time.getTime() > Date.now()
+          },
         },
-      })
-    },
-    //查找
-    lookUp() {
-      this.currentPage = 1
-      this.getList()
-    },
-    selectExamineType(e) {
-      for (var i = 0; i < this.searchTypeList.length; i++) {
-        if (this.searchTypeList[i].value == e) {
-          this.searchType = this.searchTypeList[i].type
-        }
+        accessoryTFs: false,
       }
-      this.currentPage= 1
+    },
+    activated() {
+      //cg.viewBudget
+      //cg.viewSpareMoney
+      // this.getVesselData();
       this.getList()
+      this.showType = this.isShow
     },
-    //审核通过
-    adopt(row) {
-      this.salePlanInfo.id = row.id
-      this.salePlanInfo.flag = 1
-      this.$confirm(`确定通过该交易信息？`, '提示', {
-        confirmButtonText: '通过',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          saleexamine( this.salePlanInfo )
-            .toPromise()
-            .then((response) => {
-              
-              this.$notify.success({
-                title: '成功',
-                message: '通过成功',
+    methods: {
+      //删除
+      deleteclick(row) {
+        //cancelButtonClass: "btn-custom-cancel"
+        this.$confirm(`交易信息删除后不可恢复，是否确定删除？`, {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+            deletesale({
+                id: row.id
               })
-              this.getList()
-            })
-            .catch((response) => {
-              console.log(response)
-              EventBus.$emit('error', response.message)
-            })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    //审核驳回
-    reject(row) {
-       this.salePlanInfo.id = row.id
-       this.salePlanInfo.flag = 2
-      this.$confirm(`确定驳回该交易信息？`, '提示', {
-        confirmButtonText: '驳回',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          saleexamine(this.salePlanInfo)
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '驳回成功',
+              .toPromise()
+              .then(response => {
+                this.getList()
               })
-              this.getList()
-            })
-            .catch((response) => {
-              console.log(response)
-              EventBus.$emit('error', response.message)
-            })
-        })
-        .catch(() => {
-          return false
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      //查看//传参
+      nocomplete(row) {
+        this.$router.push({
+          name: 'salesPlanLook',
+          query: {
+            id: row.id,
+          },
         })
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getList()
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val
-      console.log(`当前页: ${val}`)
-      this.getList()
-    },
-    //销售
-    sale() {
-      this.getList()
-    },
-    //销售列表
-    getList() {
-      saleList ({
-        compId: localStorage.getItem('ws-pf_compId'),
-        searchType: this.searchType,
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        searchKeyWord: this.searchKeyWord,
-      })
-        .toPromise()
-        .then((response) => {
-          this.tranManagementList = response
-          this.deptCircularPage.currentPage = response.current
-          this.deptCircularPage.pageSize = response.size
-          this.deptBudgetTotal = response.total
+      },
+      //编辑
+      delivery(row) {
+        this.$router.push({
+          name: 'salesPlanEdit',
+          query: {
+            id: row.id,
+          },
         })
+      },
+      //查找
+      lookUp() {
+        this.currentPage = 1
+        this.getList()
+      },
+      selectExamineType(e) {
+        for (var i = 0; i < this.searchTypeList.length; i++) {
+          if (this.searchTypeList[i].value == e) {
+            this.searchType = this.searchTypeList[i].type
+          }
+        }
+        this.currentPage = 1
+        this.getList()
+      },
+      //审核通过
+      adopt(row) {
+        this.salePlanInfo.id = row.id
+        this.salePlanInfo.flag = 1
+        this.$confirm(`确定通过该交易信息？`, '提示', {
+            confirmButtonText: '通过',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            saleexamine(this.salePlanInfo)
+              .toPromise()
+              .then((response) => {
+
+                this.$notify.success({
+                  title: '成功',
+                  message: '通过成功',
+                })
+                this.getList()
+              })
+              .catch((response) => {
+                console.log(response)
+                EventBus.$emit('error', response.message)
+              })
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      //审核驳回
+      reject(row) {
+        this.salePlanInfo.id = row.id
+        this.salePlanInfo.flag = 2
+        this.$confirm(`确定驳回该交易信息？`, '提示', {
+            confirmButtonText: '驳回',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            saleexamine(this.salePlanInfo)
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '驳回成功',
+                })
+                this.getList()
+              })
+              .catch((response) => {
+                console.log(response)
+                EventBus.$emit('error', response.message)
+              })
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+      //销售
+      sale() {
+        this.getList()
+      },
+      //销售列表
+      getList() {
+        saleList({
+            compId: localStorage.getItem('ws-pf_compId'),
+            searchType: this.searchType,
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            searchKeyWord: this.searchKeyWord,
+          })
+          .toPromise()
+          .then((response) => {
+            this.tranManagementList = response
+            this.deptCircularPage.currentPage = response.current
+            this.deptCircularPage.pageSize = response.size
+            this.deptBudgetTotal = response.total
+          })
+      },
     },
-  },
-}
+  }
 </script>
 <style lang="scss" scoped>
-.container {
-  width: 100%;
-  margin: 0 auto;
-}
-.vertical-text-left {
-  width: 62px;
-  text-align: right;
-}
-.el-button--primary {
-  background-color: #5878e8;
-  border-color: #5878e8;
-}
-.el-button--default {
-  color: #8890b1;
-  border-color: #e8eaf1;
-}
-/deep/.base_header_layout .find.el-button--primary {
-  width: 30px;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-}
-/deep/.base_header_layout .findinput input {
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
-/deep/.findValue .el-input__inner {
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
-//操作按钮
-.record,
-.adjustment {
-  display: inline-block;
-  color: #5878e8;
-  padding: 0 4px !important;
-  position: relative;
-  font-size: 14px;
-}
-.record:after {
-  position: absolute;
-  content: '';
-  display: block;
-  top: 5px;
-  right: -2px;
-  width: 1px;
-  height: 12px;
-  background: #e9ecf7;
-}
-//状态样式
-.executory,
-.inExecution,
-.done {
-  width: 6px;
-  height: 6px;
-  display: inline-block;
-  border-radius: 50%;
-  position: relative;
-  top: -1px;
-  font-size: 14px;
-}
-.executory {
-  background: #ff9f24;
-}
-.inExecution {
-  background: #5878e8;
-}
-.done {
-  background: #50cad4;
-}
-.putstorage.el-button--default,
-.deliverystorage.el-button--default {
-  border-color: #8890b1;
-  background-color: #fff;
-  color: #8890b1;
-}
-/deep/.el-table td,
-/deep/.el-table th.is-leaf {
-  border-right: 1px solid #e9ecf7;
-  text-align: center;
-}
-/deep/.el-table tr td:first-child,
-/deep/.el-table tr th.is-leaf:first-child {
-  border-left: 1px solid #e9ecf7;
-}
-.el-row {
-  height: 60px;
-}
-.base_header_layout .grid-content {
-  margin-top: 80px;
-}
+  .container {
+    width: 100%;
+    margin: 0 auto;
+  }
+
+  .vertical-text-left {
+    width: 62px;
+    text-align: right;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+  }
+
+  .el-button--default {
+    color: #8890b1;
+    border-color: #e8eaf1;
+  }
+
+  /deep/.base_header_layout .find.el-button--primary {
+    width: 30px;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+
+  /deep/.base_header_layout .findinput input {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
+
+  /deep/.findValue .el-input__inner {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
+
+  //操作按钮
+  .record,
+  .adjustment {
+    display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+    font-size: 14px;
+  }
+
+  .record:after {
+    position: absolute;
+    content: '';
+    display: block;
+    top: 5px;
+    right: -2px;
+    width: 1px;
+    height: 12px;
+    background: #e9ecf7;
+  }
+
+  //状态样式
+  .executory,
+  .inExecution,
+  .done {
+    width: 6px;
+    height: 6px;
+    display: inline-block;
+    border-radius: 50%;
+    position: relative;
+    top: -1px;
+    font-size: 14px;
+  }
+
+  .executory {
+    background: #ff9f24;
+  }
+
+  .inExecution {
+    background: #5878e8;
+  }
+
+  .done {
+    background: #50cad4;
+  }
+
+  .putstorage.el-button--default,
+  .deliverystorage.el-button--default {
+    border-color: #8890b1;
+    background-color: #fff;
+    color: #8890b1;
+  }
+
+  /deep/.el-table td,
+  /deep/.el-table th.is-leaf {
+    border-right: 1px solid #e9ecf7;
+    text-align: center;
+  }
+
+  /deep/.el-table tr td:first-child,
+  /deep/.el-table tr th.is-leaf:first-child {
+    border-left: 1px solid #e9ecf7;
+  }
+
+  .el-row {
+    height: 60px;
+  }
+
+  .base_header_layout .grid-content {
+    margin-top: 80px;
+  }
+
+  .el-input--small .el-input__inner {
+    margin-left: 20px;
+  }
+
+  .el-range-editor--small.el-input__inner {
+    height: 32px;
+    margin: 0 10px;
+  }
+
+  /deep/.el-pagination {
+    text-align: center;
+    white-space: nowrap;
+    padding: 2px 5px;
+    color: #303133;
+    font-weight: 700;
+    margin-bottom: 20px;
+  }
+
+  .el-select {
+    width: 30%;
+    margin-right: 10px;
+  }
 
-.el-input--small .el-input__inner {
-  margin-left: 20px;
-}
-.el-range-editor--small.el-input__inner {
-  height: 32px;
-  margin: 0 10px;
-}
-/deep/.el-pagination {
-  text-align: center;
-  white-space: nowrap;
-  padding: 2px 5px;
-  color: #303133;
-  font-weight: 700;
-  margin-bottom: 20px;
-}
-.el-select {
-  width: 30%;
-  margin-right: 10px;
-}
-/deep/.typeselect .el-input__inner {
-  color: #8890b1;
-}
+  /deep/.typeselect .el-input__inner {
+    color: #8890b1;
+  }
 </style>

src/views/platformaudit/transactioninformationreview.vue

@@ -3,588 +3,564 @@
   <div>
     <BaseHeaderLayout :leftSpan="15">
       <template slot="right">
-        <ws-select
-          v-model="searchTypeText"
-          placeholder=""
-          class="typeselect"
-          @change="selectExamineType"
-          :value="searchType"
-        >
-          <ws-option
-            v-for="item in searchTypeList"
-            :key="item.value"
-            :label="item.value"
-            :value="item.value"
-            style="color: #8890b1"
-          />
+        <ws-select v-model="searchTypeText" placeholder="" class="typeselect" @change="selectExamineType"
+          :value="searchType">
+          <ws-option v-for="item in searchTypeList" :key="item.value" :label="item.value" :value="item.value"
+            style="color: #8890b1" />
         </ws-select>
-        <ws-input
-          v-model="searchKeyWord"
-          placeholder="可按编号、发布方和货名查找"
-          clearable
-          maxlength="500"
-           @keyup.enter.native="lookUp()"
-          type="input"
-        ></ws-input>
-        <ws-button class="find" type="primary" @click="lookUp()"
-          ><img
-            width="16"
-            height="16"
-            style="
+        <ws-input v-model="searchKeyWord" placeholder="可按编号、发布方和货名查找" clearable maxlength="500"
+          @keyup.enter.native="lookUp()" type="input"></ws-input>
+        <ws-button class="find" type="primary" @click="lookUp()"><img width="16" height="16" style="
               vertical-align: text-top;
               position: relative;
               top: 0px;
               left: -5px;
-            "
-            src="../../../public/img/sousuo.png"
-            alt=""
-        /></ws-button>
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button>
         <!-- </div> -->
       </template>
     </BaseHeaderLayout>
-    <div class="container">
-      <el-table
-        class="wenzi"
-        :data="tranManagementList.records"
-        style="width: 100%"
-        height="680"
-      >
-        <el-table-column type="index" label="序号" width="50">
-          <template scope="scope">
-            <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
-            <span v-else>{{ scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="procurementPlanNo" label="编号" > </el-table-column>
-        <el-table-column prop="buyer" label="发布企业/发布人" >
-        </el-table-column>
-        <el-table-column label="发布平台" > 
-          <template scope="scope">
-            <span v-if="scope.row.pcFlag==1">PC端</span>
-            <span v-else>移动端</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="goodsName" label="货名" > </el-table-column>
-        <el-table-column prop="plannedPurchaseVolume" label="重量（吨）" > </el-table-column>
-        <el-table-column prop="procurementPlanType" label="交易类型" > </el-table-column>
-        <el-table-column prop="basisPrice" label="基差(元/吨)" > </el-table-column>
-        <el-table-column prop="procurementPrice" label="价格(元/吨)" > </el-table-column>
-        <el-table-column prop="buyerPhone" label="电话" > </el-table-column>
-        <el-table-column prop="updateDate" label="更新时间" width="140"> </el-table-column>
-        <el-table-column prop="" label="操作" width="180">
-          <template slot-scope="scope">
-            <div
-              class="record"
-              @click="nocomplete(scope.row)"
-              v-hasPermission="
+    <el-table class="wenzi" :data="tranManagementList.records" style="width: 100%" height="calc(100% - 110px)">
+      <el-table-column type="index" label="序号" width="50">
+        <template scope="scope">
+          <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+          <span v-else>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="procurementPlanNo" label="编号"> </el-table-column>
+      <el-table-column prop="buyer" label="发布企业/发布人">
+      </el-table-column>
+      <el-table-column label="发布平台">
+        <template scope="scope">
+          <span v-if="scope.row.pcFlag==1">PC端</span>
+          <span v-else>移动端</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="goodsName" label="货名"> </el-table-column>
+      <el-table-column prop="plannedPurchaseVolume" label="重量（吨）"> </el-table-column>
+      <el-table-column prop="procurementPlanType" label="交易类型"> </el-table-column>
+      <el-table-column prop="basisPrice" label="基差(元/吨)"> </el-table-column>
+      <el-table-column prop="procurementPrice" label="价格(元/吨)"> </el-table-column>
+      <el-table-column prop="buyerPhone" label="电话"> </el-table-column>
+      <el-table-column prop="updateDate" label="更新时间" width="140"> </el-table-column>
+      <el-table-column prop="" label="操作" width="180">
+        <template slot-scope="scope">
+          <div class="record" @click="nocomplete(scope.row)" v-hasPermission="
            `audit.tranMerchant.tranMerchantInfo.view`
-          "
-            >查看</div>
-            <div
-              class="record"
-              @click="delivery(scope.row)"
-              v-hasPermission="
+          ">查看</div>
+          <div class="record" @click="delivery(scope.row)" v-hasPermission="
            `audit.tranMerchant.tranMerchantInfo.view`
-          "
-            >编辑</div>
-            <div
-              class="record"
-              @click="deleteclick(scope.row)"
-              v-hasPermission="
+          ">编辑</div>
+          <div class="record" @click="deleteclick(scope.row)" v-hasPermission="
            `audit.tranMerchant.tranMerchantInfo.view`
-          "
-            >删除</div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="address" label="审核" >
-          <template slot-scope="scope">
-            <el-button
-              size="medium"
-              type="text"
-              class="record"
-              v-if="scope.row.statusFlag==1"
-              v-hasPermission="
+          ">删除</div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="address" label="审核">
+        <template slot-scope="scope">
+          <el-button size="medium" type="text" class="record" v-if="scope.row.statusFlag==1" v-hasPermission="
            `audit.tranMerchant.tranMerchantInfo.view`
-          "
-              @click="reject(scope.row)"
-              >驳回</el-button
-            >
-            <el-button
-              size="medium"
-              type="text"
-              class="record"
-              v-if="scope.row.statusFlag==1"
-              v-hasPermission="
+          " @click="reject(scope.row)">驳回</el-button>
+          <el-button size="medium" type="text" class="record" v-if="scope.row.statusFlag==1" v-hasPermission="
            `audit.tranMerchant.tranMerchantInfo.view`
-          "
-              @click="adopt(scope.row)"
-              >通过</el-button
-            >
-            <template v-else v-hasPermission="
+          " @click="adopt(scope.row)">通过</el-button>
+          <template v-else v-hasPermission="
            `audit.tranMerchant.tranMerchantInfo.view`
-          " slot-scope="scope"> 
+          " slot-scope="scope">
             {{ scope.row.status}}
           </template>
-          </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>
+      </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>
-import { getTransactionInformation, transactionInformationList ,deleteTransactionInformation} from '@/model/platformaudit/index'
-import Pagination from '@/components/Pagination'
-import WsUpload from '@/components/WsUpload'
-import { EventBus } from 'base-core-lib'
-import { billoperatehis } from '@/model/contarct/index'
-export default {
-  name: 'viewSpareMoney',
-  components: {
-    WsUpload,
-    Pagination,
-  },
-  watch: {
-    vesselId(val) {
-      this.getList()
-    },
-    isShow(val) {
-      this.showType = val
+  import {
+    getTransactionInformation,
+    transactionInformationList,
+    deleteTransactionInformation
+  } from '@/model/platformaudit/index'
+  import Pagination from '@/components/Pagination'
+  import WsUpload from '@/components/WsUpload'
+  import {
+    EventBus
+  } from 'base-core-lib'
+  import {
+    billoperatehis
+  } from '@/model/contarct/index'
+  export default {
+    name: 'viewSpareMoney',
+    components: {
+      WsUpload,
+      Pagination,
     },
-  },
-  data() {
-    return {
-      //弹出框
-      dialogViewSpareMoney: false,
-      dialogApproveFormVisible: false,
-      // 船舶类型
-      monetaryKey: null,
-      // 表格显示数据
-      tableDate: [],
-
-      // 是否显示
-      showType: true,
-      // 年
-      year: '',
-      currentPage: 1,
-      pageSize: 10,
-      deptBudgetTotal: 0,
-      searchTypeText: '待审核',
-      searchKeyWord: '',
-      // 提交类型
-      submitType: true,
-      size: 10,
-      spanArr: [],
-      warehouseName: '',
-      searchType: 1,
-      startDate: null,
-      endDate: null,
-      compId: localStorage.getItem('ws-pf_compId'),
-      deptCircularPage: {},
-      tranManagementList: [],
-      deptBudgetList: {},
-      historyList: [],
-      inOutDate: [],
-      searchTypeList: [
-        { value: '待审核', type: 1 },
-        { value: '已通过', type: 2 },
-        { value: '全部', type: '' },
-      ],
-      procurementPlanInfo:{
-        id: '',
-        flag: '',
+    watch: {
+      vesselId(val) {
+        this.getList()
       },
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          return time.getTime() > Date.now()
-        },
+      isShow(val) {
+        this.showType = val
       },
-      accessoryTFs: false,
-    }
-  },
-  activated() {
-    //cg.viewBudget
-    //cg.viewSpareMoney
-    // this.getVesselData();
-    this.getList()
-    this.showType = this.isShow
-  },
-  methods: {
-    getSpanArr(data) {
-      let that = this
-      //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
-      that.spanArr = []
-      that.pos = 0
-      //遍历数据
-      data.forEach((item, index) => {
-        //判断是否是第一项
-
-        // if (index === 0) {
-        //   this.spanArr.push(1)
-        //   this.pos = 0
-        // } else {
-        //不是第一项时，就根据标识去存储
-        if (data[index].warehouseNumViewList.length > 1) {
-          // 查找到符合条件的数据时每次要把之前存储的数据+1
-          this.spanArr[this.pos] = data[index].warehouseNumViewList.length
-          this.spanArr.push(0)
-        } else {
-          // 没有符合的数据时，要记住当前的index
-          this.spanArr.push(1)
-          this.pos = index
-        }
-        // }
-      })
-    },
-    //删除
-    deleteclick(row) {
-      //cancelButtonClass: "btn-custom-cancel"
-      this.$confirm(`交易信息删除后不可恢复，是否确定删除？`, {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          deleteTransactionInformation({
-            id: row.id
-          })
-            .toPromise()
-            .then(response => {
-              this.getList()
-            })
-        })
-        .catch(() => {
-          return false
-        })
     },
-    //查看//传参
-    nocomplete(row) {
-      this.$router.push({
-        name: 'procurementPlanLook',
-        query: {
-          id: row.id,
+    data() {
+      return {
+        //弹出框
+        dialogViewSpareMoney: false,
+        dialogApproveFormVisible: false,
+        // 船舶类型
+        monetaryKey: null,
+        // 表格显示数据
+        tableDate: [],
+
+        // 是否显示
+        showType: true,
+        // 年
+        year: '',
+        currentPage: 1,
+        pageSize: 10,
+        deptBudgetTotal: 0,
+        searchTypeText: '待审核',
+        searchKeyWord: '',
+        // 提交类型
+        submitType: true,
+        size: 10,
+        spanArr: [],
+        warehouseName: '',
+        searchType: 1,
+        startDate: null,
+        endDate: null,
+        compId: localStorage.getItem('ws-pf_compId'),
+        deptCircularPage: {},
+        tranManagementList: [],
+        deptBudgetList: {},
+        historyList: [],
+        inOutDate: [],
+        searchTypeList: [{
+            value: '待审核',
+            type: 1
+          },
+          {
+            value: '已通过',
+            type: 2
+          },
+          {
+            value: '全部',
+            type: ''
+          },
+        ],
+        procurementPlanInfo: {
+          id: '',
+          flag: '',
         },
-      })
-    },
-    //编辑
-     delivery(row) {
-      this.$router.push({
-        name: 'procurementPlanEdit',
-        query: {
-          id: row.id,
+        pickerBeginDateBefore: {
+          disabledDate: (time) => {
+            return time.getTime() > Date.now()
+          },
         },
-      })
-    },
-    //查找
-    lookUp() {
-      this.currentPage = 1
-      this.getList()
-    },
-    selectExamineType(e) {
-      for (var i = 0; i < this.searchTypeList.length; i++) {
-        if (this.searchTypeList[i].value == e) {
-          this.searchType = this.searchTypeList[i].type
-        }
+        accessoryTFs: false,
       }
-      this.currentPage= 1
+    },
+    activated() {
+      //cg.viewBudget
+      //cg.viewSpareMoney
+      // this.getVesselData();
       this.getList()
+      this.showType = this.isShow
     },
-    //审核通过
-    adopt(row) {
-      this.procurementPlanInfo.id = row.id
-      this.procurementPlanInfo.flag = 1
-      this.$confirm(`确定通过该交易信息？`, '提示', {
-        confirmButtonText: '通过',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          getTransactionInformation( this.procurementPlanInfo )
-            .toPromise()
-            .then((response) => {
-              
-              this.$notify.success({
-                title: '成功',
-                message: '通过成功',
-              })
-              this.getList()
-            })
-            .catch((response) => {
-              console.log(response)
-              EventBus.$emit('error', response.message)
-            })
-        })
-        .catch(() => {
-          return false
+    methods: {
+      getSpanArr(data) {
+        let that = this
+        //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
+        that.spanArr = []
+        that.pos = 0
+        //遍历数据
+        data.forEach((item, index) => {
+          //判断是否是第一项
+
+          // if (index === 0) {
+          //   this.spanArr.push(1)
+          //   this.pos = 0
+          // } else {
+          //不是第一项时，就根据标识去存储
+          if (data[index].warehouseNumViewList.length > 1) {
+            // 查找到符合条件的数据时每次要把之前存储的数据+1
+            this.spanArr[this.pos] = data[index].warehouseNumViewList.length
+            this.spanArr.push(0)
+          } else {
+            // 没有符合的数据时，要记住当前的index
+            this.spanArr.push(1)
+            this.pos = index
+          }
+          // }
         })
-    },
-    //审核驳回
-    reject(row) {
-       this.procurementPlanInfo.id = row.id
-       this.procurementPlanInfo.flag = 2
-      this.$confirm(`确定驳回该交易信息？`, '提示', {
-        confirmButtonText: '驳回',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          getTransactionInformation(this.procurementPlanInfo)
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '驳回成功',
+      },
+      //删除
+      deleteclick(row) {
+        //cancelButtonClass: "btn-custom-cancel"
+        this.$confirm(`交易信息删除后不可恢复，是否确定删除？`, {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+            deleteTransactionInformation({
+                id: row.id
+              })
+              .toPromise()
+              .then(response => {
+                this.getList()
               })
-              this.getList()
-            })
-            .catch((response) => {
-              console.log(response)
-              EventBus.$emit('error', response.message)
-            })
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      //查看//传参
+      nocomplete(row) {
+        this.$router.push({
+          name: 'procurementPlanLook',
+          query: {
+            id: row.id,
+          },
         })
-        .catch(() => {
-          return false
+      },
+      //编辑
+      delivery(row) {
+        this.$router.push({
+          name: 'procurementPlanEdit',
+          query: {
+            id: row.id,
+          },
         })
-    },
-    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')
-          )
+      },
+      //查找
+      lookUp() {
+        this.currentPage = 1
+        this.getList()
+      },
+      selectExamineType(e) {
+        for (var i = 0; i < this.searchTypeList.length; i++) {
+          if (this.searchTypeList[i].value == e) {
+            this.searchType = this.searchTypeList[i].type
+          }
         }
-      }
-      return fmt
-    },
-    handleClose() {
-      this.accessoryTFs = false
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getList()
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val
-      console.log(`当前页: ${val}`)
-      this.getList()
-    },
-    //采购
-    purchase() {
-      this.getList()
-    },
-    //采购列表
-    getList() {
-      transactionInformationList({
-        compId: localStorage.getItem('ws-pf_compId'),
-        searchType: this.searchType,
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        searchKeyWord: this.searchKeyWord,
-      })
-        .toPromise()
-        .then((response) => {
-          this.tranManagementList = response
-          this.deptCircularPage.currentPage = response.current
-          this.deptCircularPage.pageSize = response.size
-          this.deptBudgetTotal = response.total
-        })
-    },
-    //更改状态
-    editClick(row) {
-      var status = ''
-      if (row.processStatus == '待执行' || row.processStatus == '已完成') {
-        status = '执行中'
-      } else if (row.processStatus == '执行中') {
-        status = '已完成'
-      }
-      this.$confirm(`是否将状态改为${status}`, {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          alsostate({ id: row.id })
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '状态修改成功',
+        this.currentPage = 1
+        this.getList()
+      },
+      //审核通过
+      adopt(row) {
+        this.procurementPlanInfo.id = row.id
+        this.procurementPlanInfo.flag = 1
+        this.$confirm(`确定通过该交易信息？`, '提示', {
+            confirmButtonText: '通过',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            getTransactionInformation(this.procurementPlanInfo)
+              .toPromise()
+              .then((response) => {
+
+                this.$notify.success({
+                  title: '成功',
+                  message: '通过成功',
+                })
+                this.getList()
               })
-              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
+              .catch((response) => {
+                console.log(response)
+                EventBus.$emit('error', response.message)
+              })
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      //审核驳回
+      reject(row) {
+        this.procurementPlanInfo.id = row.id
+        this.procurementPlanInfo.flag = 2
+        this.$confirm(`确定驳回该交易信息？`, '提示', {
+            confirmButtonText: '驳回',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            getTransactionInformation(this.procurementPlanInfo)
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '驳回成功',
+                })
+                this.getList()
+              })
+              .catch((response) => {
+                console.log(response)
+                EventBus.$emit('error', response.message)
+              })
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      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()          // 秒
+          // 有其他格式化字符需求可以继续添加，必须转化成字符串
         }
-      }
-    },
-    fujian(row) {
-      if (
-        row.receiveAttachmentPath === null ||
-        row.receiveAttachmentPath === ''
-      ) {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
-      } else {
-        this.accessoryTFs = true
-      }
-      this.appendixIdss = row.receiveAttachmentPath
-    },
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    handleCloe() {
-      this.dialogViewSpareMoney = false
-    },
-    history(row) {
-      billoperatehis({ id: row.id })
-        .toPromise()
-        .then((response) => {
-          this.historyList = response
-        })
+        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.accessoryTFs = false
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+      //采购
+      purchase() {
+        this.getList()
+      },
+      //采购列表
+      getList() {
+        transactionInformationList({
+            compId: localStorage.getItem('ws-pf_compId'),
+            searchType: this.searchType,
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            searchKeyWord: this.searchKeyWord,
+          })
+          .toPromise()
+          .then((response) => {
+            this.tranManagementList = response
+            this.deptCircularPage.currentPage = response.current
+            this.deptCircularPage.pageSize = response.size
+            this.deptBudgetTotal = response.total
+          })
+      },
+      //更改状态
+      editClick(row) {
+        var status = ''
+        if (row.processStatus == '待执行' || row.processStatus == '已完成') {
+          status = '执行中'
+        } else if (row.processStatus == '执行中') {
+          status = '已完成'
+        }
+        this.$confirm(`是否将状态改为${status}`, {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            alsostate({
+                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) {
+        if (
+          row.receiveAttachmentPath === null ||
+          row.receiveAttachmentPath === ''
+        ) {
+          EventBus.$emit(
+            'warning',
+            this.$t('system.noticeCircular.NoInformation')
+          )
+        } else {
+          this.accessoryTFs = true
+        }
+        this.appendixIdss = row.receiveAttachmentPath
+      },
+      // 关闭 dialog时 处理文件url 初始化upload组件
+      handleCloe() {
+        this.dialogViewSpareMoney = false
+      },
+      history(row) {
+        billoperatehis({
+            id: row.id
+          })
+          .toPromise()
+          .then((response) => {
+            this.historyList = response
+          })
+      },
     },
-  },
-}
+  }
 </script>
 <style lang="scss" scoped>
-.container {
-  width: 100%;
-  margin: 0 auto;
-}
-.vertical-text-left {
-  width: 62px;
-  text-align: right;
-}
-.el-button--primary {
-  background-color: #5878e8;
-  border-color: #5878e8;
-}
-.el-button--default {
-  color: #8890b1;
-  border-color: #e8eaf1;
-}
-/deep/.base_header_layout .grid-content.right .find.el-button--primary {
-  width: 30px;
-  margin-left: 0;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-}
-/deep/.findValue .el-input__inner {
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
-//操作按钮
-.record,
-.adjustment {
-  display: inline-block;
-  color: #5878e8;
-  padding: 0 4px !important;
-  position: relative;
-  font-size: 14px;
-}
-.record:after {
-  position: absolute;
-  content: '';
-  display: block;
-  top: 5px;
-  right: -2px;
-  width: 1px;
-  height: 12px;
-  background: #e9ecf7;
-}
-//状态样式
-.executory,
-.inExecution,
-.done {
-  width: 6px;
-  height: 6px;
-  display: inline-block;
-  border-radius: 50%;
-  position: relative;
-  top: -1px;
-  font-size: 14px;
-}
-.executory {
-  background: #ff9f24;
-}
-.inExecution {
-  background: #5878e8;
-}
-.done {
-  background: #50cad4;
-}
-.putstorage.el-button--default,
-.deliverystorage.el-button--default {
-  border-color: #8890b1;
-  background-color: #fff;
-  color: #8890b1;
-}
-/deep/.el-table td,
-/deep/.el-table th.is-leaf {
-  border-right: 1px solid #e9ecf7;
-  text-align: center;
-}
-/deep/.el-table tr td:first-child,
-/deep/.el-table tr th.is-leaf:first-child {
-  border-left: 1px solid #e9ecf7;
-}
-.el-row {
-  height: 60px;
-}
-.base_header_layout .grid-content {
-  margin-top: 80px;
-}
+  .container {
+    width: 100%;
+    margin: 0 auto;
+  }
+
+  .vertical-text-left {
+    width: 62px;
+    text-align: right;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+  }
+
+  .el-button--default {
+    color: #8890b1;
+    border-color: #e8eaf1;
+  }
+
+  /deep/.base_header_layout .grid-content.right .find.el-button--primary {
+    width: 30px;
+    margin-left: 0;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+
+  /deep/.findValue .el-input__inner {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
+
+  //操作按钮
+  .record,
+  .adjustment {
+    display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+    font-size: 14px;
+  }
+
+  .record:after {
+    position: absolute;
+    content: '';
+    display: block;
+    top: 5px;
+    right: -2px;
+    width: 1px;
+    height: 12px;
+    background: #e9ecf7;
+  }
+
+  //状态样式
+  .executory,
+  .inExecution,
+  .done {
+    width: 6px;
+    height: 6px;
+    display: inline-block;
+    border-radius: 50%;
+    position: relative;
+    top: -1px;
+    font-size: 14px;
+  }
+
+  .executory {
+    background: #ff9f24;
+  }
+
+  .inExecution {
+    background: #5878e8;
+  }
+
+  .done {
+    background: #50cad4;
+  }
+
+  .putstorage.el-button--default,
+  .deliverystorage.el-button--default {
+    border-color: #8890b1;
+    background-color: #fff;
+    color: #8890b1;
+  }
+
+  /deep/.el-table td,
+  /deep/.el-table th.is-leaf {
+    border-right: 1px solid #e9ecf7;
+    text-align: center;
+  }
+
+  /deep/.el-table tr td:first-child,
+  /deep/.el-table tr th.is-leaf:first-child {
+    border-left: 1px solid #e9ecf7;
+  }
+
+  .el-row {
+    height: 60px;
+  }
+
+  .base_header_layout .grid-content {
+    margin-top: 80px;
+  }
+
+  .el-input--small .el-input__inner {
+    margin-left: 20px;
+  }
+
+  .el-range-editor--small.el-input__inner {
+    height: 32px;
+    margin: 0 10px;
+  }
+
+  /deep/.el-pagination {
+    text-align: center;
+    white-space: nowrap;
+    padding: 2px 5px;
+    color: #303133;
+    font-weight: 700;
+    margin-bottom: 20px;
+  }
+
+  .el-select {
+    width: 30%;
+    margin-right: 10px;
+  }
 
-.el-input--small .el-input__inner {
-  margin-left: 20px;
-}
-.el-range-editor--small.el-input__inner {
-  height: 32px;
-  margin: 0 10px;
-}
-/deep/.el-pagination {
-  text-align: center;
-  white-space: nowrap;
-  padding: 2px 5px;
-  color: #303133;
-  font-weight: 700;
-  margin-bottom: 20px;
-}
-.el-select {
-  width: 30%;
-  margin-right: 10px;
-}
-/deep/.typeselect .el-input__inner {
-  color: #8890b1;
-}
+  /deep/.typeselect .el-input__inner {
+    color: #8890b1;
+  }
 </style>

src/views/purchasingManagement/procurementPlanList.vue

@@ -1,6 +1,6 @@
 //采购计划
 <template>
-  <div class="container">
+  <div class="">
     <BaseHeaderLayout :leftSpan="10">
       <template slot="left">
         <ws-button type="primary" v-hasPermission="
@@ -10,84 +10,37 @@
 
       <!-- 接单开始 -->
       <template slot="right">
-        <ws-input
-          v-model="searchKeyWord"
-          placeholder="可按采购计划编号、标题和货名查找"
-          clearable
-          maxlength="500"
-          type="input"
-          class="findValue"
-        ></ws-input>
-        <ws-button class="find" type="primary" @click="find()"
-          ><img
-            width="16"
-            height="16"
-            style="
+        <ws-input v-model="searchKeyWord" placeholder="可按采购计划编号、标题和货名查找" clearable maxlength="500" type="input"
+          class="findValue"></ws-input>
+        <ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
               vertical-align: text-top;
               position: relative;
               top: 0px;
               left: -8px;
-            "
-            src="../../../public/img/sousuo.png"
-            alt=""
-        /></ws-button>
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button>
       </template>
     </BaseHeaderLayout>
-    <el-table
-      class="wenzi"
-      :data="warehouseList.records"
-      style="width: 100%; margin-top: 20px"
-      height="780"
-    >
+    <el-table class="wenzi" :data="warehouseList.records" style="width: 100%; margin-top: 20px" height="calc(100% - 110px)">
       <el-table-column type="index" label="序号" width="80"></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="procurementPlanNo"
-        label="采购计划编号"
-      >
+      <el-table-column class="table_td" prop="procurementPlanNo" label="采购计划编号">
       </el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="title"
-        label="标题"
-      ></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="goodsName"
-        label="货名"
-      ></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="plannedPurchaseVolume"
-        label="重量(吨)"
-      ></el-table-column>
+      <el-table-column class="table_td" prop="title" label="标题"></el-table-column>
+      <el-table-column class="table_td" prop="goodsName" label="货名"></el-table-column>
+      <el-table-column class="table_td" prop="plannedPurchaseVolume" label="重量(吨)"></el-table-column>
       <el-table-column class="table_td" prop="basisPrice" label="基差(元/吨)">
         <template slot-scope="scope">
           <div v-if="scope.row.procurementPlanType == '期货'">
             <div class="inputChenge">
-              <el-input
-                v-model="scope.row.basisPrice"
-                v-if="scope.row.identification == 'true'"
-              ></el-input>
+              <el-input v-model="scope.row.basisPrice" v-if="scope.row.identification == 'true'"></el-input>
               <div v-if="scope.row.identification == 'false'" class="inputs">
                 {{ scope.row.basisPrice }}
               </div>
             </div>
-            <img
-              width="17"
-              height="18"
-              style="vertical-align: text-top; position: relative; top: -1px"
-              src="../../../public/img/edit.png"
-              @click="whether(scope.row)"
-              alt=""
-              v-if="scope.row.identification == 'false'"
-            />
-            <i
-              class="el-icon-check"
-              style="line-height: 29px; margin-left: 10px"
-              v-if="scope.row.identification == 'true'"
-              @click="varietyClick(scope.row)"
-            ></i>
+            <img width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
+              src="../../../public/img/edit.png" @click="whether(scope.row)" alt=""
+              v-if="scope.row.identification == 'false'" />
+            <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
+              v-if="scope.row.identification == 'true'" @click="varietyClick(scope.row)"></i>
           </div>
           <div v-else>—</div>
         </template>
@@ -97,73 +50,41 @@
           <div v-if="scope.row.procurementPlanType == '现货'">
             <div class="inputChenge">
               <!-- readonly -->
-              <el-input
-                v-model="scope.row.procurementPrice"
-                v-if="scope.row.identification == 'true'"
-              ></el-input>
+              <el-input v-model="scope.row.procurementPrice" v-if="scope.row.identification == 'true'"></el-input>
               <div v-if="scope.row.identification == 'false'" class="inputs">
                 {{ scope.row.procurementPrice }}
               </div>
             </div>
-            <img
-              width="17"
-              height="18"
-              style="vertical-align: text-top; position: relative; top: -1px"
-              src="../../../public/img/edit.png"
-              @click="whether(scope.row)"
-              v-if="scope.row.identification == 'false'"
-              alt=""
-            />
-            <i
-              class="el-icon-check"
-              style="line-height: 29px; margin-left: 10px"
-              v-if="scope.row.identification == 'true'"
-              @click="varietyClick(scope.row)"
-            ></i>
+            <img width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
+              src="../../../public/img/edit.png" @click="whether(scope.row)" v-if="scope.row.identification == 'false'"
+              alt="" />
+            <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
+              v-if="scope.row.identification == 'true'" @click="varietyClick(scope.row)"></i>
           </div>
           <div v-else>—</div>
         </template>
       </el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="receiveWarehouse"
-        label="收货库"
-      ></el-table-column>
+      <el-table-column class="table_td" prop="receiveWarehouse" 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)"
-          >
+          <el-popover placement="left" :width="285" trigger="click" visible-arrow="false" @show="history(scope.row)">
             <template>
               <span slot="reference">
                 <span v-if="scope.row.showFlag == 1">
-                展示中</span
-                >
+                  展示中</span>
                 <span v-if="scope.row.showFlag == 0">
-                已隐藏</span
-                >
+                  已隐藏</span>
               </span>
             </template>
             <div>
               <!-- <p style="margin-top: 0; padding-left: 10px">历史记录</p> -->
-              <div
-                v-for="(item, index) in historyList"
-                class="flex"
-                :key="index"
-              >
+              <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 v-if="index != historyList.length - 1" class="vertical-line"></div>
                 </div>
                 <div class="vertical-text">
                   {{ item.operateUser }}
@@ -173,24 +94,14 @@
               </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=""
-          />
+          <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="updateDate"
-      ></el-table-column>
+      <el-table-column class="table_td" label="更新时间" prop="updateDate"></el-table-column>
       <el-table-column prop="seller" label="操作" width="300">
         <template slot-scope="scope">
-          <div class="record"  v-hasPermission="
+          <div class="record" v-hasPermission="
             `procurement.procurementPlan.procurementInfo.view`
           " @click="handleLook(scope.row)">查看</div>
           <div class="record" v-hasPermission="
@@ -203,259 +114,189 @@
       </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 @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>
-import {
-  procurementPlan,
-  procurementDel,
-  billoperatehis,
-  procurementEditOther,
-} from '@/model/purchasingManagement/index'
-import { downloadFile } from '@/utils/batchDown'
-import Pagination from '@/components/Pagination'
-import WsUpload from '@/components/WsUpload'
-export default {
-  name: 'viewSpareMoney',
-  components: {
-    WsUpload,
-    Pagination,
-  },
-  watch: {
-    vesselId(val) {
-      this.getList()
+  import {
+    procurementPlan,
+    procurementDel,
+    billoperatehis,
+    procurementEditOther,
+  } from '@/model/purchasingManagement/index'
+  import {
+    downloadFile
+  } from '@/utils/batchDown'
+  import Pagination from '@/components/Pagination'
+  import WsUpload from '@/components/WsUpload'
+  export default {
+    name: 'viewSpareMoney',
+    components: {
+      WsUpload,
+      Pagination,
     },
-    isShow(val) {
-      this.showType = val
-    },
-  },
-  data() {
-    return {
-      //弹出框
-      dialogViewSpareMoney: false,
-      dialogApproveFormVisible: false,
-      // 船舶类型
-      monetaryKey: null,
-      // 表格显示数据
-      tableDate: [],
-
-      // 是否显示
-      showType: true,
-      // 年
-      year: '',
-      pickerOptions: {},
-      value2: '',
-      deptBudgetTotal: 0,
-      currentPage: 1,
-      // tranTypeKey: 1,
-      pageSize: 10,
-      searchType: 1,
-      searchTypeText: '未完成',
-      searchKeyWord: '',
-      contractType: 2,
-      pcFlag: 1,
-      // 提交类型
-      submitType: true,
-      size: 10,
-      spanArr: [],
-      contractNo: '',
-      // inOutTaskNo: '',
-      compId: localStorage.getItem('ws-pf_compId'),
-      deptCircularPage: {},
-      warehouseList: [],
-      deptBudgetList: {},
-      historyList: [],
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          return time.getTime() > Date.now()
-        },
+    watch: {
+      vesselId(val) {
+        this.getList()
       },
-      accessoryTFs: false,
-    }
-  },
-  activated() {
-    this.getList()
-    this.showType = this.isShow
-  },
-  methods: {
-    getList() {
-      procurementPlan({
+      isShow(val) {
+        this.showType = val
+      },
+    },
+    data() {
+      return {
+        //弹出框
+        dialogViewSpareMoney: false,
+        dialogApproveFormVisible: false,
+        // 船舶类型
+        monetaryKey: null,
+        // 表格显示数据
+        tableDate: [],
+
+        // 是否显示
+        showType: true,
+        // 年
+        year: '',
+        pickerOptions: {},
+        value2: '',
+        deptBudgetTotal: 0,
+        currentPage: 1,
+        // tranTypeKey: 1,
+        pageSize: 10,
+        searchType: 1,
+        searchTypeText: '未完成',
+        searchKeyWord: '',
+        contractType: 2,
+        pcFlag: 1,
+        // 提交类型
+        submitType: true,
+        size: 10,
+        spanArr: [],
+        contractNo: '',
+        // inOutTaskNo: '',
         compId: localStorage.getItem('ws-pf_compId'),
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        contractType: this.contractType,
-        tranTypeKey: this.tranTypeKey,
-        contractNo: this.contractNo,
-        pcFlag: this.pcFlag,
-        searchKeyWord: this.searchKeyWord,
-      })
-        .toPromise()
-        .then((response) => {
-          for (var i = 0; i < response.records.length; i++) {
-            response.records[i].identification = 'false'
-          }
-          this.warehouseList = response
-          this.deptCircularPage.currentPage = response.current
-          this.deptCircularPage.pageSize = response.size
-          this.deptBudgetTotal = response.total
-        })
+        deptCircularPage: {},
+        warehouseList: [],
+        deptBudgetList: {},
+        historyList: [],
+        pickerBeginDateBefore: {
+          disabledDate: (time) => {
+            return time.getTime() > Date.now()
+          },
+        },
+        accessoryTFs: false,
+      }
     },
-    statusquery(state) {
-      this.searchType = state
+    activated() {
       this.getList()
+      this.showType = this.isShow
     },
-    //编辑
-    handleEdit(row) {
-      this.$router.push({
-        name: 'procurementPlanEdit',
-        query: { id: row.id },
-      })
-    },
-    whether(row) {
-      row.identification = 'true'
-    },
+    methods: {
+      getList() {
+        procurementPlan({
+            compId: localStorage.getItem('ws-pf_compId'),
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            contractType: this.contractType,
+            tranTypeKey: this.tranTypeKey,
+            contractNo: this.contractNo,
+            pcFlag: this.pcFlag,
+            searchKeyWord: this.searchKeyWord,
+          })
+          .toPromise()
+          .then((response) => {
+            for (var i = 0; i < response.records.length; i++) {
+              response.records[i].identification = 'false'
+            }
+            this.warehouseList = response
+            this.deptCircularPage.currentPage = response.current
+            this.deptCircularPage.pageSize = response.size
+            this.deptBudgetTotal = response.total
+          })
+      },
+      statusquery(state) {
+        this.searchType = state
+        this.getList()
+      },
+      //编辑
+      handleEdit(row) {
+        this.$router.push({
+          name: 'procurementPlanEdit',
+          query: {
+            id: row.id
+          },
+        })
+      },
+      whether(row) {
+        row.identification = 'true'
+      },
 
-    getSpanArr(data) {
-      let that = this
+      getSpanArr(data) {
+        let that = this
 
-      //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
+        //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
 
-      that.spanArr = []
+        that.spanArr = []
 
-      that.pos = 0
+        that.pos = 0
 
-      // //遍历数据
+        // //遍历数据
 
-      data.forEach((item, index) => {
-        //判断是否是第一项
+        data.forEach((item, index) => {
+          //判断是否是第一项
 
-        if (index === 0) {
-          this.spanArr.push(1)
-          this.pos = 0
-        } else {
-          //不是第一项时，就根据标识去存储
-          if (data[index].warehouseNumViewList.length > 1) {
-            查找到符合条件的数据时每次要把之前存储的数据 + 1
-            this.spanArr[this.pos] = data[index].warehouseNumViewList.length
-            this.spanArr.push(0)
-          } else {
-            // 没有符合的数据时，要记住当前的index
+          if (index === 0) {
             this.spanArr.push(1)
-            this.pos = index
+            this.pos = 0
+          } else {
+            //不是第一项时，就根据标识去存储
+            if (data[index].warehouseNumViewList.length > 1) {
+              查找到符合条件的数据时每次要把之前存储的数据 + 1
+              this.spanArr[this.pos] = data[index].warehouseNumViewList.length
+              this.spanArr.push(0)
+            } else {
+              // 没有符合的数据时，要记住当前的index
+              this.spanArr.push(1)
+              this.pos = index
+            }
           }
-        }
-      })
-    },
-    //添加
-    handleAdd() {
-      this.$router.push({
-        name: 'procurementPlanAdd',
-      })
-    },
-    //查看
-    handleLook(row) {
-      this.$router.push({
-        name: 'procurementPlanLook',
-        query: {
-          id: row.id,
-        },
-      })
-    },
-    handleDelete(row) {
-      var handleDelete = ' '
-      if (row.handleDelete == '') {
-      }
-      this.$confirm(`采购计划删除后不可恢复，是否确定删除？`, {
-        cancelButtonText: '取消',
-        confirmButtonText: '确定',
-        type: 'warning',
-      })
-        .then(() => {
-          procurementDel({ 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
+      },
+      //添加
+      handleAdd() {
+        this.$router.push({
+          name: 'procurementPlanAdd',
         })
-    },
-    //返回
-    revert() {
-      this.$router.push({ path: 'warehouseManagementList' })
-    },
-    dateFormat(fmt, date) {
-      let ret
-      const opt = {
-        'Y+': date.getFullYear().toString(), // 年
-        'm+': (date.getMonth() + 1).toString(), // 月
-        'd+': date.getDate().toString(), // 日
-        'H+': date.getHours().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.accessoryTFs = false
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getList()
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val
-      console.log(`当前页: ${val}`)
-      this.getList()
-    },
-    editClick(row) {
-      var status = ''
-      var num = 1
-      if (row.showFlag == 1) {
-        status = '已隐藏'
-        num = 0
-        this.$confirm(`隐藏后交易信息不再展示给客户，是否确定隐藏？`, {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
+      },
+      //查看
+      handleLook(row) {
+        this.$router.push({
+          name: 'procurementPlanLook',
+          query: {
+            id: row.id,
+          },
         })
+      },
+      handleDelete(row) {
+        var handleDelete = ' '
+        if (row.handleDelete == '') {}
+        this.$confirm(`采购计划删除后不可恢复，是否确定删除？`, {
+            cancelButtonText: '取消',
+            confirmButtonText: '确定',
+            type: 'warning',
+          })
           .then(() => {
-            procurementEditOther({
-              flag: 0,
-              showFlag: num,
-              id: row.id,
-            })
+            procurementDel({
+                id: row.id
+              })
               .toPromise()
               .then((response) => {
                 this.$notify.success({
                   title: '成功',
-                  message: '隐藏成功',
+                  message: '删除成功',
                 })
                 this.getList()
               })
@@ -466,70 +307,146 @@ export default {
           .catch(() => {
             return false
           })
-      } else if (row.showFlag == 0) {
-        status = '展示中'
-        num = 1
-        this.$confirm(`确定展示交易信息？`, {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
+      },
+      //返回
+      revert() {
+        this.$router.push({
+          path: 'warehouseManagementList'
         })
-          .then(() => {
-            procurementEditOther({
-              flag: 0,
-              showFlag: num,
-              id: row.id,
+      },
+      dateFormat(fmt, date) {
+        let ret
+        const opt = {
+          'Y+': date.getFullYear().toString(), // 年
+          'm+': (date.getMonth() + 1).toString(), // 月
+          'd+': date.getDate().toString(), // 日
+          'H+': date.getHours().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.accessoryTFs = false
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+      editClick(row) {
+        var status = ''
+        var num = 1
+        if (row.showFlag == 1) {
+          status = '已隐藏'
+          num = 0
+          this.$confirm(`隐藏后交易信息不再展示给客户，是否确定隐藏？`, {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning',
             })
-              .toPromise()
-              .then((response) => {
-                this.$notify.success({
-                  title: '成功',
-                  message: '操作成功',
+            .then(() => {
+              procurementEditOther({
+                  flag: 0,
+                  showFlag: num,
+                  id: row.id,
                 })
-                this.getList()
-              })
-              .catch((response) => {
-                // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-              })
-          })
-          .catch(() => {
-            return false
-          })
-      }
-      //cancelButtonClass: "btn-custom-cancel"
-    },
-    selecttaskType(e) {
-      for (var i = 0; i < this.taskTypeList.length; i++) {
-        if (this.taskTypeList[i].value == e) {
-          this.searchType = this.taskTypeList[i].type
+                .toPromise()
+                .then((response) => {
+                  this.$notify.success({
+                    title: '成功',
+                    message: '隐藏成功',
+                  })
+                  this.getList()
+                })
+                .catch((response) => {
+                  // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+                })
+            })
+            .catch(() => {
+              return false
+            })
+        } else if (row.showFlag == 0) {
+          status = '展示中'
+          num = 1
+          this.$confirm(`确定展示交易信息？`, {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning',
+            })
+            .then(() => {
+              procurementEditOther({
+                  flag: 0,
+                  showFlag: num,
+                  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
+            })
         }
-      }
-    },
-    handleExamine(row) {
-      this.$router.push({
-        name: 'salesContractExamine',
-        query: { id: row.id },
-      })
-    },
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    handleCloe() {
-      this.dialogViewSpareMoney = false
-    },
-    history(row) {
-      billoperatehis({ id: row.id })
-        .toPromise()
-        .then((response) => {
-          this.historyList = response
+        //cancelButtonClass: "btn-custom-cancel"
+      },
+      selecttaskType(e) {
+        for (var i = 0; i < this.taskTypeList.length; i++) {
+          if (this.taskTypeList[i].value == e) {
+            this.searchType = this.taskTypeList[i].type
+          }
+        }
+      },
+      handleExamine(row) {
+        this.$router.push({
+          name: 'salesContractExamine',
+          query: {
+            id: row.id
+          },
         })
-    },
-    //查找
-    find() {
-      // this.searchKeyWord = 1
-      this.getList()
-    },
-    async exportlist() {
-      const { data } = await export1(
-        {
+      },
+      // 关闭 dialog时 处理文件url 初始化upload组件
+      handleCloe() {
+        this.dialogViewSpareMoney = false
+      },
+      history(row) {
+        billoperatehis({
+            id: row.id
+          })
+          .toPromise()
+          .then((response) => {
+            this.historyList = response
+          })
+      },
+      //查找
+      find() {
+        // this.searchKeyWord = 1
+        this.getList()
+      },
+      async exportlist() {
+        const {
+          data
+        } = await export1({
           compId: localStorage.getItem('ws-pf_compId'),
           contractType: this.contractType,
           currentPage: this.currentPage,
@@ -538,301 +455,341 @@ export default {
           searchKeyWord: this.searchKeyWord,
           startDate: this.startDate,
           endDate: this.endDate,
-        },
-        {},
-        { responseType: 'blob' }
-      ).toPromise()
-      downloadFile({
-        res: data,
-        fileName: `${
+        }, {}, {
+          responseType: 'blob'
+        }).toPromise()
+        downloadFile({
+          res: data,
+          fileName: `${
           this.date.year + (this.date.month ? `-${this.date.month}` : '')
         }_采购合同`,
-        type: 'xls',
-      })
-    },
-    varietyClick(row) {
-      console.log('jin')
-      if (row.procurementPlanType == '期货') {
-        this.$confirm(`确定要修改基差？`, {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
+          type: 'xls',
         })
-          .then(() => {
-            procurementEditOther({
-              flag: 1,
-              // basisPrice: '-'+Math.abs(row.basisPrice),
-              basisPrice: row.basisPrice,
-              id: row.id,
+      },
+      varietyClick(row) {
+        console.log('jin')
+        if (row.procurementPlanType == '期货') {
+          this.$confirm(`确定要修改基差？`, {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning',
             })
-              .toPromise()
-              .then((response) => {
-                this.$notify.success({
-                  title: '成功',
-                  message: '基差修改成功',
+            .then(() => {
+              procurementEditOther({
+                  flag: 1,
+                  // basisPrice: '-'+Math.abs(row.basisPrice),
+                  basisPrice: row.basisPrice,
+                  id: row.id,
+                })
+                .toPromise()
+                .then((response) => {
+                  this.$notify.success({
+                    title: '成功',
+                    message: '基差修改成功',
+                  })
+                  this.getList()
+                })
+                .catch((response) => {
+                  // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
                 })
-                this.getList()
-              })
-              .catch((response) => {
-                // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-              })
-          })
-          .catch(() => {
-            return false
-          })
-      } else if (row.procurementPlanType == '现货') {
-        this.$confirm(`确定要修改单价？`, {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-        })
-          .then(() => {
-            procurementEditOther({
-              flag: 2,
-              procurementPrice: row.procurementPrice,
-              id: row.id,
             })
-              .toPromise()
-              .then((response) => {
-                this.$notify.success({
-                  title: '成功',
-                  message: '单价修改成功',
+            .catch(() => {
+              return false
+            })
+        } else if (row.procurementPlanType == '现货') {
+          this.$confirm(`确定要修改单价？`, {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning',
+            })
+            .then(() => {
+              procurementEditOther({
+                  flag: 2,
+                  procurementPrice: row.procurementPrice,
+                  id: row.id,
                 })
-                this.getList()
-              })
-              .catch((response) => {
-                // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-              })
-          })
-          .catch(() => {
-            return false
-          })
-      }
+                .toPromise()
+                .then((response) => {
+                  this.$notify.success({
+                    title: '成功',
+                    message: '单价修改成功',
+                  })
+                  this.getList()
+                })
+                .catch((response) => {
+                  // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+                })
+            })
+            .catch(() => {
+              return false
+            })
+        }
+      },
     },
-  },
-}
+  }
 </script>
 <style lang="scss" scoped>
-.connert {
-  width: 90%;
-  margin: 0 auto;
-}
-.vertical-text-left {
-  width: 62px;
-  text-align: right;
-}
-//分页
-.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;
-}
-.el-button--primary {
-  background-color: #5878e8;
-  border-color: #5878e8;
-}
-.el-button--default {
-  color: #8890b1;
-  border-color: #e8eaf1;
-}
-/deep/.base_header_layout .grid-content.right .find.el-button--primary {
-  width: 30px;
-  margin-left: 0;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-}
-/deep/.findValue .el-input__inner {
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-  width: 385px;
-}
-.completed.el-button--default {
-  border-color: #5878e8;
-  background-color: #f6f7fc;
-  color: #5878e8;
-}
-.putstorage.el-button--default,
-.deliverystorage.el-button--default {
-  border-color: #8890b1;
-  background-color: #fff;
-  color: #8890b1;
-}
-/deep/.el-table td,
-/deep/.el-table th.is-leaf {
-  border-right: 1px solid #e9ecf7;
-  text-align: center;
-}
-/deep/.el-table tr td:first-child,
-/deep/.el-table tr th.is-leaf:first-child {
-  border-left: 1px solid #e9ecf7;
-}
-.record,
-.adjustment {
-  display: inline-block;
-  color: #5878e8;
-  padding: 0 4px !important;
-  position: relative;
-}
-.record:after {
-  position: absolute;
-  content: '';
-  display: block;
-  top: 5px;
-  right: -2px;
-  width: 1px;
-  height: 12px;
-  background: #e9ecf7;
-}
-.base_header_layout .grid-content {
-  margin-top: 80px;
-}
-.el-input--small .el-input__inner {
-  margin-left: 20px;
-}
-.el-range-editor--small.el-input__inner {
-  height: 32px;
-  margin-left: -20%;
-}
-//执行样式
-.executory,
-.inExecution,
-.done {
-  width: 6px;
-  height: 6px;
-  display: inline-block;
-  border-radius: 50%;
-  position: relative;
-  top: -1px;
-  font-size: 14px;
-}
-.executory {
-  background: #ff9f24;
-  margin-right: 3px;
-}
-.inExecution {
-  background: #5878e8;
-  margin-right: 3px;
-}
-.done {
-  background: #50cad4;
-  margin-right: 3px;
-}
-.record,
-.adjustment {
-  display: inline-block;
-  color: #5878e8;
-  padding: 0 4px !important;
-  position: relative;
-  font-size: 14px;
-}
-.container {
-  overflow: scroll;
-  height: 93vh;
-}
-.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;
+  .connert {
+    width: 90%;
+    margin: 0 auto;
+  }
+
+  .vertical-text-left {
+    width: 62px;
+    text-align: right;
+  }
+
+  //分页
+  .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;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+  }
+
+  .el-button--default {
+    color: #8890b1;
+    border-color: #e8eaf1;
+  }
+
+  /deep/.base_header_layout .grid-content.right .find.el-button--primary {
+    width: 30px;
+    margin-left: 0;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+
+  /deep/.findValue .el-input__inner {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+    width: 385px;
+  }
+
+  .completed.el-button--default {
+    border-color: #5878e8;
+    background-color: #f6f7fc;
+    color: #5878e8;
+  }
+
+  .putstorage.el-button--default,
+  .deliverystorage.el-button--default {
+    border-color: #8890b1;
+    background-color: #fff;
+    color: #8890b1;
+  }
+
+  /deep/.el-table td,
+  /deep/.el-table th.is-leaf {
+    border-right: 1px solid #e9ecf7;
+    text-align: center;
+  }
+
+  /deep/.el-table tr td:first-child,
+  /deep/.el-table tr th.is-leaf:first-child {
+    border-left: 1px solid #e9ecf7;
+  }
+
+  .record,
+  .adjustment {
+    display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+  }
+
+  .record:after {
+    position: absolute;
+    content: '';
+    display: block;
+    top: 5px;
+    right: -2px;
+    width: 1px;
+    height: 12px;
+    background: #e9ecf7;
+  }
+
+  .base_header_layout .grid-content {
+    margin-top: 80px;
+  }
+
+  .el-input--small .el-input__inner {
+    margin-left: 20px;
+  }
+
+  .el-range-editor--small.el-input__inner {
+    height: 32px;
+    margin-left: -20%;
+  }
+
+  //执行样式
+  .executory,
+  .inExecution,
+  .done {
+    width: 6px;
+    height: 6px;
+    display: inline-block;
+    border-radius: 50%;
+    position: relative;
+    top: -1px;
+    font-size: 14px;
+  }
+
+  .executory {
+    background: #ff9f24;
+    margin-right: 3px;
+  }
+
+  .inExecution {
+    background: #5878e8;
+    margin-right: 3px;
+  }
+
+  .done {
+    background: #50cad4;
+    margin-right: 3px;
+  }
+
+  .record,
+  .adjustment {
+    display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+    font-size: 14px;
+  }
+
+  .container {
+    overflow: scroll;
+    height: 93vh;
+  }
+
+  .button-container {
     display: flex;
     flex-wrap: nowrap;
-    flex-direction: row;
-    & > span {
-      line-height: 50px;
-    }
-  }
+    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;
 
-  /deep/.auditFlow-box {
-    position: unset;
-    margin-left: 10px;
-    &/deep/.auditFlow-icon {
-      width: auto;
-      padding-right: 30px;
+      &>span {
+        line-height: 50px;
+      }
     }
-    &/deep/.auditFlow-main {
-      position: absolute;
+
+    /deep/.auditFlow-box {
+      position: unset;
+      margin-left: 10px;
+
+      &/deep/.auditFlow-icon {
+        width: auto;
+        padding-right: 30px;
+      }
+
+      &/deep/.auditFlow-main {
+        position: absolute;
+      }
     }
   }
-}
-.bg-left {
-  padding-left: 30px;
-}
-.title {
-  position: relative;
-}
-.title::before {
-  content: '';
-  display: inline-block;
-  width: 5px;
-  height: 30px;
-  background: #5473e8;
-  position: absolute;
-  left: 0;
-}
-.el-button--primary {
-  background-color: #5878e8;
-  border-color: #5878e8;
-  margin-top: 20px;
-}
-//导航条样式
-.el-col-12 {
-  width: 50%;
-  height: 60px;
-  background: #f6f7fc;
-  border-radius: 4px 4px 1px 1px;
-}
-.el-input--small .el-input__inner {
-  height: 32px;
-  line-height: 32px;
-  width: 385px;
-  margin-top: 10px;
-}
-.bg-bottom {
-  margin-left: 85%;
-}
-.but {
-  margin-left: 30%;
-  overflow: auto;
-  margin-left: -10px;
-}
-.el-input--small {
-  font-size: 13px;
-  width: 390px;
-}
-/deep/.el-table .el-table__header .cell,
-.el-table .el-table__body .cell {
-  text-align: center;
-}
-.inputChenge {
-  width: 50%;
-  display: inline-flex;
-}
-.inputs {
-  margin: 0 auto;
-}
-
-.base_header_layout .grid-content.right .find.el-button--primary {
-  width: 30px;
-  margin-left: 0;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-  margin-top: -1px;
-  margin-left: -6px;
-}
-// .inputChenge>>>.el-input__inner{
-// border: none;
-</style>
+
+  .bg-left {
+    padding-left: 30px;
+  }
+
+  .title {
+    position: relative;
+  }
+
+  .title::before {
+    content: '';
+    display: inline-block;
+    width: 5px;
+    height: 30px;
+    background: #5473e8;
+    position: absolute;
+    left: 0;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+    margin-top: 20px;
+  }
+
+  //导航条样式
+  .el-col-12 {
+    width: 50%;
+    height: 60px;
+    background: #f6f7fc;
+    border-radius: 4px 4px 1px 1px;
+  }
+
+  .el-input--small .el-input__inner {
+    height: 32px;
+    line-height: 32px;
+    width: 385px;
+    margin-top: 10px;
+  }
+
+  .bg-bottom {
+    margin-left: 85%;
+  }
+
+  .but {
+    margin-left: 30%;
+    overflow: auto;
+    margin-left: -10px;
+  }
+
+  .el-input--small {
+    font-size: 13px;
+    width: 390px;
+  }
+
+  /deep/.el-table .el-table__header .cell,
+  .el-table .el-table__body .cell {
+    text-align: center;
+  }
+
+  .inputChenge {
+    width: 50%;
+    display: inline-flex;
+  }
+
+  .inputs {
+    margin: 0 auto;
+  }
+
+  .base_header_layout .grid-content.right .find.el-button--primary {
+    width: 30px;
+    margin-left: 0;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+    margin-top: -1px;
+    margin-left: -6px;
+  }
+
+  // .inputChenge>>>.el-input__inner{
+  // border: none;
+</style>

src/views/salesManagement/salesPlanList.vue

@@ -1,89 +1,44 @@
 //销售计划
 <template>
-  <div class="container">
+  <div class="">
     <BaseHeaderLayout :leftSpan="10">
-      <template slot="left">  <ws-button type="primary" v-hasPermission="
+      <template slot="left">
+        <ws-button type="primary" v-hasPermission="
             `sale.salePlan.add`
-          " @click="handleAdd()">添加</ws-button> </template>
+          " @click="handleAdd()">添加</ws-button>
+      </template>
       <!-- 接单开始 -->
       <template slot="right">
-        <ws-input
-          v-model="searchKeyWord"
-          placeholder="可按采购计划编号、标题和货名查找"
-          clearable
-          maxlength="500"
-          type="input"
-          class="findValue"
-        ></ws-input>
-        <ws-button class="find" type="primary" @click="find()"
-          ><img
-            width="16"
-            height="16"
-            style="
+        <ws-input v-model="searchKeyWord" placeholder="可按采购计划编号、标题和货名查找" clearable maxlength="500" type="input"
+          class="findValue"></ws-input>
+        <ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
               vertical-align: text-top;
               position: relative;
               top: 0px;
               left: -8px;
-            "
-            src="../../../public/img/sousuo.png"
-            alt=""
-        /></ws-button>
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button>
       </template>
     </BaseHeaderLayout>
-    <el-table
-      class="wenzi"
-      :data="warehouseList.records"
-      style="width: 100%; margin-top: 20px"
-      height="780"
-    >
+    <el-table class="wenzi" :data="warehouseList.records" style="width: 100%; margin-top: 20px" height="calc(100% - 110px)">
       <el-table-column type="index" label="序号" width="80"></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="salePlanNo"
-        label="销售计划编号"
-      ></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="title"
-        label="标题"
-      ></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="goodsName"
-        label="货名"
-      ></el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="plannedSaleVolume"
-        label="重量(吨)"
-      ></el-table-column>
+      <el-table-column class="table_td" prop="salePlanNo" label="销售计划编号"></el-table-column>
+      <el-table-column class="table_td" prop="title" label="标题"></el-table-column>
+      <el-table-column class="table_td" prop="goodsName" label="货名"></el-table-column>
+      <el-table-column class="table_td" prop="plannedSaleVolume" label="重量(吨)"></el-table-column>
       <el-table-column class="table_td" prop="basisPrice" label="基差(元/吨)">
         <template slot-scope="scope">
           <div v-if="scope.row.salePlanType == '期货'">
             <div class="inputChenge">
-              <el-input
-                v-model="scope.row.basisPrice"
-                v-if="scope.row.identification == 'true'"
-              ></el-input>
+              <el-input v-model="scope.row.basisPrice" v-if="scope.row.identification == 'true'"></el-input>
               <div v-if="scope.row.identification == 'false'" class="inputs">
                 {{ '+'+scope.row.basisPrice }}
               </div>
             </div>
-            <img
-              width="17"
-              height="18"
-              style="vertical-align: text-top; position: relative; top: -1px"
-              src="../../../public/img/edit.png"
-              @click="whether(scope.row)"
-              alt=""
-              v-if="scope.row.identification == 'false'"
-            />
-            <i
-              class="el-icon-check"
-              style="line-height: 29px; margin-left: 10px"
-              v-if="scope.row.identification == 'true'"
-              @click="varietyClick(scope.row)"
-            ></i>
+            <img width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
+              src="../../../public/img/edit.png" @click="whether(scope.row)" alt=""
+              v-if="scope.row.identification == 'false'" />
+            <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
+              v-if="scope.row.identification == 'true'" @click="varietyClick(scope.row)"></i>
           </div>
           <div v-else>—</div>
         </template>
@@ -93,73 +48,41 @@
           <div v-if="scope.row.salePlanType == '现货'">
             <div class="inputChenge">
               <!-- readonly -->
-              <el-input
-                v-model="scope.row.salePrice"
-                v-if="scope.row.identification == 'true'"
-              ></el-input>
+              <el-input v-model="scope.row.salePrice" v-if="scope.row.identification == 'true'"></el-input>
               <div v-if="scope.row.identification == 'false'" class="inputs">
                 {{ scope.row.salePrice }}
               </div>
             </div>
-            <img
-              width="17"
-              height="18"
-              style="vertical-align: text-top; position: relative; top: -1px"
-              src="../../../public/img/edit.png"
-              @click="whether(scope.row)"
-              v-if="scope.row.identification == 'false'"
-              alt=""
-            />
-            <i
-              class="el-icon-check"
-              style="line-height: 29px; margin-left: 10px"
-              v-if="scope.row.identification == 'true'"
-              @click="varietyClick(scope.row)"
-            ></i>
+            <img width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
+              src="../../../public/img/edit.png" @click="whether(scope.row)" v-if="scope.row.identification == 'false'"
+              alt="" />
+            <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
+              v-if="scope.row.identification == 'true'" @click="varietyClick(scope.row)"></i>
           </div>
           <div v-else>—</div>
         </template>
       </el-table-column>
-      <el-table-column
-        class="table_td"
-        prop="sendWarehouse"
-        label="出货库"
-      ></el-table-column>
+      <el-table-column class="table_td" prop="sendWarehouse" 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)"
-          >
+          <el-popover placement="left" :width="285" trigger="click" visible-arrow="false" @show="history(scope.row)">
             <template>
               <span slot="reference">
                 <span v-if="scope.row.showFlag == 1">
-                  展示中</span
-                >
+                  展示中</span>
                 <span v-if="scope.row.showFlag == 0">
-                  已隐藏</span
-                >
+                  已隐藏</span>
               </span>
             </template>
             <div>
               <!-- <p style="margin-top: 0; padding-left: 10px">历史记录</p> -->
-              <div
-                v-for="(item, index) in historyList"
-                class="flex"
-                :key="index"
-              >
+              <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 v-if="index != historyList.length - 1" class="vertical-line"></div>
                 </div>
                 <div class="vertical-text">
                   {{ item.operateUser }}
@@ -169,27 +92,17 @@
               </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=""
-          />
+          <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="updateDate"
-      ></el-table-column>
+      <el-table-column class="table_td" label="更新时间" prop="updateDate"></el-table-column>
       <el-table-column prop="seller" label="操作" width="300">
         <template slot-scope="scope">
-          <div class="record"  v-hasPermission="
+          <div class="record" v-hasPermission="
             `sale.salePlan.view`
           " @click="handleLook(scope.row)">查看</div>
-          <div class="record"  v-hasPermission="
+          <div class="record" v-hasPermission="
             `sale.salePlan.edit`
           " @click="handleEdit(scope.row)">编辑</div>
           <div class="record" v-hasPermission="
@@ -199,262 +112,190 @@
       </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 @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>
-import {
-  salePlan,
-  saleDel,
-  saleEditOther,
-} from '@/model/salesManagement/index'
-import { downloadFile } from '@/utils/batchDown'
-import Pagination from '@/components/Pagination'
-import WsUpload from '@/components/WsUpload'
-import { dayjs, fmoney, EventBus } from 'base-core-lib'
-export default {
-  name: 'viewSpareMoney',
-  components: {
-    WsUpload,
-    Pagination,
-  },
-  watch: {
-    vesselId(val) {
-      this.getList()
+  import {
+    salePlan,
+    saleDel,
+    saleEditOther,
+  } from '@/model/salesManagement/index'
+  import {
+    downloadFile
+  } from '@/utils/batchDown'
+  import Pagination from '@/components/Pagination'
+  import WsUpload from '@/components/WsUpload'
+  import {
+    dayjs,
+    fmoney,
+    EventBus
+  } from 'base-core-lib'
+  export default {
+    name: 'viewSpareMoney',
+    components: {
+      WsUpload,
+      Pagination,
     },
-    isShow(val) {
-      this.showType = val
-    },
-  },
-  data() {
-    return {
-      //弹出框
-      dialogViewSpareMoney: false,
-      dialogApproveFormVisible: false,
-      // 船舶类型
-      monetaryKey: null,
-      // 表格显示数据
-      tableDate: [],
-
-      // 是否显示
-      showType: true,
-      // 年
-      year: '',
-      pickerOptions: {},
-      value2: '',
-      deptBudgetTotal: 0,
-      currentPage: 1,
-      pageSize: 10,
-      searchType: 1,
-      searchTypeText: '未完成',
-      searchKeyWord: '',
-      contractType: 1,
-      pcFlag: 1,
-      // 提交类型
-      submitType: true,
-      size: 10,
-      spanArr: [],
-      contractNo: '',
-      // inOutTaskNo: '',
-      compId: localStorage.getItem('ws-pf_compId'),
-      deptCircularPage: {},
-      warehouseList: [],
-      deptBudgetList: {},
-      pcFlag: 1,
-      historyList: [],
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          return time.getTime() > Date.now()
-        },
+    watch: {
+      vesselId(val) {
+        this.getList()
       },
-      accessoryTFs: false,
-      inputs: 'inputs1',
-    }
-  },
-  activated() {
-    this.getList()
-    this.showType = this.isShow
-  },
-  methods: {
-    getList() {
-      salePlan({
+      isShow(val) {
+        this.showType = val
+      },
+    },
+    data() {
+      return {
+        //弹出框
+        dialogViewSpareMoney: false,
+        dialogApproveFormVisible: false,
+        // 船舶类型
+        monetaryKey: null,
+        // 表格显示数据
+        tableDate: [],
+
+        // 是否显示
+        showType: true,
+        // 年
+        year: '',
+        pickerOptions: {},
+        value2: '',
+        deptBudgetTotal: 0,
+        currentPage: 1,
+        pageSize: 10,
+        searchType: 1,
+        searchTypeText: '未完成',
+        searchKeyWord: '',
+        contractType: 1,
+        pcFlag: 1,
+        // 提交类型
+        submitType: true,
+        size: 10,
+        spanArr: [],
+        contractNo: '',
+        // inOutTaskNo: '',
         compId: localStorage.getItem('ws-pf_compId'),
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        contractType: this.contractType,
-        tranTypeKey: this.tranTypeKey,
-        contractNo: this.contractNo,
-        pcFlag: this.pcFlag,
-        searchKeyWord:this.searchKeyWord
-      })
-        .toPromise()
-        .then((response) => {
-          for (var i = 0; i < response.records.length; i++) {
-            response.records[i].identification = 'false'
-          }
-          this.warehouseList = response
-          this.deptCircularPage.currentPage = response.current
-          this.deptCircularPage.pageSize = response.size
-          this.deptBudgetTotal = response.total
-        })
+        deptCircularPage: {},
+        warehouseList: [],
+        deptBudgetList: {},
+        pcFlag: 1,
+        historyList: [],
+        pickerBeginDateBefore: {
+          disabledDate: (time) => {
+            return time.getTime() > Date.now()
+          },
+        },
+        accessoryTFs: false,
+        inputs: 'inputs1',
+      }
     },
-    statusquery(state) {
-      this.searchType = state
+    activated() {
       this.getList()
+      this.showType = this.isShow
     },
-    //编辑
-    handleEdit(row) {
-      this.$router.push({
-        name: 'salesPlanEdit',
-        query: { id: row.id },
-      })
-    },
-    getSpanArr(data) {
-      let that = this
+    methods: {
+      getList() {
+        salePlan({
+            compId: localStorage.getItem('ws-pf_compId'),
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            contractType: this.contractType,
+            tranTypeKey: this.tranTypeKey,
+            contractNo: this.contractNo,
+            pcFlag: this.pcFlag,
+            searchKeyWord: this.searchKeyWord
+          })
+          .toPromise()
+          .then((response) => {
+            for (var i = 0; i < response.records.length; i++) {
+              response.records[i].identification = 'false'
+            }
+            this.warehouseList = response
+            this.deptCircularPage.currentPage = response.current
+            this.deptCircularPage.pageSize = response.size
+            this.deptBudgetTotal = response.total
+          })
+      },
+      statusquery(state) {
+        this.searchType = state
+        this.getList()
+      },
+      //编辑
+      handleEdit(row) {
+        this.$router.push({
+          name: 'salesPlanEdit',
+          query: {
+            id: row.id
+          },
+        })
+      },
+      getSpanArr(data) {
+        let that = this
 
-      //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
+        //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
 
-      that.spanArr = []
+        that.spanArr = []
 
-      that.pos = 0
+        that.pos = 0
 
-      // //遍历数据
+        // //遍历数据
 
-      data.forEach((item, index) => {
-        //判断是否是第一项
+        data.forEach((item, index) => {
+          //判断是否是第一项
 
-        if (index === 0) {
-          this.spanArr.push(1)
-          this.pos = 0
-        } else {
-          //不是第一项时，就根据标识去存储
-          if (data[index].warehouseNumViewList.length > 1) {
-            查找到符合条件的数据时每次要把之前存储的数据 + 1
-            this.spanArr[this.pos] = data[index].warehouseNumViewList.length
-            this.spanArr.push(0)
-          } else {
-            // 没有符合的数据时，要记住当前的index
+          if (index === 0) {
             this.spanArr.push(1)
-            this.pos = index
+            this.pos = 0
+          } else {
+            //不是第一项时，就根据标识去存储
+            if (data[index].warehouseNumViewList.length > 1) {
+              查找到符合条件的数据时每次要把之前存储的数据 + 1
+              this.spanArr[this.pos] = data[index].warehouseNumViewList.length
+              this.spanArr.push(0)
+            } else {
+              // 没有符合的数据时，要记住当前的index
+              this.spanArr.push(1)
+              this.pos = index
+            }
           }
-        }
-      })
-    },
-    //添加
-    handleAdd() {
-      this.$router.push({
-        name: 'salesPlanAdd',
-      })
-    },
-    //查看
-    handleLook(row) {
-      this.$router.push({
-        name: 'salesPlanLook',
-        query: {
-          id: row.id,
-        },
-      })
-    },
-    handleDelete(row) {
-      var handleDelete = ' '
-      if (row.handleDelete == '') {
-      }
-      this.$confirm(`销售计划删除后不可恢复，是否确定删除？`, {
-        cancelButtonText: '取消',
-        confirmButtonText: '确定',
-        type: 'warning',
-      })
-        .then(() => {
-          saleDel({ 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
+      },
+      //添加
+      handleAdd() {
+        this.$router.push({
+          name: 'salesPlanAdd',
         })
-    },
-    //返回
-    revert() {
-      this.$router.push({ path: 'warehouseManagementList' })
-    },
-    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.accessoryTFs = false
-    },
-    whether(row) {
-      row.identification = 'true'
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getList()
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val
-      console.log(`当前页: ${val}`)
-      this.getList()
-    },
-    editClick(row) {
-      var status = ''
-      var num = 1
-      if (row.showFlag == 1) {
-        status = '已隐藏'
-        num = 0
-        this.$confirm(`隐藏后交易信息不再展示给客户，是否确定隐藏？`, {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
+      },
+      //查看
+      handleLook(row) {
+        this.$router.push({
+          name: 'salesPlanLook',
+          query: {
+            id: row.id,
+          },
         })
+      },
+      handleDelete(row) {
+        var handleDelete = ' '
+        if (row.handleDelete == '') {}
+        this.$confirm(`销售计划删除后不可恢复，是否确定删除？`, {
+            cancelButtonText: '取消',
+            confirmButtonText: '确定',
+            type: 'warning',
+          })
           .then(() => {
-            saleEditOther({
-              flag: 0,
-              showFlag: num,
-              id: row.id,
-            })
+            saleDel({
+                id: row.id
+              })
               .toPromise()
               .then((response) => {
                 this.$notify.success({
                   title: '成功',
-                  message: '隐藏成功',
+                  message: '删除成功',
                 })
                 this.getList()
               })
@@ -465,67 +306,148 @@ export default {
           .catch(() => {
             return false
           })
-      } else if (row.showFlag == 0) {
-        status = '展示中'
-        num = 1
-        this.$confirm(`确定展示交易信息？`, {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
+      },
+      //返回
+      revert() {
+        this.$router.push({
+          path: 'warehouseManagementList'
         })
-          .then(() => {
-            saleEditOther({
-              flag: 0,
-              showFlag: num,
-              id: row.id,
+      },
+      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.accessoryTFs = false
+      },
+      whether(row) {
+        row.identification = 'true'
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+      editClick(row) {
+        var status = ''
+        var num = 1
+        if (row.showFlag == 1) {
+          status = '已隐藏'
+          num = 0
+          this.$confirm(`隐藏后交易信息不再展示给客户，是否确定隐藏？`, {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning',
             })
-              .toPromise()
-              .then((response) => {
-                this.$notify.success({
-                  title: '成功',
-                  message: '操作成功',
+            .then(() => {
+              saleEditOther({
+                  flag: 0,
+                  showFlag: num,
+                  id: row.id,
                 })
-                this.getList()
-              })
-              .catch((response) => {
-              })
-          })
-          .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
+                .toPromise()
+                .then((response) => {
+                  this.$notify.success({
+                    title: '成功',
+                    message: '隐藏成功',
+                  })
+                  this.getList()
+                })
+                .catch((response) => {
+                  // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+                })
+            })
+            .catch(() => {
+              return false
+            })
+        } else if (row.showFlag == 0) {
+          status = '展示中'
+          num = 1
+          this.$confirm(`确定展示交易信息？`, {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning',
+            })
+            .then(() => {
+              saleEditOther({
+                  flag: 0,
+                  showFlag: num,
+                  id: row.id,
+                })
+                .toPromise()
+                .then((response) => {
+                  this.$notify.success({
+                    title: '成功',
+                    message: '操作成功',
+                  })
+                  this.getList()
+                })
+                .catch((response) => {})
+            })
+            .catch(() => {
+              return false
+            })
         }
-      }
-    },
-    handleExamine(row) {
-      this.$router.push({
-        name: 'salesContractExamine',
-        query: { id: row.id },
-      })
-    },
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    handleCloe() {
-      this.dialogViewSpareMoney = false
-    },
-    history(row) {
-      billoperatehis({ id: row.id })
-        .toPromise()
-        .then((response) => {
-          this.historyList = response
+      },
+      selecttaskType(e) {
+        for (var i = 0; i < this.taskTypeList.length; i++) {
+          if (this.taskTypeList[i].value == e) {
+            this.searchType = this.taskTypeList[i].type
+          }
+        }
+      },
+      handleExamine(row) {
+        this.$router.push({
+          name: 'salesContractExamine',
+          query: {
+            id: row.id
+          },
         })
-    },
-    //查找
-    find() {
-      this.getList()
-    },
-    async exportlist() {
-      const { data } = await export1(
-        {
+      },
+      // 关闭 dialog时 处理文件url 初始化upload组件
+      handleCloe() {
+        this.dialogViewSpareMoney = false
+      },
+      history(row) {
+        billoperatehis({
+            id: row.id
+          })
+          .toPromise()
+          .then((response) => {
+            this.historyList = response
+          })
+      },
+      //查找
+      find() {
+        this.getList()
+      },
+      async exportlist() {
+        const {
+          data
+        } = await export1({
           compId: localStorage.getItem('ws-pf_compId'),
           contractType: this.contractType,
           currentPage: this.currentPage,
@@ -534,342 +456,382 @@ export default {
           searchKeyWord: this.searchKeyWord,
           startDate: this.startDate,
           endDate: this.endDate,
-        },
-        {},
-        { responseType: 'blob' }
-      ).toPromise()
-      downloadFile({
-        res: data,
-        fileName: `${
+        }, {}, {
+          responseType: 'blob'
+        }).toPromise()
+        downloadFile({
+          res: data,
+          fileName: `${
           this.date.year + (this.date.month ? `-${this.date.month}` : '')
         }_销售合同`,
-        type: 'xls',
-      })
-    },
-    varietyClick(row) {
-      if(row.salePlanType == '期货'){
-        if (
-        row.basisPrice > 10000 ||
-        row.basisPrice < 1 ||
-        (String(row.basisPrice).indexOf(
-          '.'
-        ) != -1 &&
-          String(row.basisPrice).length -
-            (String(row.basisPrice).indexOf(
-              '.'
-            ) +
-              1) >
-            2)
-      ) {
-        this.$message({
-          message: '基差输入错误',
-          type: 'warning',
+          type: 'xls',
         })
-        return
-      }
-      }
-      if(row.salePlanType == '现货'){
-        if (
-        row.salePrice > 100000 ||
-        row.salePrice < 1 ||
-        (String(row.salePrice).indexOf(
-          '.'
-        ) != -1 &&
-          String(row.salePrice).length -
+      },
+      varietyClick(row) {
+        if (row.salePlanType == '期货') {
+          if (
+            row.basisPrice > 10000 ||
+            row.basisPrice < 1 ||
+            (String(row.basisPrice).indexOf(
+                '.'
+              ) != -1 &&
+              String(row.basisPrice).length -
+              (String(row.basisPrice).indexOf(
+                  '.'
+                ) +
+                1) >
+              2)
+          ) {
+            this.$message({
+              message: '基差输入错误',
+              type: 'warning',
+            })
+            return
+          }
+        }
+        if (row.salePlanType == '现货') {
+          if (
+            row.salePrice > 100000 ||
+            row.salePrice < 1 ||
             (String(row.salePrice).indexOf(
-              '.'
-            ) +
-              1) >
-            2)
-      ) {
-        this.$message({
-          message: '单价输入错误',
-          type: 'warning',
-        })
-        return
-      }
-      }
-      if (row.salePlanType == '期货') {
-        this.$confirm(`确定要修改基差？`, {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-        })
-          .then(() => {
-            saleEditOther({
-              flag: 1,
-              basisPrice: row.basisPrice,
-              id: row.id,
+                '.'
+              ) != -1 &&
+              String(row.salePrice).length -
+              (String(row.salePrice).indexOf(
+                  '.'
+                ) +
+                1) >
+              2)
+          ) {
+            this.$message({
+              message: '单价输入错误',
+              type: 'warning',
             })
-              .toPromise()
-              .then((response) => {
-                this.$notify.success({
-                  title: '成功',
-                  message: '基差修改成功',
+            return
+          }
+        }
+        if (row.salePlanType == '期货') {
+          this.$confirm(`确定要修改基差？`, {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning',
+            })
+            .then(() => {
+              saleEditOther({
+                  flag: 1,
+                  basisPrice: row.basisPrice,
+                  id: row.id,
                 })
-                this.getList()
-              })
-              .catch((response) => {
-              })
-          })
-          .catch(() => {
-            return false
-          })
-      } else if (row.salePlanType == '现货') {
-        this.$confirm(`确定要修改单价？`, {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-        })
-          .then(() => {
-            saleEditOther({
-              flag: 2,
-              salePrice: row.salePrice,
-              id: row.id,
+                .toPromise()
+                .then((response) => {
+                  this.$notify.success({
+                    title: '成功',
+                    message: '基差修改成功',
+                  })
+                  this.getList()
+                })
+                .catch((response) => {})
             })
-              .toPromise()
-              .then((response) => {
-                this.$notify.success({
-                  title: '成功',
-                  message: '单价修改成功',
+            .catch(() => {
+              return false
+            })
+        } else if (row.salePlanType == '现货') {
+          this.$confirm(`确定要修改单价？`, {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning',
+            })
+            .then(() => {
+              saleEditOther({
+                  flag: 2,
+                  salePrice: row.salePrice,
+                  id: row.id,
                 })
-                this.getList()
-              })
-              .catch((response) => {
-                // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-              })
-          })
-          .catch(() => {
-            return false
-          })
-      }
+                .toPromise()
+                .then((response) => {
+                  this.$notify.success({
+                    title: '成功',
+                    message: '单价修改成功',
+                  })
+                  this.getList()
+                })
+                .catch((response) => {
+                  // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+                })
+            })
+            .catch(() => {
+              return false
+            })
+        }
+      },
     },
-  },
-}
+  }
 </script>
 <style lang="scss" scoped>
-.connert {
-  width: 90%;
-  margin: 0 auto;
-}
-.vertical-text-left {
-  width: 62px;
-  text-align: right;
-}
-//分页
-.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;
-}
-.el-button--primary {
-  background-color: #5878e8;
-  border-color: #5878e8;
-}
-.el-button--default {
-  color: #8890b1;
-  border-color: #e8eaf1;
-}
-/deep/.base_header_layout .grid-content.right .find.el-button--primary {
-  width: 30px;
+  .connert {
+    width: 90%;
+    margin: 0 auto;
+  }
+
+  .vertical-text-left {
+    width: 62px;
+    text-align: right;
+  }
+
+  //分页
+  .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;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+  }
+
+  .el-button--default {
+    color: #8890b1;
+    border-color: #e8eaf1;
+  }
+
+  /deep/.base_header_layout .grid-content.right .find.el-button--primary {
+    width: 30px;
     margin-left: 0;
     border-top-left-radius: 0px;
     border-bottom-left-radius: 0px;
     margin-top: -1px;
     margin-left: -6px;
-}
-/deep/.findValue .el-input__inner {
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-  width: 385px;
-}
-.completed.el-button--default {
-  border-color: #5878e8;
-  background-color: #f6f7fc;
-  color: #5878e8;
-}
-.putstorage.el-button--default,
-.deliverystorage.el-button--default {
-  border-color: #8890b1;
-  background-color: #fff;
-  color: #8890b1;
-}
-/deep/.el-table td,
-/deep/.el-table th.is-leaf {
-  border-right: 1px solid #e9ecf7;
-  text-align: center;
-}
-/deep/.el-table tr td:first-child,
-/deep/.el-table tr th.is-leaf:first-child {
-  border-left: 1px solid #e9ecf7;
-}
-.record,
-.adjustment {
-  display: inline-block;
-  color: #5878e8;
-  padding: 0 4px !important;
-  position: relative;
-}
-.record:after {
-  position: absolute;
-  content: '';
-  display: block;
-  top: 5px;
-  right: -2px;
-  width: 1px;
-  height: 12px;
-  background: #e9ecf7;
-}
-.base_header_layout .grid-content {
-  margin-top: 80px;
-}
-.el-input--small .el-input__inner {
-  margin-left: 20px;
-}
-.el-range-editor--small.el-input__inner {
-  height: 32px;
-  margin-left: -20%;
-}
-//执行样式
-.executory,
-.inExecution,
-.done {
-  width: 6px;
-  height: 6px;
-  display: inline-block;
-  border-radius: 50%;
-  position: relative;
-  top: -1px;
-  font-size: 14px;
-}
-.executory {
-  background: #ff9f24;
-  margin-right: 3px;
-}
-.inExecution {
-  background: #5878e8;
-  margin-right: 3px;
-}
-.done {
-  background: #50cad4;
-  margin-right: 3px;
-}
-.record,
-.adjustment {
-  display: inline-block;
-  color: #5878e8;
-  padding: 0 4px !important;
-  position: relative;
-  font-size: 14px;
-}
-.container {
-  overflow: scroll;
-  height: 93vh;
-}
-.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;
+  }
+
+  /deep/.findValue .el-input__inner {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+    width: 385px;
+  }
+
+  .completed.el-button--default {
+    border-color: #5878e8;
+    background-color: #f6f7fc;
+    color: #5878e8;
+  }
+
+  .putstorage.el-button--default,
+  .deliverystorage.el-button--default {
+    border-color: #8890b1;
+    background-color: #fff;
+    color: #8890b1;
+  }
+
+  /deep/.el-table td,
+  /deep/.el-table th.is-leaf {
+    border-right: 1px solid #e9ecf7;
+    text-align: center;
+  }
+
+  /deep/.el-table tr td:first-child,
+  /deep/.el-table tr th.is-leaf:first-child {
+    border-left: 1px solid #e9ecf7;
+  }
+
+  .record,
+  .adjustment {
+    display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+  }
+
+  .record:after {
+    position: absolute;
+    content: '';
+    display: block;
+    top: 5px;
+    right: -2px;
+    width: 1px;
+    height: 12px;
+    background: #e9ecf7;
+  }
+
+  .base_header_layout .grid-content {
+    margin-top: 80px;
+  }
+
+  .el-input--small .el-input__inner {
+    margin-left: 20px;
+  }
+
+  .el-range-editor--small.el-input__inner {
+    height: 32px;
+    margin-left: -20%;
+  }
+
+  //执行样式
+  .executory,
+  .inExecution,
+  .done {
+    width: 6px;
+    height: 6px;
+    display: inline-block;
+    border-radius: 50%;
+    position: relative;
+    top: -1px;
+    font-size: 14px;
+  }
+
+  .executory {
+    background: #ff9f24;
+    margin-right: 3px;
+  }
+
+  .inExecution {
+    background: #5878e8;
+    margin-right: 3px;
+  }
+
+  .done {
+    background: #50cad4;
+    margin-right: 3px;
+  }
+
+  .record,
+  .adjustment {
+    display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+    font-size: 14px;
+  }
+
+  .container {
+    overflow: scroll;
+    height: 93vh;
+  }
+
+  .button-container {
     display: flex;
     flex-wrap: nowrap;
-    flex-direction: row;
-    & > span {
-      line-height: 50px;
-    }
-  }
+    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;
 
-  /deep/.auditFlow-box {
-    position: unset;
-    margin-left: 10px;
-    &/deep/.auditFlow-icon {
-      width: auto;
-      padding-right: 30px;
+      &>span {
+        line-height: 50px;
+      }
     }
-    &/deep/.auditFlow-main {
-      position: absolute;
+
+    /deep/.auditFlow-box {
+      position: unset;
+      margin-left: 10px;
+
+      &/deep/.auditFlow-icon {
+        width: auto;
+        padding-right: 30px;
+      }
+
+      &/deep/.auditFlow-main {
+        position: absolute;
+      }
     }
   }
-}
-.bg-left {
-  padding-left: 30px;
-}
-.title {
-  position: relative;
-}
-.title::before {
-  content: '';
-  display: inline-block;
-  width: 5px;
-  height: 30px;
-  background: #5473e8;
-  position: absolute;
-  left: 0;
-}
-.el-button--primary {
-  background-color: #5878e8;
-  border-color: #5878e8;
-  margin-top: 20px;
-}
-//导航条样式
-.el-col-12 {
-  width: 50%;
-  height: 60px;
-  background: #f6f7fc;
-  border-radius: 4px 4px 1px 1px;
-}
-.el-input--small .el-input__inner {
-  height: 32px;
-  line-height: 32px;
-  width: 385px;
-  margin-top: 10px;
-}
-.bg-bottom {
-  margin-left: 85%;
-}
-.but {
-  margin-left: 30%;
-  overflow: auto;
-  margin-left: -10px;
-}
-.el-input--small {
-  font-size: 13px;
-  width: 390px;
-}
-/deep/.el-table .el-table__header .cell,
-.el-table .el-table__body .cell {
-  text-align: center;
-}
-.inputChenge {
-  width: 50%;
-  display: inline-flex;
-}
-.inputs1 {
-  border: none;
-}
-.base_header_layout .grid-content.right .find.el-button--primary {
+
+  .bg-left {
+    padding-left: 30px;
+  }
+
+  .title {
+    position: relative;
+  }
+
+  .title::before {
+    content: '';
+    display: inline-block;
+    width: 5px;
+    height: 30px;
+    background: #5473e8;
+    position: absolute;
+    left: 0;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+    margin-top: 20px;
+  }
+
+  //导航条样式
+  .el-col-12 {
+    width: 50%;
+    height: 60px;
+    background: #f6f7fc;
+    border-radius: 4px 4px 1px 1px;
+  }
+
+  .el-input--small .el-input__inner {
+    height: 32px;
+    line-height: 32px;
+    width: 385px;
+    margin-top: 10px;
+  }
+
+  .bg-bottom {
+    margin-left: 85%;
+  }
+
+  .but {
+    margin-left: 30%;
+    overflow: auto;
+    margin-left: -10px;
+  }
+
+  .el-input--small {
+    font-size: 13px;
+    width: 390px;
+  }
+
+  /deep/.el-table .el-table__header .cell,
+  .el-table .el-table__body .cell {
+    text-align: center;
+  }
+
+  .inputChenge {
+    width: 50%;
+    display: inline-flex;
+  }
+
+  .inputs1 {
+    border: none;
+  }
+
+  .base_header_layout .grid-content.right .find.el-button--primary {
     width: 30px;
     margin-left: 0;
     border-top-left-radius: 0px;
     border-bottom-left-radius: 0px;
     margin-top: -1px;
     margin-left: -6px;
-}
-// .inputChenge>>>.el-input__inner{
-// border: none;
-// }
-</style>
+  }
+
+  // .inputChenge>>>.el-input__inner{
+  // border: none;
+  // }
+</style>

src/views/taskManagement/moveWarehouseTask.vue

@@ -6,63 +6,30 @@
       </template>
       <template slot="right">
         <span style="width: 70px; 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 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>
-        <ws-input
-        class='findValue'
-          v-model="searchKeyWord"
-          placeholder="可按移库任务编号、发货库和收货库查找"
-          clearable
-          maxlength="500"
-          @keyup.enter.native="lookUp()"
-          type="input"
-        ></ws-input>
-        <ws-button class="find" type="primary" @click="lookUp()"
-          ><img
-            width="16"
-            height="16"
-            style="
+        <ws-input class='findValue' v-model="searchKeyWord" placeholder="可按移库任务编号、发货库和收货库查找" clearable maxlength="500"
+          @keyup.enter.native="lookUp()" type="input"></ws-input>
+        <ws-button class="find" type="primary" @click="lookUp()"><img width="16" height="16" style="
               vertical-align: text-top;
               position: relative;
               top: 0px;
               left: -8px;
-            "
-            src="../../../public/img/sousuo.png"
-            alt=""
-        /></ws-button>
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button>
         <!-- </div> -->
       </template>
     </BaseHeaderLayout>
-    <div>
-      <el-table
-        class="wenzi"
-        :data="gainList.records"
-        style="width: 100%"
-        height="780"
-      >
+      <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="moveTaskNo" label="移库任务编号"></el-table-column>
         <el-table-column prop="warehouseName" label="发货库"> </el-table-column>
         <el-table-column prop="warehouseNameIn" label="收货库">
         </el-table-column>
@@ -74,63 +41,42 @@
           </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>
+          <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>
+          <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}}
-             </div>  
-          </template> 
+          <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)"
-            >
+            <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 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>
@@ -141,10 +87,7 @@
                   </div>
                   <div>
                     <div class="vertical-circle"></div>
-                    <div
-                      v-if="index != historyList.length - 1"
-                      class="vertical-line"
-                    ></div>
+                    <div v-if="index != historyList.length - 1" class="vertical-line"></div>
                   </div>
                   <div class="vertical-text">
                     {{ item.operateUser }}<br />{{ item.dealMsg }}
@@ -164,323 +107,350 @@
         </el-table-column>
         <el-table-column prop="establishDate" label="发布时间" width="150">
         </el-table-column>
-        <el-table-column prop="seller" label="详情" >
+        <el-table-column prop="seller" label="详情">
           <template slot-scope="scope">
-             <div
-              class="record"
-              @click="see(scope.row)"
-            >
+            <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 @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+        :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
       </el-pagination>
-    </div>
   </div>
 </template>
 <script>
-import {  moveList,movestates} from '@/model/tasksport/index'
-import Pagination from '@/components/Pagination'
-import WsUpload from '@/components/WsUpload'
-export default {
-  name: 'viewSpareMoney',
-  components: {
-    WsUpload,
-    Pagination,
-  },
-  watch: {
-    vesselId(val) {
-      this.getList()
+  import {
+    moveList,
+    movestates
+  } from '@/model/tasksport/index'
+  import Pagination from '@/components/Pagination'
+  import WsUpload from '@/components/WsUpload'
+  export default {
+    name: 'viewSpareMoney',
+    components: {
+      WsUpload,
+      Pagination,
     },
-    isShow(val) {
-      this.showType = val
-    },
-  },
-  data() {
-    return {
-      //弹出框
-      dialogViewSpareMoney: false,
-      dialogApproveFormVisible: false,
-      // 船舶类型
-      monetaryKey: null,
-      // 表格显示数据
-      tableDate: [],
-
-      // 是否显示
-      showType: true,
-      // 年
-      year: '',
-      gainList: [],
-      currentPage: 1,
-      pageSize: 10,
-      searchType: 3,
-      searchTypeText: '执行中',
-      searchKeyWord: '',
-      contractType: 2,
-      taskTypeKey: 3,
-      moveTaskNo: '',
-      size: 10,
-      spanArr: [],
-       taskTypeList: [
-        { value: '待审核', type: 1 },
-        { value: '执行中', type: 3 },
-         { value: '已驳回', type: 2 },
-        { value: '已完成', type: 4 },
-        { value: '全部任务', type: '' },
-      ],
-      deptBudgetTotal: 0,
-      compId: localStorage.getItem('ws-pf_compId'),
-      historyList: [],
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          return time.getTime() > Date.now()
-        },
+    watch: {
+      vesselId(val) {
+        this.getList()
+      },
+      isShow(val) {
+        this.showType = val
       },
-      accessoryTFs: false,
-    }
-  },
-  activated() {
-    this.getList()
-    this.showType = this.isShow
-  },
-
-  methods: {
-    //查找
-    lookUp() {
-      this.currentPage = 1
-      this.getList()
     },
-    getList() {
-      moveList({
+    data() {
+      return {
+        //弹出框
+        dialogViewSpareMoney: false,
+        dialogApproveFormVisible: false,
+        // 船舶类型
+        monetaryKey: null,
+        // 表格显示数据
+        tableDate: [],
+
+        // 是否显示
+        showType: true,
+        // 年
+        year: '',
+        gainList: [],
+        currentPage: 1,
+        pageSize: 10,
+        searchType: 3,
+        searchTypeText: '执行中',
+        searchKeyWord: '',
+        contractType: 2,
+        taskTypeKey: 3,
+        moveTaskNo: '',
+        size: 10,
+        spanArr: [],
+        taskTypeList: [{
+            value: '待审核',
+            type: 1
+          },
+          {
+            value: '执行中',
+            type: 3
+          },
+          {
+            value: '已驳回',
+            type: 2
+          },
+          {
+            value: '已完成',
+            type: 4
+          },
+          {
+            value: '全部任务',
+            type: ''
+          },
+        ],
+        deptBudgetTotal: 0,
         compId: localStorage.getItem('ws-pf_compId'),
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        taskTypeKey: this.taskTypeKey,
-        searchType : this.searchType,
-        searchKeyWord: this.searchKeyWord,
-      })
-        .toPromise()
-        .then((response) => {
-          this.gainList = response
-          this.currentPage = response.current
-          this.pageSize = response.size
-          this.deptBudgetTotal = response.total
-        })
-    },
-    handlestatus(status) {
-      this.searchType = status
-      this.getList()
-    },
-    //查看
-    see(item) {
-      this.$router.push({
-        path: 'moveWarehouseTaskLook',
-        query: {
-          moveTaskNo: item.moveTaskNo,
+        historyList: [],
+        pickerBeginDateBefore: {
+          disabledDate: (time) => {
+            return time.getTime() > Date.now()
+          },
         },
-      })
-    },
-     selecttaskType(e) {
-      for (var i = 0; i < this.taskTypeList.length; i++) {
-        if (this.taskTypeList[i].value == e) {
-          this.searchType = this.taskTypeList[i].type
-        }
+        accessoryTFs: false,
       }
+    },
+    activated() {
       this.getList()
+      this.showType = this.isShow
     },
 
-    getSpanArr(data) {
-      let that = this
-      //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
-      that.spanArr = []
-      that.pos = 0
-      //遍历数据
-      data.forEach((item, index) => {
-        //判断是否是第一项
-        // if (index === 0) {
-        //   this.spanArr.push(1)
-        //   this.pos = 0
-        // } else {
-        //不是第一项时，就根据标识去存储
-        if (data[index].warehouseNumViewList.length > 1) {
-          // 查找到符合条件的数据时每次要把之前存储的数据+1
-          this.spanArr[this.pos] = data[index].warehouseNumViewList.length
-          this.spanArr.push(0)
-        } else {
-          // 没有符合的数据时，要记住当前的index
-          this.spanArr.push(1)
-          this.pos = index
+    methods: {
+      //查找
+      lookUp() {
+        this.currentPage = 1
+        this.getList()
+      },
+      getList() {
+        moveList({
+            compId: localStorage.getItem('ws-pf_compId'),
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            taskTypeKey: this.taskTypeKey,
+            searchType: this.searchType,
+            searchKeyWord: this.searchKeyWord,
+          })
+          .toPromise()
+          .then((response) => {
+            this.gainList = response
+            this.currentPage = response.current
+            this.pageSize = response.size
+            this.deptBudgetTotal = response.total
+          })
+      },
+      handlestatus(status) {
+        this.searchType = status
+        this.getList()
+      },
+      //查看
+      see(item) {
+        this.$router.push({
+          path: 'moveWarehouseTaskLook',
+          query: {
+            moveTaskNo: item.moveTaskNo,
+          },
+        })
+      },
+      selecttaskType(e) {
+        for (var i = 0; i < this.taskTypeList.length; i++) {
+          if (this.taskTypeList[i].value == e) {
+            this.searchType = this.taskTypeList[i].type
+          }
         }
-    
-      })
-    },
-    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')
-          )
+        this.getList()
+      },
+
+      getSpanArr(data) {
+        let that = this
+        //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
+        that.spanArr = []
+        that.pos = 0
+        //遍历数据
+        data.forEach((item, index) => {
+          //判断是否是第一项
+          // if (index === 0) {
+          //   this.spanArr.push(1)
+          //   this.pos = 0
+          // } else {
+          //不是第一项时，就根据标识去存储
+          if (data[index].warehouseNumViewList.length > 1) {
+            // 查找到符合条件的数据时每次要把之前存储的数据+1
+            this.spanArr[this.pos] = data[index].warehouseNumViewList.length
+            this.spanArr.push(0)
+          } else {
+            // 没有符合的数据时，要记住当前的index
+            this.spanArr.push(1)
+            this.pos = index
+          }
+
+        })
+      },
+      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()          // 秒
+          // 有其他格式化字符需求可以继续添加，必须转化成字符串
         }
-      }
-      return fmt
-    },
-    handleClose() {
-      this.accessoryTFs = false
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getList()
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val
-      console.log(`当前页: ${val}`)
-      this.getList()
-    },
-    editClick(row) {
-      var status = ''
-      if (row.taskStatus == '待审核' || row.taskStatus == '已完成') {
-        status = '执行中'
-      } else if (row.taskStatus == '执行中') {
-        status = '已完成'
-      }
-      //cancelButtonClass: "btn-custom-cancel"
-      this.$confirm(`是否将状态改为${status}`, {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          movestates({ id: row.id })
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '状态修改成功',
+        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.accessoryTFs = false
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+      editClick(row) {
+        var status = ''
+        if (row.taskStatus == '待审核' || row.taskStatus == '已完成') {
+          status = '执行中'
+        } else if (row.taskStatus == '执行中') {
+          status = '已完成'
+        }
+        //cancelButtonClass: "btn-custom-cancel"
+        this.$confirm(`是否将状态改为${status}`, {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            movestates({
+                id: row.id
               })
-              this.getList()
-            })
-            .catch((response) => {
-              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-            })
-        })
-        .catch(() => {
-          return false
-        })
-    },
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '状态修改成功',
+                })
+                this.getList()
+              })
+              .catch((response) => {
+                // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              })
+          })
+          .catch(() => {
+            return false
+          })
+      },
 
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    handleCloe() {
-      this.dialogViewSpareMoney = false
+      // 关闭 dialog时 处理文件url 初始化upload组件
+      handleCloe() {
+        this.dialogViewSpareMoney = false
+      },
     },
-  },
-}
+  }
 </script>
 <style lang="scss" scoped>
-.vertical-text-left {
-  width: 62px;
-  text-align: right;
-}
-.el-button--primary {
-  background-color: #5878e8;
-  border-color: #5878e8;
-}
-.el-button--default {
-  color: #8890b1;
-  border-color: #e8eaf1;
-}
-/deep/.base_header_layout .grid-content.right .find.el-button--primary {
-  width: 30px;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-}
-/deep/.findValue .el-input__inner {
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
-.completed.el-button--default {
-  border-color: #5878e8;
-  background-color: #f6f7fc;
-  color: #5878e8;
-}
-.putstorage.el-button--default,
-.deliverystorage.el-button--default {
-  border-color: #8890b1;
-  background-color: #fff;
-  color: #8890b1;
-}
-/deep/.el-table td,
-/deep/.el-table th.is-leaf {
-  border-right: 1px solid #e9ecf7;
-  text-align: center;
-}
-/deep/.el-table tr td:first-child,
-/deep/.el-table tr th.is-leaf:first-child {
-  border-left: 1px solid #e9ecf7;
-}
-.record,
-.adjustment {
-  display: inline-block;
-  color: #5878e8;
-  padding: 0 4px !important;
-  position: relative;
-}
-.el-row {
-  height: 50px;
-}
-.base_header_layout .grid-content {
-  margin-top: 80px;
-}
-.el-pagination {
-  text-align: center;
-}
-.el-select{
-  width: 30%;
+  .vertical-text-left {
+    width: 62px;
+    text-align: right;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+  }
+
+  .el-button--default {
+    color: #8890b1;
+    border-color: #e8eaf1;
+  }
+
+  /deep/.base_header_layout .grid-content.right .find.el-button--primary {
+    width: 30px;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+
+  /deep/.findValue .el-input__inner {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
+
+  .completed.el-button--default {
+    border-color: #5878e8;
+    background-color: #f6f7fc;
+    color: #5878e8;
+  }
+
+  .putstorage.el-button--default,
+  .deliverystorage.el-button--default {
+    border-color: #8890b1;
+    background-color: #fff;
+    color: #8890b1;
+  }
+
+  /deep/.el-table td,
+  /deep/.el-table th.is-leaf {
+    border-right: 1px solid #e9ecf7;
+    text-align: center;
+  }
+
+  /deep/.el-table tr td:first-child,
+  /deep/.el-table tr th.is-leaf:first-child {
+    border-left: 1px solid #e9ecf7;
+  }
+
+  .record,
+  .adjustment {
+    display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+  }
+
+  .el-row {
+    height: 50px;
+  }
+
+  .base_header_layout .grid-content {
+    margin-top: 80px;
+  }
+
+  .el-pagination {
+    text-align: center;
+  }
+
+  .el-select {
+    width: 30%;
     margin-right: 10px;
-}
-//状态样式
-.executory,
-.inExecution,
-.done {
-  width: 6px;
-  height: 6px;
-  display: inline-block;
-  border-radius: 50%;
-  position: relative;
-  top: -1px;
-  font-size: 14px;
-}
-.executory {
-  background: #ff9f24;
-}
-.inExecution {
-  background: #5878e8;
-}
-.done {
-  background: #50cad4;
-}
-/deep/.typeselect .el-input__inner{
-   color: #8890B1;
-}
+  }
+
+  //状态样式
+  .executory,
+  .inExecution,
+  .done {
+    width: 6px;
+    height: 6px;
+    display: inline-block;
+    border-radius: 50%;
+    position: relative;
+    top: -1px;
+    font-size: 14px;
+  }
+
+  .executory {
+    background: #ff9f24;
+  }
+
+  .inExecution {
+    background: #5878e8;
+  }
+
+  .done {
+    background: #50cad4;
+  }
+
+  /deep/.typeselect .el-input__inner {
+    color: #8890B1;
+  }
 </style>

src/views/taskManagement/tranManagementTransporTationFire.vue

@@ -3,135 +3,74 @@
   <div>
     <BaseHeaderLayout :leftSpan="20">
       <template slot="left">
-        <ws-button
-          class="but"
-          type="primary"
-          @click="handleAdd()"
-          v-hasPermission="
+        <ws-button class="but" type="primary" @click="handleAdd()" v-hasPermission="
             `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-          "
-        >
-          执行中</ws-button
-        >
-        <ws-button
-          class="but"
-          @click="handleLook()"
-          v-hasPermission="
+          ">
+          执行中</ws-button>
+        <ws-button class="but" @click="handleLook()" v-hasPermission="
             `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-          "
-          >已完成</ws-button
-        >
-        <ws-button
-          class="but"
-          @click="handleEdit()"
-          v-hasPermission="
+          ">已完成</ws-button>
+        <ws-button class="but" @click="handleEdit()" v-hasPermission="
             `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-          "
-          >全部任务</ws-button
-        >
+          ">全部任务</ws-button>
       </template>
       <!-- 接单开始 -->
       <template slot="left">
-        <ws-date-picker
-          v-model="deptBudgetList.inOutDate"
-          type="date"
-          placeholder="请选择开始日期"
-          value-format="yyyy-MM-dd"
-        />
+        <ws-date-picker v-model="deptBudgetList.inOutDate" type="date" placeholder="请选择开始日期"
+          value-format="yyyy-MM-dd" />
         <span>至</span>
-        <ws-date-picker
-          v-model="deptBudgetList.inOutDate"
-          type="date"
-          placeholder="请选择结束日期"
-          value-format="yyyy-MM-dd"
-        />
-        <ws-input
-          v-model="searchKeyWord"
-          placeholder="可按照合同编号、买方名称、卖方名称进行查找"
-          clearable
-          maxlength="500"
-          type="input"
-          class="findValue"
-          @keyup.enter.native="find()"
-        ></ws-input>
+        <ws-date-picker v-model="deptBudgetList.inOutDate" type="date" placeholder="请选择结束日期"
+          value-format="yyyy-MM-dd" />
+        <ws-input v-model="searchKeyWord" placeholder="可按照合同编号、买方名称、卖方名称进行查找" clearable maxlength="500" type="input"
+          class="findValue" @keyup.enter.native="find()"></ws-input>
         <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
-        <ws-button
-          class="find"
-          type="primary"
-          @click="find()"
-          v-hasPermission="
+        <ws-button class="find" type="primary" @click="find()" v-hasPermission="
             `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-          "
-          ><img
-            width="16"
-            height="16"
-            style="
+          "><img width="16" height="16" style="
               vertical-align: text-top;
               position: relative;
               top: 0px;
               left: -8px;
-            "
-            src="../../../public/img/sousuo.png"
-            alt=""
-        /></ws-button>
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button>
       </template>
     </BaseHeaderLayout>
     <div>
-      <el-table
-        class="wenzi"
-        :data="warehouseList"
-        style="width: 100%; margin-top: 20px"
-        height="780"
-      >
+      <el-table class="wenzi" :data="warehouseList" style="width: 100%; margin-top: 20px" height="780">
         <el-table-column prop="warehouseName" label="序号" width="80">
         </el-table-column>
         <el-table-column prop="binNumber" label="运输任务编号" width="80">
         </el-table-column>
         <el-table-column prop="capacity" label="货名">
           <template slot-scope="scope">
-            <div
-              v-if="scope.row.capacity != 'null' && scope.row.capacity != null"
-            >
+            <div v-if="scope.row.capacity != 'null' && scope.row.capacity != null">
               {{ scope.row.capacity }}
             </div>
           </template>
         </el-table-column>
         <el-table-column class="table_td" label="重量（吨）">
           <template slot-scope="scope">
-            <div
-              style="height: 24px"
-              v-for="(item, i) in scope.row.warehouseNumViewList"
-            >
+            <div style="height: 24px" v-for="(item, i) in scope.row.warehouseNumViewList">
               {{ item.inNetWeight }}
             </div>
           </template>
         </el-table-column>
         <el-table-column class="table_td" label="发货" width="300">
           <template slot-scope="scope">
-            <div
-              style="height: 24px"
-              v-for="(item, i) in scope.row.warehouseNumViewList"
-            >
+            <div style="height: 24px" v-for="(item, i) in scope.row.warehouseNumViewList">
               {{ item.outNetWeight }}
             </div>
           </template>
         </el-table-column>
         <el-table-column class="table_td" label="收货" width="300">
           <template slot-scope="scope">
-            <div
-              style="height: 24px"
-              v-for="(item, i) in scope.row.warehouseNumViewList"
-            >
+            <div style="height: 24px" v-for="(item, i) in scope.row.warehouseNumViewList">
               {{ item.storage }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column class="table_td" label="运输周期"  width="160">
+        <el-table-column class="table_td" label="运输周期" width="160">
           <template slot-scope="scope">
-            <div
-              style="height: 24px"
-              v-for="(item, i) in scope.row.warehouseNumViewList"
-            >
+            <div style="height: 24px" v-for="(item, i) in scope.row.warehouseNumViewList">
               {{ item.storage }}
             </div>
           </template>
@@ -139,25 +78,12 @@
 
         <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)"
-            >
+            <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 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>
@@ -168,10 +94,7 @@
                   </div>
                   <div>
                     <div class="vertical-circle"></div>
-                    <div
-                      v-if="index != historyList.length - 1"
-                      class="vertical-line"
-                    ></div>
+                    <div v-if="index != historyList.length - 1" class="vertical-line"></div>
                   </div>
                   <div class="vertical-text">
                     {{ item.operateUser }}<br />{{ item.dealMsg }}
@@ -179,44 +102,27 @@
                 </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=""
-            />
+            <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="接单日期">
           <template slot-scope="scope">
-            <div
-              style="height: 24px"
-              v-for="(item, i) in scope.row.warehouseNumViewList"
-            >
+            <div style="height: 24px" v-for="(item, i) in scope.row.warehouseNumViewList">
               {{ item.storage }}
             </div>
           </template>
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
-            <ws-button
-              class="completed"
-              @click="nocomplete(scope.row)"
-              v-hasPermission="
+            <ws-button class="completed" @click="nocomplete(scope.row)" v-hasPermission="
                 `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-              "
-            >
+              ">
               查看（{{ scope.row.number }}）
             </ws-button>
-            <ws-button
-              class="putstorage"
-              @click="warehousing(scope.row)"
-              v-hasPermission="
+            <ws-button class="putstorage" @click="warehousing(scope.row)" v-hasPermission="
                 `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-              "
-            >
+              ">
               车次
             </ws-button>
           </template>
@@ -232,314 +138,335 @@
   </div>
 </template>
 <script>
-import {
-  getList,
-  export1,
-  editstatus,
-  billoperatehis,
-} from '@/model/warehouse/index'
-import { downloadFile } from '@/utils/batchDown'
-import Pagination from '@/components/Pagination'
-import WsUpload from '@/components/WsUpload'
-import { dayjs, fmoney, EventBus } from 'base-core-lib'
-export default {
-  name: 'viewSpareMoney',
-  components: {
-    WsUpload,
-    Pagination,
-  },
-  watch: {
-    vesselId(val) {
-      this.getList()
+  import {
+    getList,
+    export1,
+    editstatus,
+    billoperatehis,
+  } from '@/model/warehouse/index'
+  import {
+    downloadFile
+  } from '@/utils/batchDown'
+  import Pagination from '@/components/Pagination'
+  import WsUpload from '@/components/WsUpload'
+  import {
+    dayjs,
+    fmoney,
+    EventBus
+  } from 'base-core-lib'
+  export default {
+    name: 'viewSpareMoney',
+    components: {
+      WsUpload,
+      Pagination,
     },
-    isShow(val) {
-      this.showType = val
+    watch: {
+      vesselId(val) {
+        this.getList()
+      },
+      isShow(val) {
+        this.showType = val
+      },
     },
-  },
-  data() {
-    return {
-      //弹出框
-      dialogViewSpareMoney: false,
-      dialogApproveFormVisible: false,
-      // 船舶类型
-      monetaryKey: null,
-      // 表格显示数据
-      tableDate: [],
+    data() {
+      return {
+        //弹出框
+        dialogViewSpareMoney: false,
+        dialogApproveFormVisible: false,
+        // 船舶类型
+        monetaryKey: null,
+        // 表格显示数据
+        tableDate: [],
 
-      // 是否显示
-      showType: true,
-      // 年
-      year: '',
-      currentPage: 1,
-      pageSize: 10,
-      searchType: 1,
-      searchTypeText: '未完成',
-      searchKeyWord: '',
-      contractType: 2,
-      // 提交类型
-      submitType: true,
-      size: 10,
-      spanArr: [],
-      warehouseName: '',
-      compId: localStorage.getItem('ws-pf_compId'),
-      deptCircularPage: {},
-      warehouseList: [],
-      deptBudgetList: {},
-      historyList: [],
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          return time.getTime() > Date.now()
-        },
-      },
-      accessoryTFs: false,
-    }
-  },
-  activated() {
-    //cg.viewBudget
-    //cg.viewSpareMoney
-    // this.getVesselData();
-    this.getList()
-    this.showType = this.isShow
-  },
-  methods: {
-    //出库
-    delivery(item) {
-      this.$router.push({
-        path: 'warehouseManagementDelivery',
-        query: {
-          baseId: item.warehouseId,
-          positionId: item.binNumberId,
-          warehouseName: item.warehouseName,
-          binNumber: item.binNumber,
-          capacity: item.capacity,
+        // 是否显示
+        showType: true,
+        // 年
+        year: '',
+        currentPage: 1,
+        pageSize: 10,
+        searchType: 1,
+        searchTypeText: '未完成',
+        searchKeyWord: '',
+        contractType: 2,
+        // 提交类型
+        submitType: true,
+        size: 10,
+        spanArr: [],
+        warehouseName: '',
+        compId: localStorage.getItem('ws-pf_compId'),
+        deptCircularPage: {},
+        warehouseList: [],
+        deptBudgetList: {},
+        historyList: [],
+        pickerBeginDateBefore: {
+          disabledDate: (time) => {
+            return time.getTime() > Date.now()
+          },
         },
-      })
-    },
-    //派车
-    warehousing(item) {
-      var free = 0
-      for (var i = 0; i < item.warehouseNumViewList.length; i++) {
-        free += Number(item.warehouseNumViewList[i].storage)
+        accessoryTFs: false,
       }
-      this.$router.push({
-        path: 'tranManagementVehicleDispatching',
-        query: {
-          baseId: item.warehouseId,
-          positionId: item.binNumberId,
-          warehouseName: item.warehouseName,
-          binNumber: item.binNumber,
-          capacity: item.capacity - free,
-        },
-      })
     },
-    getSpanArr(data) {
-      let that = this
+    activated() {
+      //cg.viewBudget
+      //cg.viewSpareMoney
+      // this.getVesselData();
+      this.getList()
+      this.showType = this.isShow
+    },
+    methods: {
+      //出库
+      delivery(item) {
+        this.$router.push({
+          path: 'warehouseManagementDelivery',
+          query: {
+            baseId: item.warehouseId,
+            positionId: item.binNumberId,
+            warehouseName: item.warehouseName,
+            binNumber: item.binNumber,
+            capacity: item.capacity,
+          },
+        })
+      },
+      //派车
+      warehousing(item) {
+        var free = 0
+        for (var i = 0; i < item.warehouseNumViewList.length; i++) {
+          free += Number(item.warehouseNumViewList[i].storage)
+        }
+        this.$router.push({
+          path: 'tranManagementVehicleDispatching',
+          query: {
+            baseId: item.warehouseId,
+            positionId: item.binNumberId,
+            warehouseName: item.warehouseName,
+            binNumber: item.binNumber,
+            capacity: item.capacity - free,
+          },
+        })
+      },
+      getSpanArr(data) {
+        let that = this
 
-      //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
+        //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
 
-      that.spanArr = []
+        that.spanArr = []
 
-      that.pos = 0
+        that.pos = 0
 
-      //遍历数据
+        //遍历数据
 
-      data.forEach((item, index) => {
-        //判断是否是第一项
+        data.forEach((item, index) => {
+          //判断是否是第一项
 
-        // if (index === 0) {
-        //   this.spanArr.push(1)
-        //   this.pos = 0
-        // } else {
-        //不是第一项时，就根据标识去存储
-        if (data[index].warehouseNumViewList.length > 1) {
-          // 查找到符合条件的数据时每次要把之前存储的数据+1
-          this.spanArr[this.pos] = data[index].warehouseNumViewList.length
-          this.spanArr.push(0)
-        } else {
-          // 没有符合的数据时，要记住当前的index
-          this.spanArr.push(1)
-          this.pos = index
-        }
-        // }
-      })
-    },
-    //查看//传参
-    nocomplete(row) {
-      this.$router.push({
-        path: 'tranManagementVehicleLook',
-        // query: {
-        //   baseId: row.warehouseId,
-        //   positionId: row.binNumberId,
-        //   warehouseName: row.warehouseName,
-        //   binNumber: row.binNumber,
-        // },
-      })
-    },
-    //记录
-    record(item) {
-      this.$router.push({
-        name: 'warehouseManagementRecord',
-        query: {
-          baseId: item.warehouseId,
-          positionId: item.binNumberId,
-          warehouseName: item.warehouseName,
-        },
-        params: {
-          remark: item.remark,
-          binNumber: item.binNumber,
-          capacity: item.capacity,
-        },
-      })
-    },
-    //盘损
-    loss(item) {
-      this.$router.push({
-        path: 'warehouseManagementIoss',
-        query: {
-          baseId: item.warehouseId,
-          positionId: item.binNumberId,
-          warehouseName: item.warehouseName,
-          binNumber: item.binNumber,
-        },
-      })
-    },
-    //查看
-    handleLook() {
-      this.$router.push({ path: 'tranManagementVehicleLook' })
-    },
-    //添加
-    handleAdd() {
-      this.$router.push({ path: 'tranManagementTransportAdd' })
-    },
-    //编辑
-    handleEdit() {
-      this.$router.push({ path: 'tranManagementTransportEdit' })
-    },
-    // 派车
-    warehousing() {
-      this.$router.push({ path: 'tranManagementVehicleDispatching' })
-    },
-    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.accessoryTFs = 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'),
-        warehouseName: this.warehouseName,
-      })
-        .toPromise()
-        .then((response) => {
-          this.warehouseList = response
+          // if (index === 0) {
+          //   this.spanArr.push(1)
+          //   this.pos = 0
+          // } else {
+          //不是第一项时，就根据标识去存储
+          if (data[index].warehouseNumViewList.length > 1) {
+            // 查找到符合条件的数据时每次要把之前存储的数据+1
+            this.spanArr[this.pos] = data[index].warehouseNumViewList.length
+            this.spanArr.push(0)
+          } else {
+            // 没有符合的数据时，要记住当前的index
+            this.spanArr.push(1)
+            this.pos = index
+          }
+          // }
         })
-    },
-    editClick(row) {
-      var status = ''
-      if (row.status == '待执行' || row.status == '已完成') {
-        status = '执行中'
-      } else if (row.status == '执行中') {
-        status = '已完成'
-      }
-      //cancelButtonClass: "btn-custom-cancel"
-      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'))
-            })
+      },
+      //查看//传参
+      nocomplete(row) {
+        this.$router.push({
+          path: 'tranManagementVehicleLook',
+          // query: {
+          //   baseId: row.warehouseId,
+          //   positionId: row.binNumberId,
+          //   warehouseName: row.warehouseName,
+          //   binNumber: row.binNumber,
+          // },
         })
-        .catch(() => {
-          return false
+      },
+      //记录
+      record(item) {
+        this.$router.push({
+          name: 'warehouseManagementRecord',
+          query: {
+            baseId: item.warehouseId,
+            positionId: item.binNumberId,
+            warehouseName: item.warehouseName,
+          },
+          params: {
+            remark: item.remark,
+            binNumber: item.binNumber,
+            capacity: item.capacity,
+          },
         })
-    },
-    selecttaskType(e) {
-      for (var i = 0; i < this.taskTypeList.length; i++) {
-        if (this.taskTypeList[i].value == e) {
-          this.searchType = this.taskTypeList[i].type
+      },
+      //盘损
+      loss(item) {
+        this.$router.push({
+          path: 'warehouseManagementIoss',
+          query: {
+            baseId: item.warehouseId,
+            positionId: item.binNumberId,
+            warehouseName: item.warehouseName,
+            binNumber: item.binNumber,
+          },
+        })
+      },
+      //查看
+      handleLook() {
+        this.$router.push({
+          path: 'tranManagementVehicleLook'
+        })
+      },
+      //添加
+      handleAdd() {
+        this.$router.push({
+          path: 'tranManagementTransportAdd'
+        })
+      },
+      //编辑
+      handleEdit() {
+        this.$router.push({
+          path: 'tranManagementTransportEdit'
+        })
+      },
+      // 派车
+      warehousing() {
+        this.$router.push({
+          path: 'tranManagementVehicleDispatching'
+        })
+      },
+      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()          // 秒
+          // 有其他格式化字符需求可以继续添加，必须转化成字符串
         }
-      }
-    },
-    fujian(row) {
-      if (
-        row.receiveAttachmentPath === null ||
-        row.receiveAttachmentPath === ''
-      ) {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
-      } else {
-        this.accessoryTFs = true
-      }
-      this.appendixIdss = row.receiveAttachmentPath
-    },
-    handleExamine(row) {
-      this.$router.push({
-        name: 'salesContractExamine',
-        query: { id: row.id },
-      })
-    },
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    handleCloe() {
-      this.dialogViewSpareMoney = false
-    },
-    history(row) {
-      billoperatehis({ id: row.id })
-        .toPromise()
-        .then((response) => {
-          this.historyList = response
+        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.accessoryTFs = 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'),
+            warehouseName: this.warehouseName,
+          })
+          .toPromise()
+          .then((response) => {
+            this.warehouseList = response
+          })
+      },
+      editClick(row) {
+        var status = ''
+        if (row.status == '待执行' || row.status == '已完成') {
+          status = '执行中'
+        } else if (row.status == '执行中') {
+          status = '已完成'
+        }
+        //cancelButtonClass: "btn-custom-cancel"
+        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) {
+        if (
+          row.receiveAttachmentPath === null ||
+          row.receiveAttachmentPath === ''
+        ) {
+          EventBus.$emit(
+            'warning',
+            this.$t('system.noticeCircular.NoInformation')
+          )
+        } else {
+          this.accessoryTFs = true
+        }
+        this.appendixIdss = row.receiveAttachmentPath
+      },
+      handleExamine(row) {
+        this.$router.push({
+          name: 'salesContractExamine',
+          query: {
+            id: row.id
+          },
         })
-    },
-    find() {
-      this.currentPage = 1
-      this.getList()
-    },
-    async exportlist() {
-      const { data } = await export1(
-        {
+      },
+      // 关闭 dialog时 处理文件url 初始化upload组件
+      handleCloe() {
+        this.dialogViewSpareMoney = false
+      },
+      history(row) {
+        billoperatehis({
+            id: row.id
+          })
+          .toPromise()
+          .then((response) => {
+            this.historyList = response
+          })
+      },
+      find() {
+        this.currentPage = 1
+        this.getList()
+      },
+      async exportlist() {
+        const {
+          data
+        } = await export1({
           compId: localStorage.getItem('ws-pf_compId'),
           contractType: this.contractType,
           currentPage: this.currentPage,
@@ -548,99 +475,114 @@ export default {
           searchKeyWord: this.searchKeyWord,
           startDate: this.startDate,
           endDate: this.endDate,
-        },
-        {},
-        { responseType: 'blob' }
-      ).toPromise()
-      downloadFile({
-        res: data,
-        fileName: `${
+        }, {}, {
+          responseType: 'blob'
+        }).toPromise()
+        downloadFile({
+          res: data,
+          fileName: `${
           this.date.year + (this.date.month ? `-${this.date.month}` : '')
         }_采购合同`,
-        type: 'xls',
-      })
+          type: 'xls',
+        })
+      },
     },
-  },
-}
+  }
 </script>
 <style lang="scss" scoped>
-.connert {
-  width: 90%;
-  margin: 0 auto;
-}
-.vertical-text-left {
-  width: 62px;
-  text-align: right;
-}
-.el-button--primary {
-  background-color: #5878e8;
-  border-color: #5878e8;
-}
-.el-button--default {
-  color: #8890b1;
-  border-color: #e8eaf1;
-}
-/deep/.base_header_layout .grid-content.right .find.el-button--primary {
-  width: 30px;
-  margin-left: 0;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-}
-/deep/.findValue .el-input__inner {
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
-.completed.el-button--default {
-  border-color: #5878e8;
-  background-color: #f6f7fc;
-  color: #5878e8;
-}
-.putstorage.el-button--default,
-.deliverystorage.el-button--default {
-  border-color: #8890b1;
-  background-color: #fff;
-  color: #8890b1;
-}
-/deep/.el-table td,
-/deep/.el-table th.is-leaf {
-  border-right: 1px solid #e9ecf7;
-  text-align: center;
-}
-/deep/.el-table tr td:first-child,
-/deep/.el-table tr th.is-leaf:first-child {
-  border-left: 1px solid #e9ecf7;
-}
-.record,
-.adjustment {
-  display: inline-block;
-  color: #5878e8;
-  padding: 0 4px !important;
-  position: relative;
-}
-.record:after {
-  position: absolute;
-  content: '';
-  display: block;
-  top: 5px;
-  right: -2px;
-  width: 1px;
-  height: 12px;
-  background: #e9ecf7;
-}
-.el-row {
-  height: 150px;
-}
-.base_header_layout .grid-content {
-  margin-top: 80px;
-}
-.but {
-  margin-top: 150px;
-}
-.el-input--small .el-input__inner {
-  margin-left: 20px;
-}
-.el-range-editor--small.el-input__inner {
-  height: 32px;
-  margin-left: -20%;
-}
+  .connert {
+    width: 90%;
+    margin: 0 auto;
+  }
+
+  .vertical-text-left {
+    width: 62px;
+    text-align: right;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+  }
+
+  .el-button--default {
+    color: #8890b1;
+    border-color: #e8eaf1;
+  }
+
+  /deep/.base_header_layout .grid-content.right .find.el-button--primary {
+    width: 30px;
+    margin-left: 0;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+
+  /deep/.findValue .el-input__inner {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
+
+  .completed.el-button--default {
+    border-color: #5878e8;
+    background-color: #f6f7fc;
+    color: #5878e8;
+  }
+
+  .putstorage.el-button--default,
+  .deliverystorage.el-button--default {
+    border-color: #8890b1;
+    background-color: #fff;
+    color: #8890b1;
+  }
+
+  /deep/.el-table td,
+  /deep/.el-table th.is-leaf {
+    border-right: 1px solid #e9ecf7;
+    text-align: center;
+  }
+
+  /deep/.el-table tr td:first-child,
+  /deep/.el-table tr th.is-leaf:first-child {
+    border-left: 1px solid #e9ecf7;
+  }
+
+  .record,
+  .adjustment {
+    display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+  }
+
+  .record:after {
+    position: absolute;
+    content: '';
+    display: block;
+    top: 5px;
+    right: -2px;
+    width: 1px;
+    height: 12px;
+    background: #e9ecf7;
+  }
+
+  .el-row {
+    height: 150px;
+  }
+
+  .base_header_layout .grid-content {
+    margin-top: 80px;
+  }
+
+  .but {
+    margin-top: 150px;
+  }
+
+  .el-input--small .el-input__inner {
+    margin-left: 20px;
+  }
+
+  .el-range-editor--small.el-input__inner {
+    height: 32px;
+    margin-left: -20%;
+  }
 </style>

src/views/taskManagement/tranManagementTransport.vue

@@ -3,71 +3,36 @@
   <div>
     <BaseHeaderLayout :leftSpan="8">
       <template slot="left">
-        <ws-button
-          class="but"
-          type="primary"
-          @click="handleAdd()"
-          v-hasPermission="
+        <ws-button class="but" type="primary" @click="handleAdd()" v-hasPermission="
            `transportationTask.transportation.transportationInfo.add`
-          "
-        >添加</ws-button>
+          ">添加</ws-button>
       </template>
       <template slot="right">
         <span style="width: 150px; 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 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>
         <span style="width: 150px; display: inline-block;color: #8890B1;">起点：</span>
         <el-input label="起点" placeholder="请输入起点" clearable maxlength="200" type="input" v-model="start"></el-input>
         <span style="width: 150px; display: inline-block;color: #8890B1;">终点：</span>
         <el-input label="终点" placeholder="请输入终点" clearable maxlength="200" type="input" v-model="end"></el-input>
-        <el-input
-        @keyup.enter.native="lookUp()"
-          v-model="searchKeyWord"
-          placeholder="可按合同编号或运输任务编号查找"
-          clearable
-          maxlength="500"
-          type="input"
-          class="findValue"
-        ></el-input>
+        <el-input @keyup.enter.native="lookUp()" v-model="searchKeyWord" placeholder="可按合同编号或运输任务编号查找" clearable
+          maxlength="500" type="input" class="findValue"></el-input>
         <div class="search">
           <ws-button class="find" type="primary" @click="lookUp()">
-            <img
-              width="16"
-              height="16"
-              style="
+            <img width="16" height="16" style="
                 vertical-align: text-top;
                 position: relative;
                 top: 0px;
                 left: -8px;
-              "
-              src="../../../public/img/sousuo.png"
-              alt
-            />
+              " src="../../../public/img/sousuo.png" alt />
           </ws-button>
         </div>
       </template>
     </BaseHeaderLayout>
-
-    <div>
-      <el-table
-        class="wenzi"
-        :data="gainList.records"
-        style="width: 100%; "
-        height="780"
-      >
+      <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>
@@ -76,7 +41,7 @@
         </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"> 
+        <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>
@@ -97,13 +62,7 @@
 
         <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)"
-            >
+            <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>
@@ -128,512 +87,541 @@
                 </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
-            />
+            <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 class="record" @click="nocomplete(scope.row)" v-hasPermission="
            `transportationTask.transportation.transportationInfo.view`
-          "
-            >查看</div>
-            <div
-              class="record"
-              @click="delivery(scope.row)"
-              v-hasPermission="
+          ">查看</div>
+            <div class="record" @click="delivery(scope.row)" v-hasPermission="
            `transportationTask.transportation.transportationInfo.edit`
-          "
-            >编辑</div>
-            <div
-              class="record1"
-              @click="deleteclick(scope.row)"
-              v-hasPermission="
+          ">编辑</div>
+            <div class="record1" @click="deleteclick(scope.row)" v-hasPermission="
            `transportationTask.transportation.transportationInfo.delete`
-          "
-            >删除</div>
+          ">删除</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>
+      <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>
-import { gain, deltran,states } from '@/model/tasksport/index'
-import Pagination from '@/components/Pagination'
-import WsUpload from '@/components/WsUpload'
-import {
-  billoperatehis
-} from '@/model/contarct/index'
-export default {
-  name: 'viewSpareMoney',
-  components: {
-    WsUpload,
-    Pagination
-  },
-  watch: {
-    vesselId(val) {
-      this.getList()
+  import {
+    gain,
+    deltran,
+    states
+  } from '@/model/tasksport/index'
+  import Pagination from '@/components/Pagination'
+  import WsUpload from '@/components/WsUpload'
+  import {
+    billoperatehis
+  } from '@/model/contarct/index'
+  export default {
+    name: 'viewSpareMoney',
+    components: {
+      WsUpload,
+      Pagination
     },
-    isShow(val) {
-      this.showType = val
-    }
-  },
-  data() {
-    return {
-      //弹出框
-      dialogViewSpareMoney: false,
-      dialogApproveFormVisible: false,
-      // 船舶类型
-      monetaryKey: null,
-      // 表格显示数据
-      tableDate: [],
-
-      // 是否显示
-      showType: true,
-      // 年
-      year: '',
-      gainList: [],
-      currentPage: 1,
-      primary: 1,
-      deptBudgetTotal:0,
-      pageSize: 10,
-      deptBudgetTotal:0,
-      searchType: 1,
-      searchTypeText: '执行中',
-      searchKeyWord: '',
-      contractType: 2,
-      // 提交类型
-      submitType: true,
-      size: 10,
-      spanArr: [],
-      warehouseName: '',
-      compId: localStorage.getItem('ws-pf_compId'),
-      deptCircularPage: {},
-      historyList: [],
-      pickerBeginDateBefore: {
-        disabledDate: time => {
-          return time.getTime() > Date.now()
-        }
+    watch: {
+      vesselId(val) {
+        this.getList()
       },
-      accessoryTFs: false,
-       taskTypeList: [
-        { value: '执行中', type: 1 },
-        { value: '已完成', type: 2 },
-        { value: '全部任务', type: 3 },
-      ],
-      start:'',
-      end:'',
-    }
-  },
-  activated() {
-    this.getList()
-    this.showType = this.isShow
-  },
-  methods: {
-    //添加
-    add() {
-      this.$router.push({ path: 'tranManagementTransportAdd' })
+      isShow(val) {
+        this.showType = val
+      }
+    },
+    data() {
+      return {
+        //弹出框
+        dialogViewSpareMoney: false,
+        dialogApproveFormVisible: false,
+        // 船舶类型
+        monetaryKey: null,
+        // 表格显示数据
+        tableDate: [],
+
+        // 是否显示
+        showType: true,
+        // 年
+        year: '',
+        gainList: [],
+        currentPage: 1,
+        primary: 1,
+        deptBudgetTotal: 0,
+        pageSize: 10,
+        deptBudgetTotal: 0,
+        searchType: 1,
+        searchTypeText: '执行中',
+        searchKeyWord: '',
+        contractType: 2,
+        // 提交类型
+        submitType: true,
+        size: 10,
+        spanArr: [],
+        warehouseName: '',
+        compId: localStorage.getItem('ws-pf_compId'),
+        deptCircularPage: {},
+        historyList: [],
+        pickerBeginDateBefore: {
+          disabledDate: time => {
+            return time.getTime() > Date.now()
+          }
+        },
+        accessoryTFs: false,
+        taskTypeList: [{
+            value: '执行中',
+            type: 1
+          },
+          {
+            value: '已完成',
+            type: 2
+          },
+          {
+            value: '全部任务',
+            type: 3
+          },
+        ],
+        start: '',
+        end: '',
+      }
     },
-    //查找
-    lookUp() {
-      this.currentPage = 1
+    activated() {
       this.getList()
+      this.showType = this.isShow
     },
-    history(row) {
-      console.log(row)
-      billoperatehis({ id: row.id })
-        .toPromise()
-        .then((response) => {
-          this.historyList = response
+    methods: {
+      //添加
+      add() {
+        this.$router.push({
+          path: 'tranManagementTransportAdd'
         })
-    },
-    deleteclick(row) {
-      //cancelButtonClass: "btn-custom-cancel"
-      this.$confirm(`运输任务删除后不可恢复，是否确定删除？`, {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          deltran({
+      },
+      //查找
+      lookUp() {
+        this.currentPage = 1
+        this.getList()
+      },
+      history(row) {
+        console.log(row)
+        billoperatehis({
             id: row.id
           })
-            .toPromise()
-            .then(response => {
-              this.getList()
-            })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    getList() {
-      gain({
-        compId: localStorage.getItem('ws-pf_compId'),
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        searchType: this.searchType,
-        start:this.start,
-        end:this.end,
-        searchKeyWord: this.searchKeyWord,
-        
-      })
-        .toPromise()
-        .then((response) => {
-          this.gainList = response
-          this.currentPage = response.current
-          this.pageSize = response.size
-          this.deptBudgetTotal = response.total
-        })
-    },
-    handlestatus(status) {
-      this.searchType = status
-      if (status == 1) {
-        this.primary = 1
-      } else if (status == 2) {
-        this.primary = 2
-      } else {
-        this.primary = 3
-      }
-      this.getList()
-    },
-    //编辑
-    delivery(item) {
-      this.$router.push({
-        path: 'tranManagementTransportEdit',
-        query: {
-          id: item.id
+          .toPromise()
+          .then((response) => {
+            this.historyList = response
+          })
+      },
+      deleteclick(row) {
+        //cancelButtonClass: "btn-custom-cancel"
+        this.$confirm(`运输任务删除后不可恢复，是否确定删除？`, {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+            deltran({
+                id: row.id
+              })
+              .toPromise()
+              .then(response => {
+                this.getList()
+              })
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      getList() {
+        gain({
+            compId: localStorage.getItem('ws-pf_compId'),
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            searchType: this.searchType,
+            start: this.start,
+            end: this.end,
+            searchKeyWord: this.searchKeyWord,
+
+          })
+          .toPromise()
+          .then((response) => {
+            this.gainList = response
+            this.currentPage = response.current
+            this.pageSize = response.size
+            this.deptBudgetTotal = response.total
+          })
+      },
+      handlestatus(status) {
+        this.searchType = status
+        if (status == 1) {
+          this.primary = 1
+        } else if (status == 2) {
+          this.primary = 2
+        } else {
+          this.primary = 3
         }
-      })
-    },
-    //查看
-    warehousing(item) {
-      var free = 0
-      for (var i = 0; i < item.warehouseNumViewList.length; i++) {
-        free += Number(item.warehouseNumViewList[i].storage)
-      }
-      this.$router.push({
-        path: 'tranManagementLook',
-        query: {
-          baseId: item.warehouseId,
-          positionId: item.binNumberId,
-          warehouseName: item.warehouseName,
-          binNumber: item.binNumber,
-          capacity: item.capacity - free
+        this.getList()
+      },
+      //编辑
+      delivery(item) {
+        this.$router.push({
+          path: 'tranManagementTransportEdit',
+          query: {
+            id: item.id
+          }
+        })
+      },
+      //查看
+      warehousing(item) {
+        var free = 0
+        for (var i = 0; i < item.warehouseNumViewList.length; i++) {
+          free += Number(item.warehouseNumViewList[i].storage)
         }
-      })
-    },
-    getSpanArr(data) {
-      let that = this
+        this.$router.push({
+          path: 'tranManagementLook',
+          query: {
+            baseId: item.warehouseId,
+            positionId: item.binNumberId,
+            warehouseName: item.warehouseName,
+            binNumber: item.binNumber,
+            capacity: item.capacity - free
+          }
+        })
+      },
+      getSpanArr(data) {
+        let that = this
 
-      //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
+        //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
 
-      that.spanArr = []
+        that.spanArr = []
 
-      that.pos = 0
+        that.pos = 0
 
-      //遍历数据
+        //遍历数据
 
-      data.forEach((item, index) => {
-        //判断是否是第一项
+        data.forEach((item, index) => {
+          //判断是否是第一项
 
-        // if (index === 0) {
-        //   this.spanArr.push(1)
-        //   this.pos = 0
-        // } else {
-        //不是第一项时，就根据标识去存储
-        if (data[index].warehouseNumViewList.length > 1) {
-          // 查找到符合条件的数据时每次要把之前存储的数据+1
-          this.spanArr[this.pos] = data[index].warehouseNumViewList.length
-          this.spanArr.push(0)
-        } else {
-          // 没有符合的数据时，要记住当前的index
-          this.spanArr.push(1)
-          this.pos = index
+          // if (index === 0) {
+          //   this.spanArr.push(1)
+          //   this.pos = 0
+          // } else {
+          //不是第一项时，就根据标识去存储
+          if (data[index].warehouseNumViewList.length > 1) {
+            // 查找到符合条件的数据时每次要把之前存储的数据+1
+            this.spanArr[this.pos] = data[index].warehouseNumViewList.length
+            this.spanArr.push(0)
+          } else {
+            // 没有符合的数据时，要记住当前的index
+            this.spanArr.push(1)
+            this.pos = index
+          }
+          // }
+        })
+      },
+      //查看//传参
+      nocomplete(row) {
+        this.$router.push({
+          path: 'tranManagementLook',
+          query: {
+            id: row.id
+          }
+        })
+      },
+      //查看
+      handleLook() {
+        this.$router.push({
+          path: 'tranManagementLook'
+        })
+      },
+      //添加
+      handleAdd() {
+        this.$router.push({
+          path: 'tranManagementTransportAdd'
+        })
+      },
+      //编辑
+      handleEdit() {
+        this.$router.push({
+          path: 'tranManagementTransportEdit'
+        })
+      },
+      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()          // 秒
+          // 有其他格式化字符需求可以继续添加，必须转化成字符串
         }
-        // }
-      })
-    },
-    //查看//传参
-    nocomplete(row) {
-      this.$router.push({
-        path: 'tranManagementLook',
-        query: {
-          id: row.id
+        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')
+            )
+          }
         }
-      })
-    },
-    //查看
-    handleLook() {
-      this.$router.push({ path: 'tranManagementLook' })
-    },
-    //添加
-    handleAdd() {
-      this.$router.push({ path: 'tranManagementTransportAdd' })
-    },
-    //编辑
-    handleEdit() {
-      this.$router.push({ path: 'tranManagementTransportEdit' })
-    },
-    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.accessoryTFs = false
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+      editClick(row) {
+        var status = ''
+        if (row.status == '待执行' || row.status == '已完成') {
+          status = '执行中'
+        } else if (row.status == '执行中') {
+          status = '已完成'
         }
-      }
-      return fmt
-    },
-    handleClose() {
-      this.accessoryTFs = false
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getList()
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val
-      console.log(`当前页: ${val}`)
-      this.getList()
-    },
-    editClick(row) {
-      var status = ''
-      if (row.status == '待执行' || row.status == '已完成') {
-        status = '执行中'
-      } else if (row.status == '执行中') {
-        status = '已完成'
-      }
-      //cancelButtonClass: "btn-custom-cancel"
-      this.$confirm(`是否将状态改为${status}`, {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          states({ id: row.id })
-            .toPromise()
-            .then(response => {
-              this.$notify.success({
-                title: '成功',
-                message: '状态修改成功'
+        //cancelButtonClass: "btn-custom-cancel"
+        this.$confirm(`是否将状态改为${status}`, {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+            states({
+                id: row.id
               })
-              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
+              .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
+          }
         }
-      }
-    },
-    handleExamine(row) {
-      this.$router.push({
-        name: 'salesContractExamine',
-        query: { id: row.id }
-      })
-    },
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    handleCloe() {
-      this.dialogViewSpareMoney = false
-    },
+      },
+      handleExamine(row) {
+        this.$router.push({
+          name: 'salesContractExamine',
+          query: {
+            id: row.id
+          }
+        })
+      },
+      // 关闭 dialog时 处理文件url 初始化upload组件
+      handleCloe() {
+        this.dialogViewSpareMoney = false
+      },
+    }
   }
-}
 </script>
 <style lang="scss" scoped>
-.vertical-text-left {
-  width: 62px;
-  text-align: right;
-}
-.el-pagination{
-  padding-top: 20px;
-  text-align: center;
-}
-.el-button--default {
-  color: #8890b1;
-  border-color: #e8eaf1;
-}
-/deep/.base_header_layout .grid-content.right .find.el-button--primary {
-  width: 30px;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-}
-/deep/.findValue .el-input__inner {
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
-/deep/.el-table tr td:first-child,
-/deep/.el-table tr th.is-leaf:first-child {
-  border-left: 1px solid #e9ecf7;
-}
-.record,
-.adjustment,.record1 {
-  display: inline-block;
-  color: #5878e8;
-  padding: 0 4px !important;
-  position: relative;
-}
-
-.record:after {
-  position: absolute;
-  content: '';
-  display: block;
-  top: 5px;
-  right: -2px;
-  width: 1px;
-  height: 12px;
-  background: #e9ecf7;
-}
-/deep/.el-table td,
-/deep/.el-table th.is-leaf {
-  border-right: 1px solid #E9ECF7;
-  text-align: center;
-}
-.findValue.el-input {
-  width: 100%;
-  margin: 0;
-}
-.el-input {
-  margin: 0 10px;
-  width: 70%;
-}
-/deep/.search .el-button--small {
-  padding: 0;
-}
-//操作按钮
-.record,
-.adjustment {
-  display: inline-block;
-  color: #5878e8;
-  padding: 0 4px !important;
-  position: relative;
-  font-size: 14px;
-}
-.record:after {
-  position: absolute;
-  content: '';
-  display: block;
-  top: 5px;
-  right: -2px;
-  width: 1px;
-  height: 12px;
-  background: #e9ecf7;
-}
-//状态样式
-.executory,
-.inExecution,
-.done {
-  width: 6px;
-  height: 6px;
-  display: inline-block;
-  border-radius: 50%;
-  position: relative;
-  top: -1px;
-  font-size: 14px;
-}
-.executory {
-  background: #ff9f24;
-}
-.inExecution {
-  background: #5878e8;
-}
-.done {
-  background: #50cad4;
-}
-/deep/.el-row {
+  .vertical-text-left {
+    width: 62px;
+    text-align: right;
+  }
+
+  .el-pagination {
+    padding-top: 20px;
+    text-align: center;
+  }
+
+  .el-button--default {
+    color: #8890b1;
+    border-color: #e8eaf1;
+  }
+
+  /deep/.base_header_layout .grid-content.right .find.el-button--primary {
+    width: 30px;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+
+  /deep/.findValue .el-input__inner {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
+
+  /deep/.el-table tr td:first-child,
+  /deep/.el-table tr th.is-leaf:first-child {
+    border-left: 1px solid #e9ecf7;
+  }
+
+  .record,
+  .adjustment,
+  .record1 {
+    display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+  }
+
+  .record:after {
+    position: absolute;
+    content: '';
+    display: block;
+    top: 5px;
+    right: -2px;
+    width: 1px;
+    height: 12px;
+    background: #e9ecf7;
+  }
+
+  /deep/.el-table td,
+  /deep/.el-table th.is-leaf {
+    border-right: 1px solid #E9ECF7;
+    text-align: center;
+  }
+
+  .findValue.el-input {
+    width: 100%;
+    margin: 0;
+  }
+
+  .el-input {
+    margin: 0 10px;
+    width: 70%;
+  }
+
+  /deep/.search .el-button--small {
+    padding: 0;
+  }
+
+  //操作按钮
+  .record,
+  .adjustment {
+    display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+    font-size: 14px;
+  }
+
+  .record:after {
+    position: absolute;
+    content: '';
+    display: block;
+    top: 5px;
+    right: -2px;
+    width: 1px;
+    height: 12px;
+    background: #e9ecf7;
+  }
+
+  //状态样式
+  .executory,
+  .inExecution,
+  .done {
+    width: 6px;
+    height: 6px;
+    display: inline-block;
+    border-radius: 50%;
+    position: relative;
+    top: -1px;
+    font-size: 14px;
+  }
+
+  .executory {
+    background: #ff9f24;
+  }
+
+  .inExecution {
+    background: #5878e8;
+  }
+
+  .done {
+    background: #50cad4;
+  }
+
+  /deep/.el-row {
     -webkit-box-sizing: border-box;
     height: 50px;
     box-sizing: border-box;
-}
-/deep/.el-col-12 {
+  }
+
+  /deep/.el-col-12 {
     width: 50%;
     height: 50px;
-}
-.el-button--primary {
+  }
+
+  .el-button--primary {
     background-color: #5878e8;
     border-color: #5878e8;
-}
-.el-pagination {
+  }
+
+  .el-pagination {
     white-space: nowrap;
     padding: 2px 5px;
     color: #303133;
     font-weight: 700;
-text-align: center;
-}
-.el-select{
-  width: 30%;
+    text-align: center;
+  }
+
+  .el-select {
+    width: 30%;
     margin-right: 10px;
-}
-/deep/.typeselect .el-input__inner{
-   color: #8890B1;
-}
-// 操作历史
-.vertical-text-left {
-  width: 62px;
-  text-align: right;
-}
-.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;
-}
-.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;
-}
+  }
+
+  /deep/.typeselect .el-input__inner {
+    color: #8890B1;
+  }
+
+  // 操作历史
+  .vertical-text-left {
+    width: 62px;
+    text-align: right;
+  }
+
+  .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;
+  }
+
+  .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;
+  }
 </style>

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -14,7 +14,8 @@
           <ws-option v-for="item in taskTypeList" :key="item.value" :label="item.value" :value="item.value"
             style="color: #8890b1" />
         </ws-select>
-        <ws-input @keyup.enter.native="find()" class='findValue' v-model="searchKeyWord" placeholder="可按合同编号或任务编号查找" clearable maxlength="500" type="input"></ws-input>
+        <ws-input @keyup.enter.native="find()" class='findValue' v-model="searchKeyWord" placeholder="可按合同编号或任务编号查找"
+          clearable maxlength="500" type="input"></ws-input>
         <ws-button class="find" type="primary" @click="lookUp()">
           <img width="16" height="16" style="
               vertical-align: text-top;
@@ -25,8 +26,7 @@
         </ws-button>
       </template>
     </BaseHeaderLayout>
-    <div class="navv">
-      <el-table class="wenzi" :data="gainList.records" style="width: 100%" height="780">
+      <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>
@@ -87,10 +87,10 @@
                 `warehouseManagement.warehouse.warehouseInfoTask.View`
 
               ">查看</span>
-              <span v-hasPermission="`warehouseManagement.warehouse.warehouseInfoTask.audit`">
-                  <el-divider direction="vertical" v-if="scope.row.taskStatus == '待审核'"></el-divider>
-              </span>
-           
+            <span v-hasPermission="`warehouseManagement.warehouse.warehouseInfoTask.audit`">
+              <el-divider direction="vertical" v-if="scope.row.taskStatus == '待审核'"></el-divider>
+            </span>
+
             <span class="corles" v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.audit`
               " v-if="scope.row.taskStatus == '待审核'" @click="audit(scope.row)">审核</span>
@@ -106,10 +106,10 @@
                 scope.row.taskStatus == '执行中' ||
                 scope.row.taskStatus == '已驳回'
               " @click="delivery(scope.row)">编辑</span>
-              <span v-hasPermission="`warehouseManagement.warehouse.warehouseInfoTask.delete`">
-                  <el-divider  direction="vertical" v-if="scope.row.taskId == null"></el-divider>
-              </span>
-          
+            <span v-hasPermission="`warehouseManagement.warehouse.warehouseInfoTask.delete`">
+              <el-divider direction="vertical" v-if="scope.row.taskId == null"></el-divider>
+            </span>
+
             <span class="corles" v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.delete`
               " v-if="scope.row.taskId == null" @click="deleteclick(scope.row)">删除</span>
@@ -118,7 +118,6 @@
       </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>
   </div>
 </template>
 <script>

src/views/tranManagement/tranManagementDriver.vue

@@ -3,148 +3,72 @@
   <div>
     <BaseHeaderLayout :leftSpan="12">
       <template slot="left">
-        <ws-button type="primary" @click="handleAdd()"><img
-            width="13"
-            height="13"
-            style="
+        <ws-button type="primary" @click="handleAdd()"><img width="13" height="13" style="
               vertical-align: text-top;
               position: relative;
               top: 2px;
               left: -4px;
-            "
-            src="../../../public/img/header-add.png"
-            alt=""
-          />添加</ws-button>
+            " src="../../../public/img/header-add.png" alt="" />添加</ws-button>
       </template>
       <template slot="right">
-        <span style="display: inline-block; width: 65px; color: #8890b1"
-          >城市：</span
-        >
-        <el-cascader
-          :options="options_"
-          v-model="searchTypeText"
-          clearable
-          size="large"
-          placeholder="请选择所在城市"
-          style="width: 30%"
-          @change="selecttaskType"
-        />
-        <ws-input
-          v-model="searchKeyWord"
-          placeholder="可按司机姓名、手机号、车牌号、身份证号查找"
-          clearable
-          maxlength="200"
-          type="input"
-          class="findValue findinput"
-          @keyup.enter.native="handleLook()"
-        ></ws-input>
+        <span style="display: inline-block; width: 65px; color: #8890b1">城市：</span>
+        <el-cascader :options="options_" v-model="searchTypeText" clearable size="large" placeholder="请选择所在城市"
+          style="width: 30%" @change="selecttaskType" />
+        <ws-input v-model="searchKeyWord" placeholder="可按司机姓名、手机号、车牌号、身份证号查找" clearable maxlength="200" type="input"
+          class="findValue findinput" @keyup.enter.native="handleLook()"></ws-input>
         <ws-button class='find' type="primary" @click="handleLook()">
-          <img
-            width="14"
-            height="16"
-            style="
+          <img width="14" height="16" style="
               vertical-align: text-top;
               position: relative;
               top: 0px;
               left: -8px;
-            "
-            src="../../../public/img/sousuo.png"
-            alt=""
-          />
+            " src="../../../public/img/sousuo.png" alt="" />
         </ws-button>
       </template>
     </BaseHeaderLayout>
-    <div>
-      <el-table
-        class="wenzi"
-        :data="driverList.records"
-        style="width: 100%; margin-top: 20px"
-        fit
-        ref="expandstable"
-        :expand-row-keys="expands"
-        :row-key="getRowKeys"
-        height="780"
-      >
+      <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"
-                  >
+                  <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"
-                  >
+                  <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"
-                  >
+                  <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)"
-                      />
+                      <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="
+                  <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;
                         padding-right: 10px;
-                      "
-                      >{{ item.bankDeposit }}</span
-                    ><span
-                      style="
+                      ">{{ item.bankDeposit }}</span><span style="
                         margin: 10px;
                         padding: 0px;
                         display: inline-block;
                         word-wrap: break-word;
                         line-height: 20px;
                         white-space: normal;
-                      "
-                      >{{ item.bankDepositBranch }}</span
-                    >
+                      ">{{ item.bankDepositBranch }}</span>
                   </ws-form-item>
-                  <ws-form-item
-                    :class="item.accountTypeFlag == 1 ? 'personage' : 'company'"
-                    label="账号"
-                    span="1"
-                    prop="bankCard"
-                    class="el-car"
-                  >
+                  <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>
@@ -166,18 +90,10 @@
         </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 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>
@@ -193,98 +109,48 @@
         </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>
+            <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=""
-            />
+            <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" >
+        <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-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-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 @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>
     <!-- <el-dialog v-model="outerVisible">
       <el-input
         type="textarea"
@@ -300,18 +166,9 @@
         </div>
       </template>
     </el-dialog> -->
-    <WinseaContentModal
-      v-model="outerVisible"
-      title="禁用原因"
-      @on-cancel="handleClose"
-    >
-      <el-input
-        type="textarea"
-        :rows="2"
-        maxlength="50"
-        placeholder="请输入禁用原因，不超过50个字"
-        v-model="disablieForm.disableReasons"
-      >
+    <WinseaContentModal v-model="outerVisible" title="禁用原因" @on-cancel="handleClose">
+      <el-input type="textarea" :rows="2" maxlength="50" placeholder="请输入禁用原因，不超过50个字"
+        v-model="disablieForm.disableReasons">
       </el-input>
       <div class="dialog-footer">
         <el-button @click="outerVisible = false">取 消</el-button>
@@ -319,454 +176,485 @@
       </div>
     </WinseaContentModal>
     <!-- 附件弹框 -->
-    <WinseaContentModal
-      v-model="accessoryTFs"
-      :title="$t('system.noticeCircular.information')"
-      @on-cancel="handleClose"
-    >
+    <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
+      @on-cancel="handleClose">
       <p>查看附件</p>
-      <div
-        style="display: inline-block; margin: 5px"
-        v-for="item in appendixIdss"
-      >
+      <div style="display: inline-block; margin: 5px" v-for="item in appendixIdss">
         <img width="100" height="100" :src="item" alt="" />
       </div>
     </WinseaContentModal>
-    <WinseaContentModal
-      v-model="accesscard"
-      :title="$t('system.noticeCircular.information')"
-      @on-cancel="handleClose1"
-    >
+    <WinseaContentModal v-model="accesscard" :title="$t('system.noticeCircular.information')" @on-cancel="handleClose1">
       <p>查看附件</p>
       <img width="100" height="100" :src="accessurl" alt="" />
     </WinseaContentModal>
   </div>
 </template>
 <script>
-import {
-  selectDriver,
-  billoperatehis,
-  delDriver,
-  disableDriver,
-} from '@/model/transport/index'
-import Pagination from '@/components/Pagination'
-import { provinceAndCityData, CodeToText } from 'element-china-area-data'
-import WsUpload from '@/components/WsUpload'
-import { dayjs, fmoney, EventBus } from 'base-core-lib'
-export default {
-  name: 'viewSpareMoney',
-  components: {
-    WsUpload,
-    Pagination,
-  },
-  watch: {
-    vesselId(val) {
-      this.getList()
+  import {
+    selectDriver,
+    billoperatehis,
+    delDriver,
+    disableDriver,
+  } from '@/model/transport/index'
+  import Pagination from '@/components/Pagination'
+  import {
+    provinceAndCityData,
+    CodeToText
+  } from 'element-china-area-data'
+  import WsUpload from '@/components/WsUpload'
+  import {
+    dayjs,
+    fmoney,
+    EventBus
+  } from 'base-core-lib'
+  export default {
+    name: 'viewSpareMoney',
+    components: {
+      WsUpload,
+      Pagination,
     },
-    isShow(val) {
-      this.showType = val
-    },
-  },
-  data() {
-    return {
-      //弹出框
-      dialogViewSpareMoney: false,
-      dialogApproveFormVisible: false,
-      options_: provinceAndCityData,
-      // 表格显示数据
-      tableDate: [],
-      // 是否显示
-      showType: true,
-      // 年
-      year: '',
-      deptBudgetTotal: 0,
-      currentPage: 1,
-      pageSize: 10,
-      searchKeyWord: '',
-      contractType: 2,
-      startDate: null,
-      endDate: null,
-      carNumber: '',
-      searchTypeText: [],
-      outerVisible: false,
-      //图片
-      fileList: [],
-      // 提交类型
-      submitType: true,
-      size: 10,
-      spanArr: [],
-      pcFlag:1,
-      compId: localStorage.getItem('ws-pf_compId'),
-      deptCircularPage: {},
-      date: {
-        year: dayjs().format('YYYY'),
-        month: dayjs().format('MM'),
-      },
-      disablieForm: {},
-      expands: [], //只展开一行放入当前行id
-      getRowKeys: (row) => {
-        //获取当前行id
-        // console.log(row)
-        return row.id //这里看这一行中需要根据哪个属性值是id
+    watch: {
+      vesselId(val) {
+        this.getList()
       },
-      driverList: [],
-      deptBudgetList: {},
-      historyList: [],
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          return time.getTime() > Date.now()
-        },
+      isShow(val) {
+        this.showType = val
       },
-      appendixIdss: [],
-      accessoryTFs: false,
-      accesscard: false,
-      accessurl: '',
-      residentCityProvincial: '',
-      residentCityMunicipal: '',
-    }
-  },
-  activated() {
-    this.getList()
-    this.showType = this.isShow
-  },
-  methods: {
-    expandsHandle(row) {
-      row.expandsStatus = !row.expandsStatus
-      this.$refs.expandstable.toggleRowExpansion(row)
-    },
-    edit(row) {
-      this.$router.push({
-        name: 'driverManagementedit',
-        query: { id: row.id },
-      })
     },
-    //查找
-    handleLook() {
-      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()
-    },
-    look(row) {
-      this.$router.push({
-        name: 'driverManagementview',
-        query: { id: row.id },
-      })
-    },
-    //添加
-    handleAdd() {
-      console.log(11111)
-      this.$router.push({ name: 'driverManagementadd' })
-    },
-    selectcar(e, row) {
-      console.log(e, row)
-      for (var i = 0; i < row.driverCarInfoList.length; i++) {
-        if (e == row.driverCarInfoList[i].carNumber) {
-          row.carModel = row.driverCarInfoList[i].carModel
-          row.carLength = row.driverCarInfoList[i].carLength
-        }
+    data() {
+      return {
+        //弹出框
+        dialogViewSpareMoney: false,
+        dialogApproveFormVisible: false,
+        options_: provinceAndCityData,
+        // 表格显示数据
+        tableDate: [],
+        // 是否显示
+        showType: true,
+        // 年
+        year: '',
+        deptBudgetTotal: 0,
+        currentPage: 1,
+        pageSize: 10,
+        searchKeyWord: '',
+        contractType: 2,
+        startDate: null,
+        endDate: null,
+        carNumber: '',
+        searchTypeText: [],
+        outerVisible: false,
+        //图片
+        fileList: [],
+        // 提交类型
+        submitType: true,
+        size: 10,
+        spanArr: [],
+        pcFlag: 1,
+        compId: localStorage.getItem('ws-pf_compId'),
+        deptCircularPage: {},
+        date: {
+          year: dayjs().format('YYYY'),
+          month: dayjs().format('MM'),
+        },
+        disablieForm: {},
+        expands: [], //只展开一行放入当前行id
+        getRowKeys: (row) => {
+          //获取当前行id
+          // console.log(row)
+          return row.id //这里看这一行中需要根据哪个属性值是id
+        },
+        driverList: [],
+        deptBudgetList: {},
+        historyList: [],
+        pickerBeginDateBefore: {
+          disabledDate: (time) => {
+            return time.getTime() > Date.now()
+          },
+        },
+        appendixIdss: [],
+        accessoryTFs: false,
+        accesscard: false,
+        accessurl: '',
+        residentCityProvincial: '',
+        residentCityMunicipal: '',
       }
     },
-    stop(row) {
-      this.outerVisible = true
-      this.disablieForm.id = row.id
+    activated() {
+      this.getList()
+      this.showType = this.isShow
     },
-    disableReasons() {
-      this.outerVisible = false
-      this.disablieForm.disableStatusFlag = 0
-      disableDriver(this.disablieForm)
-        .toPromise()
-        .then((response) => {
-          this.$notify.success({
-            title: '成功',
-            message: '禁用成功',
-          })
-          this.getList()
-        })
-        .catch((response) => {
-          EventBus.$emit('error', response.message)
+    methods: {
+      expandsHandle(row) {
+        row.expandsStatus = !row.expandsStatus
+        this.$refs.expandstable.toggleRowExpansion(row)
+      },
+      edit(row) {
+        this.$router.push({
+          name: 'driverManagementedit',
+          query: {
+            id: row.id
+          },
         })
-    },
-    relieve(row) {
-      this.disablieForm.id = row.id
-      this.disablieForm.disableStatusFlag = 1
-      disableDriver(this.disablieForm)
-        .toPromise()
-        .then((response) => {
-          this.$notify.success({
-            title: '成功',
-            message: '解除禁用成功',
-          })
-          this.getList()
+      },
+      //查找
+      handleLook() {
+        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()
+      },
+      look(row) {
+        this.$router.push({
+          name: 'driverManagementview',
+          query: {
+            id: row.id
+          },
         })
-        .catch((response) => {
-          EventBus.$emit('error', response.message)
+      },
+      //添加
+      handleAdd() {
+        console.log(11111)
+        this.$router.push({
+          name: 'driverManagementadd'
         })
-    },
-    deletes(row) {
-      this.$confirm(`司机信息删除后不可恢复，是否确定删除？`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          delDriver({ id: row.id })
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '删除成功',
-              })
-              this.getList()
+      },
+      selectcar(e, row) {
+        console.log(e, row)
+        for (var i = 0; i < row.driverCarInfoList.length; i++) {
+          if (e == row.driverCarInfoList[i].carNumber) {
+            row.carModel = row.driverCarInfoList[i].carModel
+            row.carLength = row.driverCarInfoList[i].carLength
+          }
+        }
+      },
+      stop(row) {
+        this.outerVisible = true
+        this.disablieForm.id = row.id
+      },
+      disableReasons() {
+        this.outerVisible = false
+        this.disablieForm.disableStatusFlag = 0
+        disableDriver(this.disablieForm)
+          .toPromise()
+          .then((response) => {
+            this.$notify.success({
+              title: '成功',
+              message: '禁用成功',
             })
-            .catch((response) => {
-              console.log(response)
-              EventBus.$emit('error', response.message)
+            this.getList()
+          })
+          .catch((response) => {
+            EventBus.$emit('error', response.message)
+          })
+      },
+      relieve(row) {
+        this.disablieForm.id = row.id
+        this.disablieForm.disableStatusFlag = 1
+        disableDriver(this.disablieForm)
+          .toPromise()
+          .then((response) => {
+            this.$notify.success({
+              title: '成功',
+              message: '解除禁用成功',
             })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    handleClose() {
-      this.accessoryTFs = 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() {
-      selectDriver({
-        compId: localStorage.getItem('ws-pf_compId'),
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        pcFlag:this.pcFlag,
-        residentCityProvincial: this.residentCityProvincial,
-        residentCityMunicipal: this.residentCityMunicipal,
-        searchKeyWord: this.searchKeyWord,
-      })
-        .toPromise()
-        .then((response) => {
-          for (var i = 0; i < response.records.length; i++) {
-            if(response.records[i].driverCarInfoList.length>0){
-              response.records[i].carNumber =
-              response.records[i].driverCarInfoList[0].carNumber
-              response.records[i].carModel =
-              response.records[i].driverCarInfoList[0].carModel
-              response.records[i].carLength =
-              response.records[i].driverCarInfoList[0].carLength
-            }
-            response.records[i].expandsStatus = false
-            if (response.records[i].addressUrl != null) {
-              response.records[i].addressUrlArray =
-                response.records[i].addressUrl.split(',')
-              this.fileList[i] = response.records[i].addressUrl.split(',')
-            } else {
-              response.records[i].addressUrlArray = []
+            this.getList()
+          })
+          .catch((response) => {
+            EventBus.$emit('error', response.message)
+          })
+      },
+      deletes(row) {
+        this.$confirm(`司机信息删除后不可恢复，是否确定删除？`, '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            delDriver({
+                id: row.id
+              })
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '删除成功',
+                })
+                this.getList()
+              })
+              .catch((response) => {
+                console.log(response)
+                EventBus.$emit('error', response.message)
+              })
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      handleClose() {
+        this.accessoryTFs = 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() {
+        selectDriver({
+            compId: localStorage.getItem('ws-pf_compId'),
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            pcFlag: this.pcFlag,
+            residentCityProvincial: this.residentCityProvincial,
+            residentCityMunicipal: this.residentCityMunicipal,
+            searchKeyWord: this.searchKeyWord,
+          })
+          .toPromise()
+          .then((response) => {
+            for (var i = 0; i < response.records.length; i++) {
+              if (response.records[i].driverCarInfoList.length > 0) {
+                response.records[i].carNumber =
+                  response.records[i].driverCarInfoList[0].carNumber
+                response.records[i].carModel =
+                  response.records[i].driverCarInfoList[0].carModel
+                response.records[i].carLength =
+                  response.records[i].driverCarInfoList[0].carLength
+              }
+              response.records[i].expandsStatus = false
+              if (response.records[i].addressUrl != null) {
+                response.records[i].addressUrlArray =
+                  response.records[i].addressUrl.split(',')
+                this.fileList[i] = 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.driverList = response
-        })
-    },
-    editClick(row) {
-      var status = ''
-      if (row.status == '待执行' || row.status == '已完成') {
-        status = '执行中'
-      } else if (row.status == '执行中') {
-        status = '已完成'
-      }
-      //cancelButtonClass: "btn-custom-cancel"
-      this.$confirm(`是否将状态改为${status}`, {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          editstatus({ id: row.id })
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '状态修改成功',
+            this.deptCircularPage.currentPage = response.current
+            this.deptCircularPage.pageSize = response.size
+            this.deptBudgetTotal = response.total
+            this.driverList = response
+          })
+      },
+      editClick(row) {
+        var status = ''
+        if (row.status == '待执行' || row.status == '已完成') {
+          status = '执行中'
+        } else if (row.status == '执行中') {
+          status = '已完成'
+        }
+        //cancelButtonClass: "btn-custom-cancel"
+        this.$confirm(`是否将状态改为${status}`, {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            editstatus({
+                id: row.id
               })
-              this.getList()
-            })
-            .catch((response) => {
-              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-            })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    selecttaskType(e) {
-      this.residentCityProvincial = CodeToText[e[0]]
-      this.residentCityMunicipal = CodeToText[e[1]]
-      // this.selectedOptions = e
-    },
-    fujian(row) {
-      if (row.addressUrl === null || row.addressUrl === '') {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
-      } else {
-        this.accessoryTFs = true
-      }
-      this.appendixIdss = row.addressUrlArray
-    },
-    fujian1(item) {
-      if (item.cardAddressUrl === null || item.cardAddressUrl === '') {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
-      } else {
-        this.accesscard = true
-      }
-      this.accessurl = item.cardAddressUrl
-    },
-    handleExamine(row) {
-      this.$router.push({
-        name: 'salesContractExamine',
-        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
+              .toPromise()
+              .then((response) => {
+                this.$notify.success({
+                  title: '成功',
+                  message: '状态修改成功',
+                })
+                this.getList()
+              })
+              .catch((response) => {
+                // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+              })
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      selecttaskType(e) {
+        this.residentCityProvincial = CodeToText[e[0]]
+        this.residentCityMunicipal = CodeToText[e[1]]
+        // this.selectedOptions = e
+      },
+      fujian(row) {
+        if (row.addressUrl === null || row.addressUrl === '') {
+          EventBus.$emit(
+            'warning',
+            this.$t('system.noticeCircular.NoInformation')
+          )
+        } else {
+          this.accessoryTFs = true
+        }
+        this.appendixIdss = row.addressUrlArray
+      },
+      fujian1(item) {
+        if (item.cardAddressUrl === null || item.cardAddressUrl === '') {
+          EventBus.$emit(
+            'warning',
+            this.$t('system.noticeCircular.NoInformation')
+          )
+        } else {
+          this.accesscard = true
+        }
+        this.accessurl = item.cardAddressUrl
+      },
+      handleExamine(row) {
+        this.$router.push({
+          name: 'salesContractExamine',
+          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() {
+        this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
+        this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
+        this.currentPage = 1
+        this.getList()
+      },
     },
-    find() {
-      this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
-      this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
-      this.currentPage = 1
-      this.getList()
-    },
-  },
-}
+  }
 </script>
 <style lang="scss" scoped>
-.connert {
-  width: 90%;
-  margin: 0 auto;
-}
-.vertical-text-left {
-  width: 62px;
-  text-align: right;
-}
-.findValue {
-  margin: 0 10px;
-}
-/deep/.base_header_layout .find.el-button--primary {
-  width: 30px;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-  margin-left:-10px;
-}
-/deep/.base_header_layout .findinput input {
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
-/deep/.el-icon-arrow-right {
-  display: none;
-}
+  .connert {
+    width: 90%;
+    margin: 0 auto;
+  }
+
+  .vertical-text-left {
+    width: 62px;
+    text-align: right;
+  }
+
+  .findValue {
+    margin: 0 10px;
+  }
+
+  /deep/.base_header_layout .find.el-button--primary {
+    width: 30px;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+    margin-left: -10px;
+  }
+
+  /deep/.base_header_layout .findinput input {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
+
+  /deep/.el-icon-arrow-right {
+    display: none;
+  }
+
+  /deep/.el-pagination {
+    text-align: center;
+  }
+
+  .ws-info-table {
+    border-left: 1px solid #e9ecf7;
+    border-top: 1px solid #e9ecf7;
+  }
+
+  /deep/.ws-info-table .el-form-item {
+    border-right: 1px solid #e9ecf7;
+    border-bottom: 1px solid #e9ecf7;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__label {
+    text-align: center;
+    background: #f6f7fc;
+    color: #8890b1;
+    font-size: 12px;
+  }
+
+  /deep/.ws-info-table .el-form-item.company,
+  /deep/.ws-info-table .el-form-item.personage {
+    width: 33.333%;
+  }
+
+  /deep/.ws-info-table .el-form-item.name {
+    width: 15.665%;
+  }
+
+  /deep/.ws-info-table .el-form-item.card {
+    width: 17.665%;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__content {
+    text-align: center;
+    border-left: 1px solid #e9ecf7;
+  }
+
+  /deep/.el-table .el-table__header .cell,
+  /deep/.el-table .el-table__body .cell {
+    text-align: center;
+  }
+
+  /deep/.el-table th.is-leaf,
+  .el-table td {
+    border-right: 1px solid #eee;
+  }
+
+  .el-button--text {
+    color: #5878e8;
+  }
+
+  .el-button--primary {
+    background: #5878e8;
+  }
+
+  //操作按钮
+  .record,
+  .adjustment,
+  .record1 {
+    display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+    font-size: 14px;
+  }
+
+  .record1 {
+    width: 38px;
+    height: 32px;
+  }
 
-/deep/.el-pagination {
-  text-align: center;
-}
-.ws-info-table {
-  border-left: 1px solid #e9ecf7;
-  border-top: 1px solid #e9ecf7;
-}
-/deep/.ws-info-table .el-form-item {
-  border-right: 1px solid #e9ecf7;
-  border-bottom: 1px solid #e9ecf7;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  text-align: center;
-  background: #f6f7fc;
-  color: #8890b1;
-  font-size: 12px;
-}
+  .record:after {
+    position: absolute;
+    content: '';
+    display: block;
+    top: 9px;
+    right: -7px;
+    width: 1px;
+    height: 12px;
+    background: #e9ecf7;
+  }
 
-/deep/.ws-info-table .el-form-item.company,
-/deep/.ws-info-table .el-form-item.personage {
-  width: 33.333%;
-}
-/deep/.ws-info-table .el-form-item.name {
-  width: 15.665%;
-}
-/deep/.ws-info-table .el-form-item.card {
-  width: 17.665%;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  text-align: center;
-  border-left: 1px solid #e9ecf7;
-}
-/deep/.el-table .el-table__header .cell,
-/deep/.el-table .el-table__body .cell {
-  text-align: center;
-}
-/deep/.el-table th.is-leaf,
-.el-table td {
-  border-right: 1px solid #eee;
-}
-.el-button--text {
-  color: #5878e8;
-}
-.el-button--primary {
-  background: #5878e8;
-}
-//操作按钮
-.record,
-.adjustment ,.record1{
-  display: inline-block;
-  color: #5878e8;
-  padding: 0 4px !important;
-  position: relative;
-  font-size: 14px;
-}
-.record1{
-  width: 38px;
-  height: 32px;
-}
-.record:after {
-  position: absolute;
-  content: '';
-  display: block;
-  top: 9px;
-  right: -7px;
-  width: 1px;
-  height: 12px;
-  background: #e9ecf7;
-}
-/deep/.el-table td{
-      border-right: 1px solid #eee;
-}
+  /deep/.el-table td {
+    border-right: 1px solid #eee;
+  }
 </style>

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -5,88 +5,35 @@
       <template slot="left"> </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"
-          />
+        <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>
-        <span style="width: 142px; display: inline-block; color: #8890b1"
-          >类型：</span
-        >
-        <ws-select
-          v-model="tranTypeKeyText"
-          placeholder=""
-          class="typeselect"
-          @change="selecttranType"
-          :value="tranTypeKey"
-        >
-          <ws-option
-            v-for="item in tranTypeList"
-            :key="item.value"
-            :label="item.value"
-            :value="item.value"
-            style="color: #8890b1"
-          />
+        <span style="width: 142px; display: inline-block; color: #8890b1">类型：</span>
+        <ws-select v-model="tranTypeKeyText" placeholder="" class="typeselect" @change="selecttranType"
+          :value="tranTypeKey">
+          <ws-option v-for="item in tranTypeList" :key="item.value" :label="item.value" :value="item.value"
+            style="color: #8890b1" />
         </ws-select>
         <div>
-          <span style="display: inline-block; width: 70px; color: #8890b1"
-            >接单日期：</span
-          >
+          <span style="display: inline-block; width: 70px; color: #8890b1">接单日期：</span>
         </div>
-        <el-date-picker
-          v-model="inOutDate"
-          type="daterange"
-          align="right"
-          unlink-panels
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        >
+        <el-date-picker v-model="inOutDate" type="daterange" align="right" unlink-panels range-separator="至"
+          start-placeholder="开始日期" end-placeholder="结束日期">
         </el-date-picker>
-        <ws-input
-          v-model="searchKeyWord"
-          placeholder="可按发货人、收货人、任务编号查找"
-          clearable
-          maxlength="500"
-          type="input"
-          class="findValue"
-          @keyup.enter.native="find()"
-        ></ws-input>
-        <ws-button class="find" type="primary" @click="find()"
-          ><img
-            width="16"
-            height="16"
-            style="
+        <ws-input v-model="searchKeyWord" placeholder="可按发货人、收货人、任务编号查找" clearable maxlength="500" type="input"
+          class="findValue" @keyup.enter.native="find()"></ws-input>
+        <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>
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button>
       </template>
     </BaseHeaderLayout>
-    <div>
-      <el-table
-        class="wenzi"
-        :data="warehouseList.records"
-        style="width: 100%"
-        height="780"
-      >
+      <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>
@@ -106,48 +53,27 @@
         </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>
+            <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>
+            <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"
-        >
+        <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)"
-            >
+            <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 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>
@@ -158,10 +84,7 @@
                   </div>
                   <div>
                     <div class="vertical-circle"></div>
-                    <div
-                      v-if="index != historyList.length - 1"
-                      class="vertical-line"
-                    ></div>
+                    <div v-if="index != historyList.length - 1" class="vertical-line"></div>
                   </div>
                   <div class="vertical-text">
                     {{ item.operateUser }}<br />{{ item.dealMsg }}
@@ -169,14 +92,8 @@
                 </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=""
-            />
+            <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">
@@ -195,495 +112,546 @@
       </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 @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>
   </div>
 </template>
 <script>
-import { shippingList, stateRec } from '@/model/transport/index'
-import { downloadFile } from '@/utils/batchDown'
-import Pagination from '@/components/Pagination'
-import WsUpload from '@/components/WsUpload'
-import { dayjs, fmoney, EventBus } from 'base-core-lib'
-export default {
-  name: 'viewSpareMoney',
-  components: {
-    WsUpload,
-    Pagination,
-  },
-  watch: {
-    vesselId(val) {
-      this.getList()
+  import {
+    shippingList,
+    stateRec
+  } from '@/model/transport/index'
+  import {
+    downloadFile
+  } from '@/utils/batchDown'
+  import Pagination from '@/components/Pagination'
+  import WsUpload from '@/components/WsUpload'
+  import {
+    dayjs,
+    fmoney,
+    EventBus
+  } from 'base-core-lib'
+  export default {
+    name: 'viewSpareMoney',
+    components: {
+      WsUpload,
+      Pagination,
     },
-    isShow(val) {
-      this.showType = val
+    watch: {
+      vesselId(val) {
+        this.getList()
+      },
+      isShow(val) {
+        this.showType = val
+      },
     },
-  },
-  data() {
-    return {
-      //弹出框
-      dialogViewSpareMoney: false,
-      dialogApproveFormVisible: false,
-      // 船舶类型
-      monetaryKey: null,
-      // 表格显示数据
-      tableDate: [],
+    data() {
+      return {
+        //弹出框
+        dialogViewSpareMoney: false,
+        dialogApproveFormVisible: false,
+        // 船舶类型
+        monetaryKey: null,
+        // 表格显示数据
+        tableDate: [],
 
-      // 是否显示
-      showType: true,
-      // 年
-      year: '',
-      currentPage: 1,
-      pageSize: 10,
-      feedbackFlag: 4,
-      searchType: 1,
-      searchTypeText: '执行中',
-      tranTypeKey:5,
-      tranTypeKeyText: '全部',
-      searchKeyWord: '',
-      contractType: 2,
-      taskTypeList: [
-        { value: '执行中', type: 4 },
-        { value: '已完货', type: 5 },
-        { value: '全部任务', type: 6 },
-      ],
-      tranTypeList: [
-        { value: '汽运', type: 1 },
-        { value: '火运', type: 2 },
-        { value: '船运', type: 3 },
-        { value: '他运', type: 4 },
-        { value: '全部', type: 5 },
-      ],
-      // 提交类型
-      submitType: true,
-      size: 10,
-      primary: '1',
-      spanArr: [],
-      warehouseName: '',
-      deptBudgetTotal: 0,
-      compId: localStorage.getItem('ws-pf_compId'),
-      deptCircularPage: {},
-      warehouseList: [],
-      deptBudgetList: {},
-      historyList: [],
-      value2: '',
-      inOutDate: [],
-      pickerOptions: [],
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          return time.getTime() > Date.now()
-        },
-      },
-      accessoryTFs: false,
-    }
-  },
-  mounted() {
-    this.getList()
-  },
-  methods: {
-    //接口
-    getList() {
-      shippingList({
+        // 是否显示
+        showType: true,
+        // 年
+        year: '',
+        currentPage: 1,
+        pageSize: 10,
+        feedbackFlag: 4,
+        searchType: 1,
+        searchTypeText: '执行中',
+        tranTypeKey: 5,
+        tranTypeKeyText: '全部',
+        searchKeyWord: '',
+        contractType: 2,
+        taskTypeList: [{
+            value: '执行中',
+            type: 4
+          },
+          {
+            value: '已完货',
+            type: 5
+          },
+          {
+            value: '全部任务',
+            type: 6
+          },
+        ],
+        tranTypeList: [{
+            value: '汽运',
+            type: 1
+          },
+          {
+            value: '火运',
+            type: 2
+          },
+          {
+            value: '船运',
+            type: 3
+          },
+          {
+            value: '他运',
+            type: 4
+          },
+          {
+            value: '全部',
+            type: 5
+          },
+        ],
+        // 提交类型
+        submitType: true,
+        size: 10,
+        primary: '1',
+        spanArr: [],
+        warehouseName: '',
+        deptBudgetTotal: 0,
         compId: localStorage.getItem('ws-pf_compId'),
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        tranTypeKey:this.tranTypeKey,
-        feedbackFlag: this.feedbackFlag,
-        startDate: this.startDate,
-        endDate: this.endDate,
-        searchKeyWord: this.searchKeyWord,
-      })
-        .toPromise()
-        .then((response) => {
-          this.warehouseList = response
-          // this.deptCircularPage.currentPage = response.current
-          // this.deptCircularPage.pageSize = response.size
-          this.deptBudgetTotal = response.total
-        })
-    },
-    // statusquery(status){
-    //   if (status == 1) {
-    //     this.primary = 1
-    //   } else if (status == 2) {
-    //     this.primary = 2
-    //   } else {
-    //     this.primary = 3
-    //   }
-    //   this.feedbackFlag = status
-    //   this.getList()
-    // },
-    delivery(item) {
-      this.$router.push({
-        path: 'warehouseManagementDelivery',
-        query: {
-          baseId: item.warehouseId,
-          positionId: item.binNumberId,
-          warehouseName: item.warehouseName,
-          binNumber: item.binNumber,
-          capacity: item.capacity,
+        deptCircularPage: {},
+        warehouseList: [],
+        deptBudgetList: {},
+        historyList: [],
+        value2: '',
+        inOutDate: [],
+        pickerOptions: [],
+        pickerBeginDateBefore: {
+          disabledDate: (time) => {
+            return time.getTime() > Date.now()
+          },
         },
-      })
+        accessoryTFs: false,
+      }
+    },
+    mounted() {
+      this.getList()
     },
-    getSpanArr(data) {
-      let that = this
+    methods: {
+      //接口
+      getList() {
+        shippingList({
+            compId: localStorage.getItem('ws-pf_compId'),
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            tranTypeKey: this.tranTypeKey,
+            feedbackFlag: this.feedbackFlag,
+            startDate: this.startDate,
+            endDate: this.endDate,
+            searchKeyWord: this.searchKeyWord,
+          })
+          .toPromise()
+          .then((response) => {
+            this.warehouseList = response
+            // this.deptCircularPage.currentPage = response.current
+            // this.deptCircularPage.pageSize = response.size
+            this.deptBudgetTotal = response.total
+          })
+      },
+      // statusquery(status){
+      //   if (status == 1) {
+      //     this.primary = 1
+      //   } else if (status == 2) {
+      //     this.primary = 2
+      //   } else {
+      //     this.primary = 3
+      //   }
+      //   this.feedbackFlag = status
+      //   this.getList()
+      // },
+      delivery(item) {
+        this.$router.push({
+          path: 'warehouseManagementDelivery',
+          query: {
+            baseId: item.warehouseId,
+            positionId: item.binNumberId,
+            warehouseName: item.warehouseName,
+            binNumber: item.binNumber,
+            capacity: item.capacity,
+          },
+        })
+      },
+      getSpanArr(data) {
+        let that = this
 
-      //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
+        //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
 
-      that.spanArr = []
+        that.spanArr = []
 
-      that.pos = 0
+        that.pos = 0
 
-      // //遍历数据
+        // //遍历数据
 
-      data.forEach((item, index) => {
-        //判断是否是第一项
+        data.forEach((item, index) => {
+          //判断是否是第一项
 
-        if (index === 0) {
-          this.spanArr.push(1)
-          this.pos = 0
-        } else {
-          //不是第一项时，就根据标识去存储
-          if (data[index].warehouseNumViewList.length > 1) {
-            查找到符合条件的数据时每次要把之前存储的数据 + 1
-            this.spanArr[this.pos] = data[index].warehouseNumViewList.length
-            this.spanArr.push(0)
-          } else {
-            // 没有符合的数据时，要记住当前的index
+          if (index === 0) {
             this.spanArr.push(1)
-            this.pos = index
+            this.pos = 0
+          } else {
+            //不是第一项时，就根据标识去存储
+            if (data[index].warehouseNumViewList.length > 1) {
+              查找到符合条件的数据时每次要把之前存储的数据 + 1
+              this.spanArr[this.pos] = data[index].warehouseNumViewList.length
+              this.spanArr.push(0)
+            } else {
+              // 没有符合的数据时，要记住当前的index
+              this.spanArr.push(1)
+              this.pos = index
+            }
           }
-        }
-      })
-    },
-    //查看
-    trainSee(row) {
-      if (row.tranType == '汽运') {
-        this.$router.push({
-          path: 'tranManagementReceivingloadingLook',
-          query: {
-            id: row.id,
-          },
         })
-      } else if (row.tranType == '船运') {
-        this.$router.push({
-          path: 'tranManagementUnShippingFeedbackLook',
-          query: {
-            id: row.id,
-          },
-        })
-      }
-      else if (row.tranType == '火运') {
-        this.$router.push({
-          path: 'tranManagementFireReceivingFeedbackLook',
-          query: {
-            id: row.id,
-          },
-        })
-      }else if (row.tranType == '他运') {
-        this.$router.push({
-          path: 'tranManagementthirdpartnarReceivingLook',
-          query: {
-            id: row.id,
-          },
-        })
-      }
-    },
+      },
+      //查看
+      trainSee(row) {
+        if (row.tranType == '汽运') {
+          this.$router.push({
+            path: 'tranManagementReceivingloadingLook',
+            query: {
+              id: row.id,
+            },
+          })
+        } else if (row.tranType == '船运') {
+          this.$router.push({
+            path: 'tranManagementUnShippingFeedbackLook',
+            query: {
+              id: row.id,
+            },
+          })
+        } else if (row.tranType == '火运') {
+          this.$router.push({
+            path: 'tranManagementFireReceivingFeedbackLook',
+            query: {
+              id: row.id,
+            },
+          })
+        } else if (row.tranType == '他运') {
+          this.$router.push({
+            path: 'tranManagementthirdpartnarReceivingLook',
+            query: {
+              id: row.id,
+            },
+          })
+        }
+      },
 
-    //反馈
-    feedback(row) {
-      if (row.tranType == '汽运') {
-      this.$router.push({
-        path: 'tranManagementReceivingloading',
-        query: {
-          id: row.id,
-        },
-      })
-      }
-      if (row.tranType == '火运') {
-      this.$router.push({
-        path: 'tranManagementFireReceivingFeedback',
-        query: {
-          id: row.id,
-        },
-      })
-      } else if (row.tranType == '船运') {
-        this.$router.push({
-          path: 'tranManagementUnShippingFeedback',
-          query: {
-            id: row.id,
-          },
-        })
-      }else if (row.tranType == '他运') {
-        this.$router.push({
-          path: 'tranManagementthirdpartnarReceiving',
-          query: {
-            id: row.id,
-          },
-        })
-      }
-    },
-    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')
-          )
+      //反馈
+      feedback(row) {
+        if (row.tranType == '汽运') {
+          this.$router.push({
+            path: 'tranManagementReceivingloading',
+            query: {
+              id: row.id,
+            },
+          })
         }
-      }
-      return fmt
-    },
-    handleClose() {
-      this.accessoryTFs = false
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getList()
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val
-      console.log(`当前页: ${val}`)
-      this.getList()
-    },
-    editClick(row) {
-      var status = ''
-      if (row.receivingStatus == '待执行' || row.receivingStatus == '已完货') {
-        status = '执行中'
-      } else if (row.receivingStatus == '执行中') {
-        status = '已完货'
-      }
-      //cancelButtonClass: "btn-custom-cancel"
-      this.$confirm(`是否将状态改为${status}`, {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          stateRec({ id: row.id })
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '状态修改成功',
+        if (row.tranType == '火运') {
+          this.$router.push({
+            path: 'tranManagementFireReceivingFeedback',
+            query: {
+              id: row.id,
+            },
+          })
+        } else if (row.tranType == '船运') {
+          this.$router.push({
+            path: 'tranManagementUnShippingFeedback',
+            query: {
+              id: row.id,
+            },
+          })
+        } else if (row.tranType == '他运') {
+          this.$router.push({
+            path: 'tranManagementthirdpartnarReceiving',
+            query: {
+              id: row.id,
+            },
+          })
+        }
+      },
+      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.accessoryTFs = false
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+      editClick(row) {
+        var status = ''
+        if (row.receivingStatus == '待执行' || row.receivingStatus == '已完货') {
+          status = '执行中'
+        } else if (row.receivingStatus == '执行中') {
+          status = '已完货'
+        }
+        //cancelButtonClass: "btn-custom-cancel"
+        this.$confirm(`是否将状态改为${status}`, {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            stateRec({
+                id: row.id
               })
-              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.feedbackFlag = this.taskTypeList[i].type
+              .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.feedbackFlag = this.taskTypeList[i].type
+          }
         }
-      }
-      this.getList()
-    },
-    selecttranType(e) {
-      for (var i = 0; i < this.tranTypeList.length; i++) {
-        if (this.tranTypeList[i].value == e) {
-          this.tranTypeKey = this.tranTypeList[i].type
+        this.getList()
+      },
+      selecttranType(e) {
+        for (var i = 0; i < this.tranTypeList.length; i++) {
+          if (this.tranTypeList[i].value == e) {
+            this.tranTypeKey = this.tranTypeList[i].type
+          }
         }
-      }
-      this.getList()
-    },
-    fujian(row) {
-      if (
-        row.receiveAttachmentPath === null ||
-        row.receiveAttachmentPath === ''
-      ) {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
-      } else {
-        this.accessoryTFs = true
-      }
-      this.appendixIdss = row.receiveAttachmentPath
-    },
-    handleExamine(row) {
-      this.$router.push({
-        name: 'salesContractExamine',
-        query: { id: row.id },
-      })
-    },
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    handleCloe() {
-      this.dialogViewSpareMoney = false
-    },
-    history(row) {
-      billoperatehis({ id: row.id })
-        .toPromise()
-        .then((response) => {
-          this.historyList = response
+        this.getList()
+      },
+      fujian(row) {
+        if (
+          row.receiveAttachmentPath === null ||
+          row.receiveAttachmentPath === ''
+        ) {
+          EventBus.$emit(
+            'warning',
+            this.$t('system.noticeCircular.NoInformation')
+          )
+        } else {
+          this.accessoryTFs = true
+        }
+        this.appendixIdss = row.receiveAttachmentPath
+      },
+      handleExamine(row) {
+        this.$router.push({
+          name: 'salesContractExamine',
+          query: {
+            id: row.id
+          },
         })
-    },
-    find() {
-      if (this.inOutDate != null) {
-        if (this.inOutDate.length > 0) {
-          this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
-          this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
+      },
+      // 关闭 dialog时 处理文件url 初始化upload组件
+      handleCloe() {
+        this.dialogViewSpareMoney = false
+      },
+      history(row) {
+        billoperatehis({
+            id: row.id
+          })
+          .toPromise()
+          .then((response) => {
+            this.historyList = response
+          })
+      },
+      find() {
+        if (this.inOutDate != null) {
+          if (this.inOutDate.length > 0) {
+            this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
+            this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
+          } else {
+            this.startDate = ''
+            this.endDate = ''
+          }
         } else {
           this.startDate = ''
           this.endDate = ''
         }
-      } else {
-        this.startDate = ''
-        this.endDate = ''
-      }
-      this.currentPage = 1
-      this.getList()
+        this.currentPage = 1
+        this.getList()
+      },
     },
-  },
-}
+  }
 </script>
 <style lang="scss" scoped>
-.connert {
-  width: 90%;
-  margin: 0 auto;
-}
-.vertical-text-left {
-  width: 62px;
-  text-align: right;
-}
-.el-button--primary {
-  background-color: #5878e8;
-  border-color: #5878e8;
-}
-.el-button--default {
-  color: #8890b1;
-  border-color: #e8eaf1;
-}
-/deep/.base_header_layout .grid-content.right .find.el-button--primary {
-  width: 30px;
-  margin-left: 0;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-}
-/deep/.findValue .el-input__inner {
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
-.completed.el-button--default {
-  border-color: #5878e8;
-  background-color: #f6f7fc;
-  color: #5878e8;
-}
-.putstorage.el-button--default,
-.deliverystorage.el-button--default {
-  border-color: #8890b1;
-  background-color: #fff;
-  color: #8890b1;
-}
-/deep/.el-table td,
-/deep/.el-table th.is-leaf {
-  border-right: 1px solid #e9ecf7;
-  text-align: center;
-}
-/deep/.el-table tr td:first-child,
-/deep/.el-table tr th.is-leaf:first-child {
-  border-left: 1px solid #e9ecf7;
-}
-.record,
-.record1,
-.adjustment {
-  display: inline-block;
-  color: #5878e8;
-  padding: 0 4px !important;
-  position: relative;
-  font-size: 14px;
-}
-.record:after {
-  position: absolute;
-  content: '';
-  display: block;
-  top: 5px;
-  right: -2px;
-  width: 1px;
-  height: 12px;
-  background: #e9ecf7;
-}
-.el-row {
-  height: 60px;
-}
-.base_header_layout .grid-content {
-  margin-top: 80px;
-}
+  .connert {
+    width: 90%;
+    margin: 0 auto;
+  }
+
+  .vertical-text-left {
+    width: 62px;
+    text-align: right;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+  }
+
+  .el-button--default {
+    color: #8890b1;
+    border-color: #e8eaf1;
+  }
+
+  /deep/.base_header_layout .grid-content.right .find.el-button--primary {
+    width: 30px;
+    margin-left: 0;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+
+  /deep/.findValue .el-input__inner {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
+
+  .completed.el-button--default {
+    border-color: #5878e8;
+    background-color: #f6f7fc;
+    color: #5878e8;
+  }
+
+  .putstorage.el-button--default,
+  .deliverystorage.el-button--default {
+    border-color: #8890b1;
+    background-color: #fff;
+    color: #8890b1;
+  }
+
+  /deep/.el-table td,
+  /deep/.el-table th.is-leaf {
+    border-right: 1px solid #e9ecf7;
+    text-align: center;
+  }
+
+  /deep/.el-table tr td:first-child,
+  /deep/.el-table tr th.is-leaf:first-child {
+    border-left: 1px solid #e9ecf7;
+  }
+
+  .record,
+  .record1,
+  .adjustment {
+    display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+    font-size: 14px;
+  }
+
+  .record:after {
+    position: absolute;
+    content: '';
+    display: block;
+    top: 5px;
+    right: -2px;
+    width: 1px;
+    height: 12px;
+    background: #e9ecf7;
+  }
+
+  .el-row {
+    height: 60px;
+  }
+
+  .base_header_layout .grid-content {
+    margin-top: 80px;
+  }
+
+  .el-input--small .el-input__inner {
+    margin-left: 20px;
+  }
+
+  .el-range-editor--small.el-input__inner {
+    height: 32px;
+    margin: 0 10px;
+  }
+
+  //状态样式
+  .executory,
+  .inExecution,
+  .done {
+    width: 6px;
+    height: 6px;
+    display: inline-block;
+    border-radius: 50%;
+    position: relative;
+    top: -1px;
+    font-size: 14px;
+  }
+
+  .executory {
+    background: #ff9f24;
+  }
+
+  .inExecution {
+    background: #5878e8;
+  }
+
+  .done {
+    background: #50cad4;
+  }
+
+  // .record, .adjustment {
+  //     display: inline-block;
+  //     color: #5878e8;
+  //     padding: 0 4px !important;
+  //     position: relative;
+  //     font-size: 14px;
+  // }
+  /deep/.el-pagination {
+    text-align: center;
+    white-space: nowrap;
+    padding: 2px 5px;
+    color: #303133;
+    font-weight: 700;
+    margin-bottom: 20px;
+  }
+
+  .el-select {
+    width: 30%;
+    margin-right: 10px;
+  }
 
-.el-input--small .el-input__inner {
-  margin-left: 20px;
-}
-.el-range-editor--small.el-input__inner {
-  height: 32px;
-  margin: 0 10px;
-}
-//状态样式
-.executory,
-.inExecution,
-.done {
-  width: 6px;
-  height: 6px;
-  display: inline-block;
-  border-radius: 50%;
-  position: relative;
-  top: -1px;
-  font-size: 14px;
-}
-.executory {
-  background: #ff9f24;
-}
-.inExecution {
-  background: #5878e8;
-}
-.done {
-  background: #50cad4;
-}
-// .record, .adjustment {
-//     display: inline-block;
-//     color: #5878e8;
-//     padding: 0 4px !important;
-//     position: relative;
-//     font-size: 14px;
-// }
-/deep/.el-pagination {
-  text-align: center;
-  white-space: nowrap;
-  padding: 2px 5px;
-  color: #303133;
-  font-weight: 700;
-  margin-bottom: 20px;
-}
-.el-select {
-  width: 30%;
-  margin-right: 10px;
-}
-/deep/.typeselect .el-input__inner {
-  color: #8890b1;
-}
+  /deep/.typeselect .el-input__inner {
+    color: #8890b1;
+  }
 </style>

src/views/tranManagement/tranManagementShipping.vue

@@ -5,70 +5,29 @@
       <template slot="left"> </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"
-          />
+        <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>
         <div>
-          <span style="display: inline-block; width: 70px; color: #8890b1"
-            >接单日期：</span
-          >
+          <span style="display: inline-block; width: 70px; color: #8890b1">接单日期：</span>
         </div>
-        <el-date-picker
-          v-model="inOutDate"
-          type="daterange"
-          align="right"
-          unlink-panels
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        >
+        <el-date-picker v-model="inOutDate" type="daterange" align="right" unlink-panels range-separator="至"
+          start-placeholder="开始日期" end-placeholder="结束日期">
         </el-date-picker>
-        <ws-input
-          v-model="searchKeyWord"
-          placeholder="可按发货人、收货人、任务编号查找"
-          clearable
-          maxlength="500"
-          type="input"
-          class="findValue"
-          @keyup.enter.native="find()"
-        ></ws-input>
-        <ws-button class="find" type="primary" @click="find()"
-          ><img
-            width="16"
-            height="16"
-            style="
+        <ws-input v-model="searchKeyWord" placeholder="可按发货人、收货人、任务编号查找" clearable maxlength="500" type="input"
+          class="findValue" @keyup.enter.native="find()"></ws-input>
+        <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>
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button>
       </template>
     </BaseHeaderLayout>
-    <div>
-      <el-table
-        class="wenzi"
-        :data="warehouseList.records"
-        style="width: 100%"
-        height="780"
-      >
+      <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="运输任务编号">
@@ -78,62 +37,39 @@
         <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 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>
+            <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">
+        <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)"
-            >
+            <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 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 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 v-if="index != historyList.length - 1" class="vertical-line"></div>
                   </div>
                   <div class="vertical-text">
                     {{ item.operateUser }}<br />{{ item.dealMsg }}
@@ -141,14 +77,8 @@
                 </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=""
-            />
+            <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">
@@ -165,427 +95,466 @@
         </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 @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>
-import { shippingList, alsostate } from '@/model/transport/index'
-import Pagination from '@/components/Pagination'
-import WsUpload from '@/components/WsUpload'
-import { EventBus } from 'base-core-lib'
-export default {
-  name: 'viewSpareMoney',
-  components: {
-    WsUpload,
-    Pagination,
-  },
-  watch: {
-    vesselId(val) {
-      this.getList()
+  import {
+    shippingList,
+    alsostate
+  } from '@/model/transport/index'
+  import Pagination from '@/components/Pagination'
+  import WsUpload from '@/components/WsUpload'
+  import {
+    EventBus
+  } from 'base-core-lib'
+  export default {
+    name: 'viewSpareMoney',
+    components: {
+      WsUpload,
+      Pagination,
     },
-    isShow(val) {
-      this.showType = val
-    },
-  },
-  data() {
-    return {
-      //弹出框
-      dialogViewSpareMoney: false,
-      dialogApproveFormVisible: false,
-      // 船舶类型
-      monetaryKey: null,
-      // 表格显示数据
-      tableDate: [],
-
-      // 是否显示
-      showType: true,
-      // 年
-      year: '',
-      pickerOptions: {},
-      value2: '',
-      deptBudgetTotal: 0,
-      currentPage: 1,
-      tranTypeKey: 3,
-      pageSize: 10,
-      searchType: 1,
-      searchTypeText: '执行中',
-      taskTypeList: [
-        { value: '执行中', type: 1 },
-        { value: '已完成', type: 2 },
-        { value: '全部任务', type: '' },
-      ],
-      searchKeyWord: '',
-      contractType: 2,
-      inOutDate: [],
-
-      // 提交类型
-      submitType: true,
-      size: 10,
-      spanArr: [],
-      warehouseName: '',
-      compId: localStorage.getItem('ws-pf_compId'),
-      deptCircularPage: {},
-      warehouseList: [],
-      deptBudgetList: {},
-      historyList: [],
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          return time.getTime() > Date.now()
-        },
+    watch: {
+      vesselId(val) {
+        this.getList()
+      },
+      isShow(val) {
+        this.showType = val
       },
-      accessoryTFs: false,
-    }
-  },
-  activated() {
-    this.getList()
-    this.showType = this.isShow
-  },
-  methods: {
-    getList() {
-      shippingList({
-        compId: localStorage.getItem('ws-pf_compId'),
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        contractType: this.contractType,
-        tranTypeKey: this.tranTypeKey,
-        searchType: this.searchType,
-        startDate: this.startDate,
-        endDate: this.endDate,
-        searchKeyWord: this.searchKeyWord,
-      })
-        .toPromise()
-        .then((response) => {
-          // for (let i = 0; i < response.records.length; i++) {
-          //   response.records[i].send=response.records[i].send.replace(/\n/g, '<br>')
-          //   response.records[i].receive=response.records[i].receive.replace(/\n/g, '<br>')
-          // }
-          this.warehouseList = response
-          this.deptCircularPage.currentPage = response.current
-          this.deptCircularPage.pageSize = response.size
-          this.deptBudgetTotal = response.total
-        })
     },
-    delivery(item) {
-      this.$router.push({
-        path: 'warehouseManagementDelivery',
-        query: {
-          baseId: item.warehouseId,
-          positionId: item.binNumberId,
-          warehouseName: item.warehouseName,
-          binNumber: item.binNumber,
-          capacity: item.capacity,
+    data() {
+      return {
+        //弹出框
+        dialogViewSpareMoney: false,
+        dialogApproveFormVisible: false,
+        // 船舶类型
+        monetaryKey: null,
+        // 表格显示数据
+        tableDate: [],
+
+        // 是否显示
+        showType: true,
+        // 年
+        year: '',
+        pickerOptions: {},
+        value2: '',
+        deptBudgetTotal: 0,
+        currentPage: 1,
+        tranTypeKey: 3,
+        pageSize: 10,
+        searchType: 1,
+        searchTypeText: '执行中',
+        taskTypeList: [{
+            value: '执行中',
+            type: 1
+          },
+          {
+            value: '已完成',
+            type: 2
+          },
+          {
+            value: '全部任务',
+            type: ''
+          },
+        ],
+        searchKeyWord: '',
+        contractType: 2,
+        inOutDate: [],
+
+        // 提交类型
+        submitType: true,
+        size: 10,
+        spanArr: [],
+        warehouseName: '',
+        compId: localStorage.getItem('ws-pf_compId'),
+        deptCircularPage: {},
+        warehouseList: [],
+        deptBudgetList: {},
+        historyList: [],
+        pickerBeginDateBefore: {
+          disabledDate: (time) => {
+            return time.getTime() > Date.now()
+          },
         },
-      })
+        accessoryTFs: false,
+      }
+    },
+    activated() {
+      this.getList()
+      this.showType = this.isShow
     },
-    getSpanArr(data) {
-      let that = this
+    methods: {
+      getList() {
+        shippingList({
+            compId: localStorage.getItem('ws-pf_compId'),
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            contractType: this.contractType,
+            tranTypeKey: this.tranTypeKey,
+            searchType: this.searchType,
+            startDate: this.startDate,
+            endDate: this.endDate,
+            searchKeyWord: this.searchKeyWord,
+          })
+          .toPromise()
+          .then((response) => {
+            // for (let i = 0; i < response.records.length; i++) {
+            //   response.records[i].send=response.records[i].send.replace(/\n/g, '<br>')
+            //   response.records[i].receive=response.records[i].receive.replace(/\n/g, '<br>')
+            // }
+            this.warehouseList = response
+            this.deptCircularPage.currentPage = response.current
+            this.deptCircularPage.pageSize = response.size
+            this.deptBudgetTotal = response.total
+          })
+      },
+      delivery(item) {
+        this.$router.push({
+          path: 'warehouseManagementDelivery',
+          query: {
+            baseId: item.warehouseId,
+            positionId: item.binNumberId,
+            warehouseName: item.warehouseName,
+            binNumber: item.binNumber,
+            capacity: item.capacity,
+          },
+        })
+      },
+      getSpanArr(data) {
+        let that = this
 
-      //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
+        //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
 
-      that.spanArr = []
+        that.spanArr = []
 
-      that.pos = 0
+        that.pos = 0
 
-      // //遍历数据
+        // //遍历数据
 
-      data.forEach((item, index) => {
-        //判断是否是第一项
+        data.forEach((item, index) => {
+          //判断是否是第一项
 
-        if (index === 0) {
-          this.spanArr.push(1)
-          this.pos = 0
-        } else {
-          //不是第一项时，就根据标识去存储
-          if (data[index].warehouseNumViewList.length > 1) {
-            查找到符合条件的数据时每次要把之前存储的数据 + 1
-            this.spanArr[this.pos] = data[index].warehouseNumViewList.length
-            this.spanArr.push(0)
-          } else {
-            // 没有符合的数据时，要记住当前的index
+          if (index === 0) {
             this.spanArr.push(1)
-            this.pos = index
+            this.pos = 0
+          } else {
+            //不是第一项时，就根据标识去存储
+            if (data[index].warehouseNumViewList.length > 1) {
+              查找到符合条件的数据时每次要把之前存储的数据 + 1
+              this.spanArr[this.pos] = data[index].warehouseNumViewList.length
+              this.spanArr.push(0)
+            } else {
+              // 没有符合的数据时，要记住当前的index
+              this.spanArr.push(1)
+              this.pos = index
+            }
           }
-        }
-      })
-    },
-    //查看
-    handleLook(row) {
-      this.$router.push({
-        name: 'tshippingDispatchingview',
-        query: { id: row.id },
-      })
-    },
+        })
+      },
+      //查看
+      handleLook(row) {
+        this.$router.push({
+          name: 'tshippingDispatchingview',
+          query: {
+            id: row.id
+          },
+        })
+      },
 
-    // 派船
-    shipping(row) {
-      this.$router.push({
-        name: 'shippingDispatchingcar',
-        query: {
-          id: row.id,
-        },
-      })
-    },
-    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')
-          )
+      // 派船
+      shipping(row) {
+        this.$router.push({
+          name: 'shippingDispatchingcar',
+          query: {
+            id: row.id,
+          },
+        })
+      },
+      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()          // 秒
+          // 有其他格式化字符需求可以继续添加，必须转化成字符串
         }
-      }
-      return fmt
-    },
-    handleClose() {
-      this.accessoryTFs = false
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getList()
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val
-      console.log(`当前页: ${val}`)
-      this.getList()
-    },
-    editClick(row) {
-      var status = ''
-      if (row.processStatus == '待执行' || row.processStatus == '已完成') {
-        status = '执行中'
-      } else if (row.processStatus == '执行中') {
-        status = '已完成'
-      }
-      //cancelButtonClass: "btn-custom-cancel"
-      this.$confirm(`是否将状态改为${status}`, {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          alsostate({ id: row.id })
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '状态修改成功',
+        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.accessoryTFs = false
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+      editClick(row) {
+        var status = ''
+        if (row.processStatus == '待执行' || row.processStatus == '已完成') {
+          status = '执行中'
+        } else if (row.processStatus == '执行中') {
+          status = '已完成'
+        }
+        //cancelButtonClass: "btn-custom-cancel"
+        this.$confirm(`是否将状态改为${status}`, {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            alsostate({
+                id: row.id
               })
-              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
+              .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) {
-      if (
-        row.receiveAttachmentPath === null ||
-        row.receiveAttachmentPath === ''
-      ) {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
-      } else {
-        this.accessoryTFs = true
-      }
-      this.appendixIdss = row.receiveAttachmentPath
-    },
-    handleExamine(row) {
-      this.$router.push({
-        name: 'salesContractExamine',
-        query: { id: row.id },
-      })
-    },
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    handleCloe() {
-      this.dialogViewSpareMoney = false
-    },
-    history(row) {
-      billoperatehis({ id: row.id })
-        .toPromise()
-        .then((response) => {
-          this.historyList = response
+      },
+      fujian(row) {
+        if (
+          row.receiveAttachmentPath === null ||
+          row.receiveAttachmentPath === ''
+        ) {
+          EventBus.$emit(
+            'warning',
+            this.$t('system.noticeCircular.NoInformation')
+          )
+        } else {
+          this.accessoryTFs = true
+        }
+        this.appendixIdss = row.receiveAttachmentPath
+      },
+      handleExamine(row) {
+        this.$router.push({
+          name: 'salesContractExamine',
+          query: {
+            id: row.id
+          },
         })
-    },
-    find() {
-      if (this.inOutDate != null) {
-        if (this.inOutDate.length > 0) {
-          this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
-          this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
+      },
+      // 关闭 dialog时 处理文件url 初始化upload组件
+      handleCloe() {
+        this.dialogViewSpareMoney = false
+      },
+      history(row) {
+        billoperatehis({
+            id: row.id
+          })
+          .toPromise()
+          .then((response) => {
+            this.historyList = response
+          })
+      },
+      find() {
+        if (this.inOutDate != null) {
+          if (this.inOutDate.length > 0) {
+            this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
+            this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
+          } else {
+            this.startDate = ''
+            this.endDate = ''
+          }
         } else {
           this.startDate = ''
           this.endDate = ''
         }
-      }else{
-        this.startDate = ''
-          this.endDate = ''
-      }
-      this.currentPage = 1
-      this.getList()
+        this.currentPage = 1
+        this.getList()
+      },
     },
-  },
-}
+  }
 </script>
 <style lang="scss" scoped>
-.connert {
-  width: 90%;
-  margin: 0 auto;
-}
-.vertical-text-left {
-  width: 62px;
-  text-align: right;
-}
-//分页
-.el-pagination {
-  text-align: center;
-  white-space: nowrap;
-  padding: 2px 5px;
-  color: #303133;
-  font-weight: 700;
-  margin-bottom: 20px;
-}
-/deep/.el-pager li.active {
-  color: #5878e8;
-  cursor: default;
-}
-/deep/.el-pager li:hover {
-  color: #5878e8;
-  cursor: default;
-}
-.el-button--primary {
-  background-color: #5878e8;
-  border-color: #5878e8;
-}
-.el-button--default {
-  color: #8890b1;
-  border-color: #e8eaf1;
-}
-/deep/.base_header_layout .grid-content.right .find.el-button--primary {
-  width: 30px;
-  margin-left: 0;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-}
-/deep/.findValue .el-input__inner {
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
-.completed.el-button--default {
-  border-color: #5878e8;
-  background-color: #f6f7fc;
-  color: #5878e8;
-}
-.putstorage.el-button--default,
-.deliverystorage.el-button--default {
-  border-color: #8890b1;
-  background-color: #fff;
-  color: #8890b1;
-}
-/deep/.el-table td,
-/deep/.el-table th.is-leaf {
-  border-right: 1px solid #e9ecf7;
-  text-align: center;
-}
-/deep/.el-table tr td:first-child,
-/deep/.el-table tr th.is-leaf:first-child {
-  border-left: 1px solid #e9ecf7;
-}
-.record,
-.adjustment {
-  display: inline-block;
-  color: #5878e8;
-  padding: 0 4px !important;
-  position: relative;
-}
-.record:after {
-  position: absolute;
-  content: '';
-  display: block;
-  top: 5px;
-  right: -2px;
-  width: 1px;
-  height: 12px;
-  background: #e9ecf7;
-}
-.el-row {
-  height: 60px;
-}
-.base_header_layout .grid-content {
-  margin-top: 80px;
-}
-
-.el-input--small .el-input__inner {
-  margin-left: 20px;
-}
-.el-range-editor--small.el-input__inner {
-  height: 32px;
-  margin: 0 10px;
-}
-//执行样式
-.executory,
-.inExecution,
-.done {
-  width: 6px;
-  height: 6px;
-  display: inline-block;
-  border-radius: 50%;
-  position: relative;
-  top: -1px;
-  font-size: 14px;
-}
-.executory {
-  background: #ff9f24;
-}
-.inExecution {
-  background: #5878e8;
-}
-.done {
-  background: #50cad4;
-}
-.record,
-.adjustment {
-  display: inline-block;
-  color: #5878e8;
-  padding: 0 4px !important;
-  position: relative;
-  font-size: 14px;
-}
-.el-select {
-  width: 30%;
-  margin-right: 10px;
-}
-/deep/.typeselect .el-input__inner {
-  color: #8890b1;
-}
+  .connert {
+    width: 90%;
+    margin: 0 auto;
+  }
+
+  .vertical-text-left {
+    width: 62px;
+    text-align: right;
+  }
+
+  //分页
+  .el-pagination {
+    text-align: center;
+    white-space: nowrap;
+    padding: 2px 5px;
+    color: #303133;
+    font-weight: 700;
+    margin-bottom: 20px;
+  }
+
+  /deep/.el-pager li.active {
+    color: #5878e8;
+    cursor: default;
+  }
+
+  /deep/.el-pager li:hover {
+    color: #5878e8;
+    cursor: default;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+  }
+
+  .el-button--default {
+    color: #8890b1;
+    border-color: #e8eaf1;
+  }
+
+  /deep/.base_header_layout .grid-content.right .find.el-button--primary {
+    width: 30px;
+    margin-left: 0;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+
+  /deep/.findValue .el-input__inner {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
+
+  .completed.el-button--default {
+    border-color: #5878e8;
+    background-color: #f6f7fc;
+    color: #5878e8;
+  }
+
+  .putstorage.el-button--default,
+  .deliverystorage.el-button--default {
+    border-color: #8890b1;
+    background-color: #fff;
+    color: #8890b1;
+  }
+
+  /deep/.el-table td,
+  /deep/.el-table th.is-leaf {
+    border-right: 1px solid #e9ecf7;
+    text-align: center;
+  }
+
+  /deep/.el-table tr td:first-child,
+  /deep/.el-table tr th.is-leaf:first-child {
+    border-left: 1px solid #e9ecf7;
+  }
+
+  .record,
+  .adjustment {
+    display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+  }
+
+  .record:after {
+    position: absolute;
+    content: '';
+    display: block;
+    top: 5px;
+    right: -2px;
+    width: 1px;
+    height: 12px;
+    background: #e9ecf7;
+  }
+
+  .el-row {
+    height: 60px;
+  }
+
+  .base_header_layout .grid-content {
+    margin-top: 80px;
+  }
+
+  .el-input--small .el-input__inner {
+    margin-left: 20px;
+  }
+
+  .el-range-editor--small.el-input__inner {
+    height: 32px;
+    margin: 0 10px;
+  }
+
+  //执行样式
+  .executory,
+  .inExecution,
+  .done {
+    width: 6px;
+    height: 6px;
+    display: inline-block;
+    border-radius: 50%;
+    position: relative;
+    top: -1px;
+    font-size: 14px;
+  }
+
+  .executory {
+    background: #ff9f24;
+  }
+
+  .inExecution {
+    background: #5878e8;
+  }
+
+  .done {
+    background: #50cad4;
+  }
+
+  .record,
+  .adjustment {
+    display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+    font-size: 14px;
+  }
+
+  .el-select {
+    width: 30%;
+    margin-right: 10px;
+  }
+
+  /deep/.typeselect .el-input__inner {
+    color: #8890b1;
+  }
 </style>

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -5,87 +5,35 @@
       <template slot="left"> </template>
       <!-- 接单开始 -->
       <template slot="right">
-        <span style="width: 160px; 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"
-          />
+        <span style="width: 160px; 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>
-        <span style="width: 160px; display: inline-block; color: #8890b1"
-          >类型：</span
-        >
-        <ws-select
-          v-model="tranTypeKeyText"
-          placeholder=""
-          class="typeselect"
-          @change="selecttranType"
-          :value="tranTypeKey"
-        >
-          <ws-option
-            v-for="item in tranTypeList"
-            :key="item.value"
-            :label="item.value"
-            :value="item.value"
-            style="color: #8890b1"
-          />
+        <span style="width: 160px; display: inline-block; color: #8890b1">类型：</span>
+        <ws-select v-model="tranTypeKeyText" placeholder="" class="typeselect" @change="selecttranType"
+          :value="tranTypeKey">
+          <ws-option v-for="item in tranTypeList" :key="item.value" :label="item.value" :value="item.value"
+            style="color: #8890b1" />
         </ws-select>
         <div>
-          <span style="display: inline-block; width: 70px; color: #8890b1"
-            >接单日期：</span
-          >
+          <span style="display: inline-block; width: 70px; color: #8890b1">接单日期：</span>
         </div>
-        <el-date-picker
-          v-model="inOutDate"
-          type="daterange"
-          align="right"
-          unlink-panels
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        >
+        <el-date-picker v-model="inOutDate" type="daterange" align="right" unlink-panels range-separator="至"
+          start-placeholder="开始日期" end-placeholder="结束日期">
         </el-date-picker>
-        <ws-input
-          v-model="searchKeyWord"
-          placeholder="可按发货人、收货人、任务编号查找"
-          clearable
-          maxlength="500"
-          type="input"
-          class="findValue"
-        ></ws-input>
-        <ws-button class="find" type="primary" @click="find()"
-          ><img
-            width="16"
-            height="16"
-            style="
+        <ws-input v-model="searchKeyWord" placeholder="可按发货人、收货人、任务编号查找" clearable maxlength="500" type="input"
+          class="findValue"></ws-input>
+        <ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
               vertical-align: text-top;
               position: relative;
               top: 0px;
               left: -8px;
-            "
-            src="../../../public/img/sousuo.png"
-            alt=""
-        /></ws-button>
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button>
       </template>
     </BaseHeaderLayout>
-    <div class="container">
-      <el-table
-        class="wenzi"
-        :data="tranManagementList.records"
-        style="width: 100%; margin-top: 20px"
-        height="780"
-      >
+      <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>
@@ -93,7 +41,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="processNo" label="运输任务编号/合同编号" width="140">
-        <template scope="scope">
+          <template scope="scope">
             <span v-if="scope.row.processNo">{{ scope.row.processNo }}</span>
             <span v-else>{{ scope.row.contractNo }}</span>
           </template>
@@ -101,14 +49,14 @@
         <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"> 
+        <el-table-column prop="send" label="发货" width="300">
           <template scope="scope">
-             <span style='white-space :pre-wrap;' v-html="scope.row.send"></span>
+            <span style='white-space :pre-wrap;' v-html="scope.row.send"></span>
           </template>
         </el-table-column>
-        <el-table-column prop="receive" label="收货" width="300"> 
+        <el-table-column prop="receive" label="收货" width="300">
           <template scope="scope">
-             <span style='white-space :pre-wrap;' v-html="scope.row.receive"></span>
+            <span style='white-space :pre-wrap;' v-html="scope.row.receive"></span>
           </template>
         </el-table-column>
         <el-table-column prop="tranCycle" label="运输周期" width="160">
@@ -118,46 +66,23 @@
         </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)"
-            >
+            <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 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 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 v-if="index != historyList.length - 1" class="vertical-line"></div>
                   </div>
                   <div class="vertical-text">
                     {{ item.operateUser }}<br />{{ item.dealMsg }}
@@ -165,14 +90,8 @@
                 </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=""
-            />
+            <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">
@@ -189,431 +108,475 @@
           </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 @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>
-import { automobileList, state } from '@/model/transport/index'
-import { downloadFile } from '@/utils/batchDown'
-import Pagination from '@/components/Pagination'
-import WsUpload from '@/components/WsUpload'
-import { dayjs, fmoney, EventBus } from 'base-core-lib'
-export default {
-  name: 'viewSpareMoney',
-  components: {
-    WsUpload,
-    Pagination,
-  },
-  watch: {
-    vesselId(val) {
-      this.getList()
-    },
-    isShow(val) {
-      this.showType = val
+  import {
+    automobileList,
+    state
+  } from '@/model/transport/index'
+  import {
+    downloadFile
+  } from '@/utils/batchDown'
+  import Pagination from '@/components/Pagination'
+  import WsUpload from '@/components/WsUpload'
+  import {
+    dayjs,
+    fmoney,
+    EventBus
+  } from 'base-core-lib'
+  export default {
+    name: 'viewSpareMoney',
+    components: {
+      WsUpload,
+      Pagination,
     },
-  },
-  data() {
-    return {
-      //弹出框
-      dialogViewSpareMoney: false,
-      dialogApproveFormVisible: false,
-      // 船舶类型
-      monetaryKey: null,
-      // 表格显示数据
-      tableDate: [],
-
-      // 是否显示
-      showType: true,
-      // 年
-      year: '',
-      currentPage: 1,
-      pageSize: 10,
-      deptBudgetTotal: 0,
-      searchType: 1,
-      tranTypeKey:5,
-      tranTypeKeyText: '全部',
-      searchTypeText: '执行中',
-      searchKeyWord: '',
-      contractType: 2,
-      // tranTypeKey: 2,
-      feedbackFlag: 1,
-      searchTypeOne: 1,
-      taskTypeList: [
-        { value: '执行中', type: 1 },
-        { value: '已完货', type: 2 },
-        { value: '全部任务', type: 3 },
-      ],
-      tranTypeList: [
-        { value: '汽运', type: 1 },
-        { value: '火运', type: 2 },
-        { value: '船运', type: 3 },
-        { value: '他运', type: 4 },
-        { value: '全部', type: 5 },
-      ],
-      // 提交类型
-      submitType: true,
-      size: 10,
-      primary: '1',
-      spanArr: [],
-      inOutDate: [],
-      warehouseName: '',
-      compId: localStorage.getItem('ws-pf_compId'),
-      deptCircularPage: {},
-      tranManagementList: [],
-      deptBudgetList: {},
-      historyList: [],
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          return time.getTime() > Date.now()
-        },
+    watch: {
+      vesselId(val) {
+        this.getList()
+      },
+      isShow(val) {
+        this.showType = val
       },
-      accessoryTFs: false,
-    }
-  },
-  activated() {
-    this.getList()
-    this.showType = this.isShow
-  },
-  methods: {
-    getSpanArr(data) {
-      let that = this
-      //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
-      that.spanArr = []
-      that.pos = 0
-      //遍历数据
-      data.forEach((item, index) => {
-        //判断是否是第一项
-
-        // if (index === 0) {
-        //   this.spanArr.push(1)
-        //   this.pos = 0
-        // } else {
-        //不是第一项时，就根据标识去存储
-        if (data[index].warehouseNumViewList.length > 1) {
-          // 查找到符合条件的数据时每次要把之前存储的数据+1
-          this.spanArr[this.pos] = data[index].warehouseNumViewList.length
-          this.spanArr.push(0)
-        } else {
-          // 没有符合的数据时，要记住当前的index
-          this.spanArr.push(1)
-          this.pos = index
-        }
-        // }
-      })
     },
-    //查看
-    trainSee(row) {
-      if (row.tranType == '汽运') {
-        this.$router.push({
-          path: 'tranManagementTransporFeedbackLook',
-          query: {
-            id: row.id,
+    data() {
+      return {
+        //弹出框
+        dialogViewSpareMoney: false,
+        dialogApproveFormVisible: false,
+        // 船舶类型
+        monetaryKey: null,
+        // 表格显示数据
+        tableDate: [],
+
+        // 是否显示
+        showType: true,
+        // 年
+        year: '',
+        currentPage: 1,
+        pageSize: 10,
+        deptBudgetTotal: 0,
+        searchType: 1,
+        tranTypeKey: 5,
+        tranTypeKeyText: '全部',
+        searchTypeText: '执行中',
+        searchKeyWord: '',
+        contractType: 2,
+        // tranTypeKey: 2,
+        feedbackFlag: 1,
+        searchTypeOne: 1,
+        taskTypeList: [{
+            value: '执行中',
+            type: 1
           },
-        })
-      } else if (row.tranType == '火运') {
-        this.$router.push({
-          path: 'tranManagementFireFeedbackLook',
-          query: {
-            id: row.id,
+          {
+            value: '已完货',
+            type: 2
           },
-        })
-      } else if (row.tranType == '船运') {
-        this.$router.push({
-          path: 'tranManagementShippingFeedbackLook',
-          query: {
-            id: row.id,
+          {
+            value: '全部任务',
+            type: 3
           },
-        })
-      }else if (row.tranType == '他运') {
-        this.$router.push({
-          path: 'tranManagementthirdpartnarFeedbackLook',
-          query: {
-            id: row.id,
+        ],
+        tranTypeList: [{
+            value: '汽运',
+            type: 1
           },
-        })
-      }
-    },
-    //反馈
-    feedback(row) {
-      if (row.tranType == '汽运') {
-        this.$router.push({
-          path: 'tranManagementTransporFeedback',
-          query: {
-            id: row.id,
+          {
+            value: '火运',
+            type: 2
           },
-        })
-      } else if (row.tranType == '火运') {
-        this.$router.push({
-          path: 'tranManagementFireFeedback',
-          query: {
-            id: row.id,
+          {
+            value: '船运',
+            type: 3
           },
-        })
-      } else if (row.tranType == '船运') {
-        this.$router.push({
-          path: 'tranManagementShippingFeedback',
-          query: {
-            id: row.id,
+          {
+            value: '他运',
+            type: 4
           },
-        })
-      }else if (row.tranType == '他运') {
-        this.$router.push({
-          path: 'tranManagementthirdpartnarFeedback',
-          query: {
-            id: row.id,
+          {
+            value: '全部',
+            type: 5
           },
-        })
-      }
-    },
-    // statusquery(status) {
-    //    if (status == 1) {
-    //     this.primary = 1
-    //   } else if (status == 2) {
-    //     this.primary = 2
-    //   } else {
-    //     this.primary = 3
-    //   }
-    //   this.feedbackFlag = status
-    //   this.getList()
-    // },
-    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')
-          )
-        }
+        ],
+        // 提交类型
+        submitType: true,
+        size: 10,
+        primary: '1',
+        spanArr: [],
+        inOutDate: [],
+        warehouseName: '',
+        compId: localStorage.getItem('ws-pf_compId'),
+        deptCircularPage: {},
+        tranManagementList: [],
+        deptBudgetList: {},
+        historyList: [],
+        pickerBeginDateBefore: {
+          disabledDate: (time) => {
+            return time.getTime() > Date.now()
+          },
+        },
+        accessoryTFs: false,
       }
-      return fmt
-    },
-    handleClose() {
-      this.accessoryTFs = false
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getList()
     },
-    handleCurrentChange(val) {
-      this.currentPage = val
-      console.log(`当前页: ${val}`)
+    activated() {
       this.getList()
+      this.showType = this.isShow
     },
-    getList() {
-      automobileList({
-        compId: localStorage.getItem('ws-pf_compId'),
-        feedbackFlag: this.feedbackFlag,
-        tranTypeKey:this.tranTypeKey,
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        startDate: this.startDate,
-        endDate: this.endDate,
-        searchKeyWord: this.searchKeyWord,
-      })
-        .toPromise()
-        .then((response) => {
-          this.deptCircularPage.currentPage = response.current
-          this.deptCircularPage.pageSize = response.size
-          this.deptBudgetTotal = response.total
-          this.tranManagementList = response
+    methods: {
+      getSpanArr(data) {
+        let that = this
+        //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
+        that.spanArr = []
+        that.pos = 0
+        //遍历数据
+        data.forEach((item, index) => {
+          //判断是否是第一项
+
+          // if (index === 0) {
+          //   this.spanArr.push(1)
+          //   this.pos = 0
+          // } else {
+          //不是第一项时，就根据标识去存储
+          if (data[index].warehouseNumViewList.length > 1) {
+            // 查找到符合条件的数据时每次要把之前存储的数据+1
+            this.spanArr[this.pos] = data[index].warehouseNumViewList.length
+            this.spanArr.push(0)
+          } else {
+            // 没有符合的数据时，要记住当前的index
+            this.spanArr.push(1)
+            this.pos = index
+          }
+          // }
         })
-    },
-    editClick(row) {
-      var feedbackStatus = ''
-      if (row.feedbackStatus == '待执行' || row.feedbackStatus == '已完货') {
-        feedbackStatus = '执行中'
-      } else if (row.feedbackStatus == '执行中') {
-        feedbackStatus = '已完货'
-      }
-      //cancelButtonClass: "btn-custom-cancel"
-      this.$confirm(`是否将状态改为${feedbackStatus}`, {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          state({
-            id: row.id,
+      },
+      //查看
+      trainSee(row) {
+        if (row.tranType == '汽运') {
+          this.$router.push({
+            path: 'tranManagementTransporFeedbackLook',
+            query: {
+              id: row.id,
+            },
+          })
+        } else if (row.tranType == '火运') {
+          this.$router.push({
+            path: 'tranManagementFireFeedbackLook',
+            query: {
+              id: row.id,
+            },
           })
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '状态修改成功',
+        } else if (row.tranType == '船运') {
+          this.$router.push({
+            path: 'tranManagementShippingFeedbackLook',
+            query: {
+              id: row.id,
+            },
+          })
+        } else if (row.tranType == '他运') {
+          this.$router.push({
+            path: 'tranManagementthirdpartnarFeedbackLook',
+            query: {
+              id: row.id,
+            },
+          })
+        }
+      },
+      //反馈
+      feedback(row) {
+        if (row.tranType == '汽运') {
+          this.$router.push({
+            path: 'tranManagementTransporFeedback',
+            query: {
+              id: row.id,
+            },
+          })
+        } else if (row.tranType == '火运') {
+          this.$router.push({
+            path: 'tranManagementFireFeedback',
+            query: {
+              id: row.id,
+            },
+          })
+        } else if (row.tranType == '船运') {
+          this.$router.push({
+            path: 'tranManagementShippingFeedback',
+            query: {
+              id: row.id,
+            },
+          })
+        } else if (row.tranType == '他运') {
+          this.$router.push({
+            path: 'tranManagementthirdpartnarFeedback',
+            query: {
+              id: row.id,
+            },
+          })
+        }
+      },
+      // statusquery(status) {
+      //    if (status == 1) {
+      //     this.primary = 1
+      //   } else if (status == 2) {
+      //     this.primary = 2
+      //   } else {
+      //     this.primary = 3
+      //   }
+      //   this.feedbackFlag = status
+      //   this.getList()
+      // },
+      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.accessoryTFs = false
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+      getList() {
+        automobileList({
+            compId: localStorage.getItem('ws-pf_compId'),
+            feedbackFlag: this.feedbackFlag,
+            tranTypeKey: this.tranTypeKey,
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            startDate: this.startDate,
+            endDate: this.endDate,
+            searchKeyWord: this.searchKeyWord,
+          })
+          .toPromise()
+          .then((response) => {
+            this.deptCircularPage.currentPage = response.current
+            this.deptCircularPage.pageSize = response.size
+            this.deptBudgetTotal = response.total
+            this.tranManagementList = response
+          })
+      },
+      editClick(row) {
+        var feedbackStatus = ''
+        if (row.feedbackStatus == '待执行' || row.feedbackStatus == '已完货') {
+          feedbackStatus = '执行中'
+        } else if (row.feedbackStatus == '执行中') {
+          feedbackStatus = '已完货'
+        }
+        //cancelButtonClass: "btn-custom-cancel"
+        this.$confirm(`是否将状态改为${feedbackStatus}`, {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            state({
+                id: row.id,
               })
-              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.feedbackFlag = this.taskTypeList[i].type
+              .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.feedbackFlag = this.taskTypeList[i].type
+          }
         }
-      }
-      this.getList()
-    },
-    selecttranType(e) {
-      for (var i = 0; i < this.tranTypeList.length; i++) {
-        if (this.tranTypeList[i].value == e) {
-          this.tranTypeKey = this.tranTypeList[i].type
+        this.getList()
+      },
+      selecttranType(e) {
+        for (var i = 0; i < this.tranTypeList.length; i++) {
+          if (this.tranTypeList[i].value == e) {
+            this.tranTypeKey = this.tranTypeList[i].type
+          }
         }
-      }
-      this.getList()
-    },
-    find() {
-      if (this.inOutDate != null) {
-        if (this.inOutDate.length > 0) {
-          this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
-          this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
+        this.getList()
+      },
+      find() {
+        if (this.inOutDate != null) {
+          if (this.inOutDate.length > 0) {
+            this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
+            this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
+          } else {
+            this.startDate = ''
+            this.endDate = ''
+          }
         } else {
           this.startDate = ''
           this.endDate = ''
         }
-      } else {
-        this.startDate = ''
-        this.endDate = ''
-      }
-      this.currentPage = 1
-      this.getList()
+        this.currentPage = 1
+        this.getList()
+      },
     },
-  },
-}
+  }
 </script>
 <style lang="scss" scoped>
-.container {
-  width: 100%;
-  margin: 0 auto;
-}
-.vertical-text-left {
-  width: 62px;
-  text-align: right;
-}
-.el-button--primary {
-  background-color: #5878e8;
-  border-color: #5878e8;
-}
-.el-button--default {
-  color: #8890b1;
-  border-color: #e8eaf1;
-}
-/deep/.base_header_layout .grid-content.right .find.el-button--primary {
-  width: 30px;
-  margin-left: 0;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-}
-/deep/.findValue .el-input__inner {
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
+  .container {
+    width: 100%;
+    margin: 0 auto;
+  }
+
+  .vertical-text-left {
+    width: 62px;
+    text-align: right;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+  }
+
+  .el-button--default {
+    color: #8890b1;
+    border-color: #e8eaf1;
+  }
+
+  /deep/.base_header_layout .grid-content.right .find.el-button--primary {
+    width: 30px;
+    margin-left: 0;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+
+  /deep/.findValue .el-input__inner {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
+
+  //操作按钮
+  .record,
+  .record1,
+  .adjustment {
+    display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+    font-size: 14px;
+  }
+
+  .record:after {
+    position: absolute;
+    content: '';
+    display: block;
+    top: 5px;
+    right: -2px;
+    width: 1px;
+    height: 12px;
+    background: #e9ecf7;
+  }
+
+  //状态样式
+  .executory,
+  .inExecution,
+  .done {
+    width: 6px;
+    height: 6px;
+    display: inline-block;
+    border-radius: 50%;
+    position: relative;
+    top: -1px;
+    font-size: 14px;
+  }
+
+  .executory {
+    background: #ff9f24;
+  }
+
+  .inExecution {
+    background: #5878e8;
+  }
+
+  .done {
+    background: #50cad4;
+  }
+
+  .putstorage.el-button--default,
+  .deliverystorage.el-button--default {
+    border-color: #8890b1;
+    background-color: #fff;
+    color: #8890b1;
+  }
+
+  /deep/.el-table td,
+  /deep/.el-table th.is-leaf {
+    border-right: 1px solid #e9ecf7;
+    text-align: center;
+  }
+
+  /deep/.el-table tr td:first-child,
+  /deep/.el-table tr th.is-leaf:first-child {
+    border-left: 1px solid #e9ecf7;
+  }
+
+  .base_header_layout .grid-content {
+    margin-top: 80px;
+  }
+
+  .el-input--small .el-input__inner {
+    margin-left: 20px;
+  }
+
+  .el-range-editor--small.el-input__inner {
+    height: 32px;
+    margin: 0 10px;
+  }
+
+  /deep/.el-pagination {
+    text-align: center;
+    white-space: nowrap;
+    padding: 2px 5px;
+    color: #303133;
+    font-weight: 700;
+    margin-bottom: 20px;
+  }
+
+  .el-select {
+    width: 30%;
+    margin-right: 10px;
+  }
 
-//操作按钮
-.record,
-.record1,
-.adjustment {
-  display: inline-block;
-  color: #5878e8;
-  padding: 0 4px !important;
-  position: relative;
-  font-size: 14px;
-}
-.record:after {
-  position: absolute;
-  content: '';
-  display: block;
-  top: 5px;
-  right: -2px;
-  width: 1px;
-  height: 12px;
-  background: #e9ecf7;
-}
-//状态样式
-.executory,
-.inExecution,
-.done {
-  width: 6px;
-  height: 6px;
-  display: inline-block;
-  border-radius: 50%;
-  position: relative;
-  top: -1px;
-  font-size: 14px;
-}
-.executory {
-  background: #ff9f24;
-}
-.inExecution {
-  background: #5878e8;
-}
-.done {
-  background: #50cad4;
-}
-.putstorage.el-button--default,
-.deliverystorage.el-button--default {
-  border-color: #8890b1;
-  background-color: #fff;
-  color: #8890b1;
-}
-/deep/.el-table td,
-/deep/.el-table th.is-leaf {
-  border-right: 1px solid #e9ecf7;
-  text-align: center;
-}
-/deep/.el-table tr td:first-child,
-/deep/.el-table tr th.is-leaf:first-child {
-  border-left: 1px solid #e9ecf7;
-}
-.base_header_layout .grid-content {
-  margin-top: 80px;
-}
-.el-input--small .el-input__inner {
-  margin-left: 20px;
-}
-.el-range-editor--small.el-input__inner {
-  height: 32px;
-  margin: 0 10px;
-}
-/deep/.el-pagination {
-  text-align: center;
-  white-space: nowrap;
-  padding: 2px 5px;
-  color: #303133;
-  font-weight: 700;
-  margin-bottom: 20px;
-}
-.el-select {
-  width: 30%;
-  margin-right: 10px;
-}
-/deep/.typeselect .el-input__inner {
-  color: #8890b1;
-}
+  /deep/.typeselect .el-input__inner {
+    color: #8890b1;
+  }
 </style>

src/views/tranManagement/tranManagementTransporTationFire.vue

@@ -5,69 +5,29 @@
       <template slot="left"> </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"
-          />
+        <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>
         <div>
-          <span style="display: inline-block; width: 70px; color: #8890b1"
-            >接单日期：</span
-          >
+          <span style="display: inline-block; width: 70px; color: #8890b1">接单日期：</span>
         </div>
-        <el-date-picker
-          v-model="inOutDate"
-          type="daterange"
-          align="right"
-          unlink-panels
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        >
+        <el-date-picker v-model="inOutDate" type="daterange" align="right" unlink-panels range-separator="至"
+          start-placeholder="开始日期" end-placeholder="结束日期">
         </el-date-picker>
-        <ws-input
-          v-model="searchKeyWord"
-          placeholder="可按发货人、收货人、任务编号查找"
-          clearable
-          maxlength="500"
-          type="input"
-          class="findValue"
-        ></ws-input>
-        <ws-button class="find" type="primary" @click="find()"
-          ><img
-            width="16"
-            height="16"
-            style="
+        <ws-input v-model="searchKeyWord" placeholder="可按发货人、收货人、任务编号查找" clearable maxlength="500" type="input"
+          class="findValue"></ws-input>
+        <ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
               vertical-align: text-top;
               position: relative;
               top: 0px;
               left: -8px;
-            "
-            src="../../../public/img/sousuo.png"
-            alt=""
-        /></ws-button>
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button>
       </template>
     </BaseHeaderLayout>
-    <div class="container">
-      <el-table
-        class="wenzi"
-        :data="tranManagementList.records"
-        style="width: 100%"
-        height="780"
-      >
+      <el-table class="wenzi" :data="tranManagementList.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>
@@ -80,61 +40,38 @@
         <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>
+            <span style='white-space :pre-wrap;' v-html="scope.row.send"></span>
           </template>
-          </el-table-column>
-        <el-table-column prop="receive" label="收货" width="300"> 
+        </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>
+            <span style='white-space :pre-wrap;' v-html="scope.row.receive"></span>
           </template>
         </el-table-column>
-        <el-table-column prop="tranCycle" label="运输周期"  width="160">
+        <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="processStatus" label="状态">
           <template slot-scope="scope">
-            <el-popover
-              placement="left"
-              :width="285"
-              trigger="click"
-              visible-arrow="false"
-              @show="history(scope.row)"
-            >
+            <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 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">XXXXX</p>
-                <div
-                  v-for="(item, index) in historyList"
-                  class="flex"
-                  :key="index"
-                >
+                <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 v-if="index != historyList.length - 1" class="vertical-line"></div>
                   </div>
                   <div class="vertical-text">
                     {{ item.operateUser }}<br />{{ item.dealMsg }}
@@ -142,422 +79,443 @@
                 </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=""
-            />
+            <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="接单时间">
         </el-table-column>
         <el-table-column prop="seller" label="操作" width="200">
           <template slot-scope="scope">
-            <div
-              class="record"
-              @click="trainSee(scope.row)"
-              v-hasPermission="
+            <div class="record" @click="trainSee(scope.row)" v-hasPermission="
                 'tranManager.fireDispatching.view'
-              "
-            >
+              ">
               查看
             </div>
-            <div
-              class="adjustment"
-              @click="trainNumber(scope.row)"
-              v-hasPermission="
+            <div class="adjustment" @click="trainNumber(scope.row)" v-hasPermission="
                 'tranManager.fireDispatching.car'
-              "
-            >
+              ">
               车次
             </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 @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>
-import { automobileList, alsostate } from '@/model/transport/index'
-import Pagination from '@/components/Pagination'
-import WsUpload from '@/components/WsUpload'
-import { EventBus } from 'base-core-lib'
-import { billoperatehis } from '@/model/contarct/index'
-export default {
-  name: 'viewSpareMoney',
-  components: {
-    WsUpload,
-    Pagination,
-  },
-  watch: {
-    vesselId(val) {
-      this.getList()
-    },
-    isShow(val) {
-      this.showType = val
+  import {
+    automobileList,
+    alsostate
+  } from '@/model/transport/index'
+  import Pagination from '@/components/Pagination'
+  import WsUpload from '@/components/WsUpload'
+  import {
+    EventBus
+  } from 'base-core-lib'
+  import {
+    billoperatehis
+  } from '@/model/contarct/index'
+  export default {
+    name: 'viewSpareMoney',
+    components: {
+      WsUpload,
+      Pagination,
     },
-  },
-  data() {
-    return {
-      //弹出框
-      dialogViewSpareMoney: false,
-      dialogApproveFormVisible: false,
-      // 船舶类型
-      monetaryKey: null,
-      // 表格显示数据
-      tableDate: [],
-
-      // 是否显示
-      showType: true,
-      // 年
-      year: '',
-      currentPage: 1,
-      pageSize: 10,
-      deptBudgetTotal: 0,
-      searchTypeText: '执行中',
-      searchKeyWord: '',
-      tranTypeKey: 2,
-      // 提交类型
-      submitType: true,
-      size: 10,
-      spanArr: [],
-      warehouseName: '',
-      searchType: 1,
-      startDate: null,
-      endDate: null,
-      compId: localStorage.getItem('ws-pf_compId'),
-      deptCircularPage: {},
-      tranManagementList: [],
-      deptBudgetList: {},
-      historyList: [],
-      inOutDate: [],
-      taskTypeList: [
-        { value: '执行中', type: 1 },
-        { value: '已完成', type: 2 },
-        { value: '全部任务', type: '' },
-      ],
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          return time.getTime() > Date.now()
-        },
+    watch: {
+      vesselId(val) {
+        this.getList()
+      },
+      isShow(val) {
+        this.showType = val
       },
-      accessoryTFs: false,
-    }
-  },
-  activated() {
-    //cg.viewBudget
-    //cg.viewSpareMoney
-    // this.getVesselData();
-    this.getList()
-    this.showType = this.isShow
-  },
-  methods: {
-    getSpanArr(data) {
-      let that = this
-      //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
-      that.spanArr = []
-      that.pos = 0
-      //遍历数据
-      data.forEach((item, index) => {
-        //判断是否是第一项
-
-        // if (index === 0) {
-        //   this.spanArr.push(1)
-        //   this.pos = 0
-        // } else {
-        //不是第一项时，就根据标识去存储
-        if (data[index].warehouseNumViewList.length > 1) {
-          // 查找到符合条件的数据时每次要把之前存储的数据+1
-          this.spanArr[this.pos] = data[index].warehouseNumViewList.length
-          this.spanArr.push(0)
-        } else {
-          // 没有符合的数据时，要记住当前的index
-          this.spanArr.push(1)
-          this.pos = index
-        }
-        // }
-      })
-    },
-    //查看火运调度详细
-    trainSee(row) {
-      this.$router.push({
-        name: 'fireDispatchingview',
-        query: {
-          id: row.id,
-        },
-      })
     },
-    //车次
-    trainNumber(row) {
-      this.$router.push({
-        name: 'fireDispatchingcar',
-        query: {
-          id: row.id,
+    data() {
+      return {
+        //弹出框
+        dialogViewSpareMoney: false,
+        dialogApproveFormVisible: false,
+        // 船舶类型
+        monetaryKey: null,
+        // 表格显示数据
+        tableDate: [],
+
+        // 是否显示
+        showType: true,
+        // 年
+        year: '',
+        currentPage: 1,
+        pageSize: 10,
+        deptBudgetTotal: 0,
+        searchTypeText: '执行中',
+        searchKeyWord: '',
+        tranTypeKey: 2,
+        // 提交类型
+        submitType: true,
+        size: 10,
+        spanArr: [],
+        warehouseName: '',
+        searchType: 1,
+        startDate: null,
+        endDate: null,
+        compId: localStorage.getItem('ws-pf_compId'),
+        deptCircularPage: {},
+        tranManagementList: [],
+        deptBudgetList: {},
+        historyList: [],
+        inOutDate: [],
+        taskTypeList: [{
+            value: '执行中',
+            type: 1
+          },
+          {
+            value: '已完成',
+            type: 2
+          },
+          {
+            value: '全部任务',
+            type: ''
+          },
+        ],
+        pickerBeginDateBefore: {
+          disabledDate: (time) => {
+            return time.getTime() > Date.now()
+          },
         },
-      })
-    },
-    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')
-          )
-        }
+        accessoryTFs: false,
       }
-      return fmt
-    },
-    handleClose() {
-      this.accessoryTFs = false
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getList()
     },
-    handleCurrentChange(val) {
-      this.currentPage = val
-      console.log(`当前页: ${val}`)
+    activated() {
+      //cg.viewBudget
+      //cg.viewSpareMoney
+      // this.getVesselData();
       this.getList()
+      this.showType = this.isShow
     },
-    getList() {
-      automobileList({
-        compId: localStorage.getItem('ws-pf_compId'),
-        searchType: this.searchType,
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        tranTypeKey: this.tranTypeKey,
-        startDate: this.startDate,
-        endDate: this.endDate,
-        searchKeyWord: this.searchKeyWord,
-      })
-        .toPromise()
-        .then((response) => {
-          this.tranManagementList = response
-          this.deptCircularPage.currentPage = response.current
-          this.deptCircularPage.pageSize = response.size
-          this.deptBudgetTotal = response.total
+    methods: {
+      getSpanArr(data) {
+        let that = this
+        //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
+        that.spanArr = []
+        that.pos = 0
+        //遍历数据
+        data.forEach((item, index) => {
+          //判断是否是第一项
+
+          // if (index === 0) {
+          //   this.spanArr.push(1)
+          //   this.pos = 0
+          // } else {
+          //不是第一项时，就根据标识去存储
+          if (data[index].warehouseNumViewList.length > 1) {
+            // 查找到符合条件的数据时每次要把之前存储的数据+1
+            this.spanArr[this.pos] = data[index].warehouseNumViewList.length
+            this.spanArr.push(0)
+          } else {
+            // 没有符合的数据时，要记住当前的index
+            this.spanArr.push(1)
+            this.pos = index
+          }
+          // }
         })
-    },
-    editClick(row) {
-      var status = ''
-      if (row.processStatus == '待执行' || row.processStatus == '已完成') {
-        status = '执行中'
-      } else if (row.processStatus == '执行中') {
-        status = '已完成'
-      }
-      this.$confirm(`是否将状态改为${status}`, {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          alsostate({ id: row.id })
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '状态修改成功',
-              })
-              this.getList()
-            })
-            .catch((response) => {
-              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-            })
+      },
+      //查看火运调度详细
+      trainSee(row) {
+        this.$router.push({
+          name: 'fireDispatchingview',
+          query: {
+            id: row.id,
+          },
         })
-        .catch(() => {
-          return false
+      },
+      //车次
+      trainNumber(row) {
+        this.$router.push({
+          name: 'fireDispatchingcar',
+          query: {
+            id: row.id,
+          },
         })
-    },
-    selecttaskType(e) {
-      for (var i = 0; i < this.taskTypeList.length; i++) {
-        if (this.taskTypeList[i].value == e) {
-          this.searchType = this.taskTypeList[i].type
+      },
+      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()          // 秒
+          // 有其他格式化字符需求可以继续添加，必须转化成字符串
         }
-      }
-    },
-    fujian(row) {
-      if (
-        row.receiveAttachmentPath === null ||
-        row.receiveAttachmentPath === ''
-      ) {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
-      } else {
-        this.accessoryTFs = true
-      }
-      this.appendixIdss = row.receiveAttachmentPath
-    },
-    handleExamine(row) {
-      this.$router.push({
-        name: 'salesContractExamine',
-        query: { id: row.id },
-      })
-    },
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    handleCloe() {
-      this.dialogViewSpareMoney = false
-    },
-    history(row) {
-      billoperatehis({ id: row.id })
-        .toPromise()
-        .then((response) => {
-          this.historyList = response
+        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.accessoryTFs = false
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+      getList() {
+        automobileList({
+            compId: localStorage.getItem('ws-pf_compId'),
+            searchType: this.searchType,
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            tranTypeKey: this.tranTypeKey,
+            startDate: this.startDate,
+            endDate: this.endDate,
+            searchKeyWord: this.searchKeyWord,
+          })
+          .toPromise()
+          .then((response) => {
+            this.tranManagementList = response
+            this.deptCircularPage.currentPage = response.current
+            this.deptCircularPage.pageSize = response.size
+            this.deptBudgetTotal = response.total
+          })
+      },
+      editClick(row) {
+        var status = ''
+        if (row.processStatus == '待执行' || row.processStatus == '已完成') {
+          status = '执行中'
+        } else if (row.processStatus == '执行中') {
+          status = '已完成'
+        }
+        this.$confirm(`是否将状态改为${status}`, {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            alsostate({
+                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) {
+        if (
+          row.receiveAttachmentPath === null ||
+          row.receiveAttachmentPath === ''
+        ) {
+          EventBus.$emit(
+            'warning',
+            this.$t('system.noticeCircular.NoInformation')
+          )
+        } else {
+          this.accessoryTFs = true
+        }
+        this.appendixIdss = row.receiveAttachmentPath
+      },
+      handleExamine(row) {
+        this.$router.push({
+          name: 'salesContractExamine',
+          query: {
+            id: row.id
+          },
         })
-    },
-    find() {
-      if (this.inOutDate != null) {
-        if (this.inOutDate.length != 0) {
-          this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
-          this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
+      },
+      // 关闭 dialog时 处理文件url 初始化upload组件
+      handleCloe() {
+        this.dialogViewSpareMoney = false
+      },
+      history(row) {
+        billoperatehis({
+            id: row.id
+          })
+          .toPromise()
+          .then((response) => {
+            this.historyList = response
+          })
+      },
+      find() {
+        if (this.inOutDate != null) {
+          if (this.inOutDate.length != 0) {
+            this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
+            this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
+          } else {
+            this.startDate = ''
+            this.endDate = ''
+          }
         } else {
           this.startDate = ''
           this.endDate = ''
         }
-      }else{
-         this.startDate = ''
-          this.endDate = ''
-      }
-      this.currentPage = 1
-      this.getList()
+        this.currentPage = 1
+        this.getList()
+      },
     },
-  },
-}
+  }
 </script>
 <style lang="scss" scoped>
-.container {
-  width: 100%;
-  margin: 0 auto;
-}
-.vertical-text-left {
-  width: 62px;
-  text-align: right;
-}
-.el-button--primary {
-  background-color: #5878e8;
-  border-color: #5878e8;
-}
-.el-button--default {
-  color: #8890b1;
-  border-color: #e8eaf1;
-}
-/deep/.base_header_layout .grid-content.right .find.el-button--primary {
-  width: 30px;
-  margin-left: 0;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-}
-/deep/.findValue .el-input__inner {
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
-//操作按钮
-.record,
-.adjustment {
-  display: inline-block;
-  color: #5878e8;
-  padding: 0 4px !important;
-  position: relative;
-  font-size: 14px;
-}
-.record:after {
-  position: absolute;
-  content: '';
-  display: block;
-  top: 5px;
-  right: -2px;
-  width: 1px;
-  height: 12px;
-  background: #e9ecf7;
-}
-//状态样式
-.executory,
-.inExecution,
-.done {
-  width: 6px;
-  height: 6px;
-  display: inline-block;
-  border-radius: 50%;
-  position: relative;
-  top: -1px;
-  font-size: 14px;
-}
-.executory {
-  background: #ff9f24;
-}
-.inExecution {
-  background: #5878e8;
-}
-.done {
-  background: #50cad4;
-}
-.putstorage.el-button--default,
-.deliverystorage.el-button--default {
-  border-color: #8890b1;
-  background-color: #fff;
-  color: #8890b1;
-}
-/deep/.el-table td,
-/deep/.el-table th.is-leaf {
-  border-right: 1px solid #e9ecf7;
-  text-align: center;
-}
-/deep/.el-table tr td:first-child,
-/deep/.el-table tr th.is-leaf:first-child {
-  border-left: 1px solid #e9ecf7;
-}
-.el-row {
-  height: 60px;
-}
-.base_header_layout .grid-content {
-  margin-top: 80px;
-}
+  .container {
+    width: 100%;
+    margin: 0 auto;
+  }
+
+  .vertical-text-left {
+    width: 62px;
+    text-align: right;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+  }
+
+  .el-button--default {
+    color: #8890b1;
+    border-color: #e8eaf1;
+  }
+
+  /deep/.base_header_layout .grid-content.right .find.el-button--primary {
+    width: 30px;
+    margin-left: 0;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+
+  /deep/.findValue .el-input__inner {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
+
+  //操作按钮
+  .record,
+  .adjustment {
+    display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+    font-size: 14px;
+  }
+
+  .record:after {
+    position: absolute;
+    content: '';
+    display: block;
+    top: 5px;
+    right: -2px;
+    width: 1px;
+    height: 12px;
+    background: #e9ecf7;
+  }
+
+  //状态样式
+  .executory,
+  .inExecution,
+  .done {
+    width: 6px;
+    height: 6px;
+    display: inline-block;
+    border-radius: 50%;
+    position: relative;
+    top: -1px;
+    font-size: 14px;
+  }
+
+  .executory {
+    background: #ff9f24;
+  }
+
+  .inExecution {
+    background: #5878e8;
+  }
+
+  .done {
+    background: #50cad4;
+  }
+
+  .putstorage.el-button--default,
+  .deliverystorage.el-button--default {
+    border-color: #8890b1;
+    background-color: #fff;
+    color: #8890b1;
+  }
+
+  /deep/.el-table td,
+  /deep/.el-table th.is-leaf {
+    border-right: 1px solid #e9ecf7;
+    text-align: center;
+  }
+
+  /deep/.el-table tr td:first-child,
+  /deep/.el-table tr th.is-leaf:first-child {
+    border-left: 1px solid #e9ecf7;
+  }
+
+  .el-row {
+    height: 60px;
+  }
+
+  .base_header_layout .grid-content {
+    margin-top: 80px;
+  }
+
+  .el-input--small .el-input__inner {
+    margin-left: 20px;
+  }
+
+  .el-range-editor--small.el-input__inner {
+    height: 32px;
+    margin: 0 10px;
+  }
+
+  /deep/.el-pagination {
+    text-align: center;
+    white-space: nowrap;
+    padding: 2px 5px;
+    color: #303133;
+    font-weight: 700;
+    margin-bottom: 20px;
+  }
+
+  .el-select {
+    width: 30%;
+    margin-right: 10px;
+  }
 
-.el-input--small .el-input__inner {
-  margin-left: 20px;
-}
-.el-range-editor--small.el-input__inner {
-  height: 32px;
-  margin: 0 10px;
-}
-/deep/.el-pagination {
-  text-align: center;
-  white-space: nowrap;
-  padding: 2px 5px;
-  color: #303133;
-  font-weight: 700;
-  margin-bottom: 20px;
-}
-.el-select {
-  width: 30%;
-  margin-right: 10px;
-}
-/deep/.typeselect .el-input__inner {
-  color: #8890b1;
-}
+  /deep/.typeselect .el-input__inner {
+    color: #8890b1;
+  }
 </style>

src/views/tranManagement/tranManagementVehicle.vue

@@ -5,71 +5,30 @@
       <template slot="left"> </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"
-          />
+        <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>
         <div>
-          <span style="display: inline-block; width: 70px; color: #8890b1"
-            >接单日期：</span
-          >
+          <span style="display: inline-block; width: 70px; color: #8890b1">接单日期：</span>
         </div>
-        <el-date-picker
-          v-model="inOutDate"
-          type="daterange"
-          align="right"
-          unlink-panels
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        >
+        <el-date-picker v-model="inOutDate" type="daterange" align="right" unlink-panels range-separator="至"
+          start-placeholder="开始日期" end-placeholder="结束日期">
         </el-date-picker>
-        <ws-input
-          v-model="searchKeyWord"
-          placeholder="可按发货人、收货人、任务编号查找"
-          clearable
-          maxlength="500"
-          type="input"
-          class="findValue"
-          @keyup.enter.native="find()"
-        ></ws-input>
+        <ws-input v-model="searchKeyWord" placeholder="可按发货人、收货人、任务编号查找" clearable maxlength="500" type="input"
+          class="findValue" @keyup.enter.native="find()"></ws-input>
         <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
-        <ws-button class="find" type="primary" @click="find()"
-          ><img
-            width="16"
-            height="16"
-            style="
+        <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>
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button>
       </template>
     </BaseHeaderLayout>
-    <div>
-      <el-table
-        class="wenzi"
-        :data="warehouseList.records"
-        style="width: 100%"
-        height="780"
-      >
+      <el-table class="wenzi" :data="warehouseList.records" style="width: 100%" height="calc(100% - 110px)">
         <el-table-column prop="warehouseName" label="序号" width="80">
           <template scope="scope">
             <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
@@ -80,63 +39,40 @@
         </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"> 
+        <el-table-column prop="send" label="发货" width="300">
           <template scope="scope">
-             <span style='white-space :pre-wrap;' v-html="scope.row.send"></span>
+            <span style='white-space :pre-wrap;' v-html="scope.row.send"></span>
           </template>
         </el-table-column>
-        <el-table-column prop="receive" label="收货" width="300"> 
+        <el-table-column prop="receive" label="收货" width="300">
           <template scope="scope">
-             <span style='white-space :pre-wrap;' v-html="scope.row.receive"></span>
+            <span style='white-space :pre-wrap;' v-html="scope.row.receive"></span>
           </template>
         </el-table-column>
-        <el-table-column class="table_td" label="运输周期"  width="160">
+        <el-table-column class="table_td" label="运输周期" width="160">
           <template slot-scope="scope">
             {{ scope.row.deliveryDateStart }} ~ {{ scope.row.deliveryDateEnd }}
           </template>
         </el-table-column>
         <el-table-column prop="processStatus" label="状态">
           <template slot-scope="scope">
-            <el-popover
-              placement="left"
-              :width="285"
-              trigger="click"
-              visible-arrow="false"
-              @show="history(scope.row)"
-            >
+            <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 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">XXXXX</p>
-                <div
-                  v-for="(item, index) in historyList"
-                  :key="index"
-                  class="flex"
-                >
+                <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 v-if="index != historyList.length - 1" class="vertical-line"></div>
                   </div>
                   <div class="vertical-text">
                     {{ item.operateUser }}<br />{{ item.dealMsg }}
@@ -144,14 +80,8 @@
                 </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=""
-            />
+            <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" label="接单时间"> </el-table-column>
@@ -166,353 +96,389 @@
           </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 @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>
-import { automobileList, alsostate } from '@/model/transport/index'
-import Pagination from '@/components/Pagination'
-import WsUpload from '@/components/WsUpload'
-import { EventBus } from 'base-core-lib'
-import { billoperatehis } from '@/model/contarct/index'
-export default {
-  name: 'viewSpareMoney',
-  components: {
-    WsUpload,
-    Pagination,
-  },
-  watch: {
-    vesselId(val) {
-      this.getList()
-    },
-    isShow(val) {
-      this.showType = val
+  import {
+    automobileList,
+    alsostate
+  } from '@/model/transport/index'
+  import Pagination from '@/components/Pagination'
+  import WsUpload from '@/components/WsUpload'
+  import {
+    EventBus
+  } from 'base-core-lib'
+  import {
+    billoperatehis
+  } from '@/model/contarct/index'
+  export default {
+    name: 'viewSpareMoney',
+    components: {
+      WsUpload,
+      Pagination,
     },
-  },
-  data() {
-    return {
-      //弹出框
-      dialogViewSpareMoney: false,
-      dialogApproveFormVisible: false,
-      // 船舶类型
-      monetaryKey: null,
-      // 表格显示数据
-      tableDate: [],
-      // 是否显示
-      showType: true,
-      // 年
-      year: '',
-      currentPage: 1,
-      pageSize: 10,
-      deptBudgetTotal: 0,
-      searchTypeText: '执行中',
-      searchKeyWord: '',
-      contractType: 2,
-      searchType: 1,
-      // 提交类型
-      submitType: true,
-      size: 10,
-      spanArr: [],
-      inOutDate: [],
-      tranTypeKey: '1',
-      warehouseName: '',
-      compId: localStorage.getItem('ws-pf_compId'),
-      deptCircularPage: {},
-      warehouseList: [],
-      deptBudgetList: {},
-      historyList: [],
-      taskTypeList: [
-        { value: '执行中', type: 1 },
-        { value: '已完成', type: 2 },
-        { value: '全部任务', type: '' },
-      ],
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          return time.getTime() > Date.now()
-        },
+    watch: {
+      vesselId(val) {
+        this.getList()
+      },
+      isShow(val) {
+        this.showType = val
       },
-      accessoryTFs: false,
-    }
-  },
-  activated() {
-    this.getList()
-    this.showType = this.isShow
-  },
-  methods: {
-    //派车
-    warehousing(item) {
-      this.$router.push({
-        name: 'vehicleDispatchingcar',
-        query: {
-          id: item.id,
-        },
-      })
     },
-    //查看//传参
-    nocomplete(row) {
-      this.$router.push({
-        name: 'vehicleDispatchingview',
-        query: {
-          id: row.id,
+    data() {
+      return {
+        //弹出框
+        dialogViewSpareMoney: false,
+        dialogApproveFormVisible: false,
+        // 船舶类型
+        monetaryKey: null,
+        // 表格显示数据
+        tableDate: [],
+        // 是否显示
+        showType: true,
+        // 年
+        year: '',
+        currentPage: 1,
+        pageSize: 10,
+        deptBudgetTotal: 0,
+        searchTypeText: '执行中',
+        searchKeyWord: '',
+        contractType: 2,
+        searchType: 1,
+        // 提交类型
+        submitType: true,
+        size: 10,
+        spanArr: [],
+        inOutDate: [],
+        tranTypeKey: '1',
+        warehouseName: '',
+        compId: localStorage.getItem('ws-pf_compId'),
+        deptCircularPage: {},
+        warehouseList: [],
+        deptBudgetList: {},
+        historyList: [],
+        taskTypeList: [{
+            value: '执行中',
+            type: 1
+          },
+          {
+            value: '已完成',
+            type: 2
+          },
+          {
+            value: '全部任务',
+            type: ''
+          },
+        ],
+        pickerBeginDateBefore: {
+          disabledDate: (time) => {
+            return time.getTime() > Date.now()
+          },
         },
-      })
-    },
-    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')
-          )
-        }
+        accessoryTFs: false,
       }
-      return fmt
-    },
-    handleClose() {
-      this.accessoryTFs = false
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getList()
     },
-    handleCurrentChange(val) {
-      this.currentPage = val
-      console.log(`当前页: ${val}`)
+    activated() {
       this.getList()
+      this.showType = this.isShow
     },
-    changestatus(state) {
-      this.searchType = state
-      this.getList()
-    },
-    getList() {
-      automobileList({
-        compId: localStorage.getItem('ws-pf_compId'),
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        searchType: this.searchType,
-        startDate: this.startDate,
-        endDate: this.endDate,
-        searchKeyWord: this.searchKeyWord,
-        tranTypeKey: this.tranTypeKey,
-      })
-        .toPromise()
-        .then((response) => {
-          this.deptCircularPage.currentPage = response.current
-          this.deptCircularPage.pageSize = response.size
-          this.deptBudgetTotal = response.total
-          this.warehouseList = response
+    methods: {
+      //派车
+      warehousing(item) {
+        this.$router.push({
+          name: 'vehicleDispatchingcar',
+          query: {
+            id: item.id,
+          },
         })
-    },
-    editClick(row) {
-      var status = ''
-      if (row.processStatus == '待执行' || row.processStatus == '已完成') {
-        status = '执行中'
-      } else if (row.processStatus == '执行中') {
-        status = '已完成'
-      }
-      //cancelButtonClass: "btn-custom-cancel"
-      this.$confirm(`是否将状态改为${status}`, {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          alsostate({ 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
+      },
+      //查看//传参
+      nocomplete(row) {
+        this.$router.push({
+          name: 'vehicleDispatchingview',
+          query: {
+            id: row.id,
+          },
         })
-    },
-    selecttaskType(e) {
-      for (var i = 0; i < this.taskTypeList.length; i++) {
-        if (this.taskTypeList[i].value == e) {
-          this.searchType = this.taskTypeList[i].type
+      },
+      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()          // 秒
+          // 有其他格式化字符需求可以继续添加，必须转化成字符串
         }
-      }
-    },
-    history(row) {
-      billoperatehis({ id: row.id })
-        .toPromise()
-        .then((response) => {
-          this.historyList = response
-        })
-    },
-    find() {
-      if (this.inOutDate != null) {
-        if (this.inOutDate.length > 0) {
-          this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
-          this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
+        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.accessoryTFs = false
+      },
+      handleSizeChange(val) {
+        console.log(`每页 ${val} 条`)
+        this.pageSize = val
+        this.getList()
+      },
+      handleCurrentChange(val) {
+        this.currentPage = val
+        console.log(`当前页: ${val}`)
+        this.getList()
+      },
+      changestatus(state) {
+        this.searchType = state
+        this.getList()
+      },
+      getList() {
+        automobileList({
+            compId: localStorage.getItem('ws-pf_compId'),
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+            searchType: this.searchType,
+            startDate: this.startDate,
+            endDate: this.endDate,
+            searchKeyWord: this.searchKeyWord,
+            tranTypeKey: this.tranTypeKey,
+          })
+          .toPromise()
+          .then((response) => {
+            this.deptCircularPage.currentPage = response.current
+            this.deptCircularPage.pageSize = response.size
+            this.deptBudgetTotal = response.total
+            this.warehouseList = response
+          })
+      },
+      editClick(row) {
+        var status = ''
+        if (row.processStatus == '待执行' || row.processStatus == '已完成') {
+          status = '执行中'
+        } else if (row.processStatus == '执行中') {
+          status = '已完成'
+        }
+        //cancelButtonClass: "btn-custom-cancel"
+        this.$confirm(`是否将状态改为${status}`, {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+          })
+          .then(() => {
+            alsostate({
+                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
+          }
+        }
+      },
+      history(row) {
+        billoperatehis({
+            id: row.id
+          })
+          .toPromise()
+          .then((response) => {
+            this.historyList = response
+          })
+      },
+      find() {
+        if (this.inOutDate != null) {
+          if (this.inOutDate.length > 0) {
+            this.startDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[0])
+            this.endDate = this.dateFormat('YYYY-mm-dd', this.inOutDate[1])
+          } else {
+            this.startDate = ''
+            this.endDate = ''
+          }
         } else {
           this.startDate = ''
           this.endDate = ''
         }
-      }else{
-        this.startDate = ''
-          this.endDate = ''
-      }
-      this.currentPage = 1
-      this.getList()
+        this.currentPage = 1
+        this.getList()
+      },
     },
-  },
-}
+  }
 </script>
 <style lang="scss" scoped>
-.connert {
-  width: 90%;
-  margin: 0 auto;
-}
-.vertical-text-left {
-  width: 62px;
-  text-align: right;
-}
-.el-button--primary {
-  background-color: #5878e8;
-  border-color: #5878e8;
-}
-.el-button--default {
-  color: #8890b1;
-  border-color: #e8eaf1;
-}
-/deep/.base_header_layout .grid-content.right .find.el-button--primary {
-  width: 30px;
-  margin-left: 0;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-}
-/deep/.findValue .el-input__inner {
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
-//操作按钮
-.record,
-.adjustment {
-  display: inline-block;
-  color: #5878e8;
-  padding: 0 4px !important;
-  position: relative;
-  font-size: 14px;
-}
-.record:after {
-  position: absolute;
-  content: '';
-  display: block;
-  top: 5px;
-  right: -2px;
-  width: 1px;
-  height: 12px;
-  background: #e9ecf7;
-}
-//状态样式
-.executory,
-.inExecution,
-.done {
-  width: 6px;
-  height: 6px;
-  display: inline-block;
-  border-radius: 50%;
-  position: relative;
-  top: -1px;
-  font-size: 14px;
-}
-.executory {
-  background: #ff9f24;
-}
-.inExecution {
-  background: #5878e8;
-}
-.done {
-  background: #50cad4;
-}
-.putstorage.el-button--default,
-.deliverystorage.el-button--default {
-  border-color: #8890b1;
-  background-color: #fff;
-  color: #8890b1;
-}
-/deep/.el-table td,
-/deep/.el-table th.is-leaf {
-  border-right: 1px solid #e9ecf7;
-  text-align: center;
-}
-/deep/.el-table tr td:first-child,
-/deep/.el-table tr th.is-leaf:first-child {
-  border-left: 1px solid #e9ecf7;
-}
-.record,
-.adjustment {
-  display: inline-block;
-  color: #5878e8;
-  padding: 0 4px !important;
-  position: relative;
-}
-.record:after {
-  position: absolute;
-  content: '';
-  display: block;
-  top: 5px;
-  right: -2px;
-  width: 1px;
-  height: 12px;
-  background: #e9ecf7;
-}
-.el-row {
-  height: 60px;
-}
-.base_header_layout .grid-content {
-  margin-top: 80px;
-}
-.el-input--small .el-input__inner {
-  margin-left: 20px;
-}
-.el-range-editor--small.el-input__inner {
-  height: 32px;
-  margin: 0 10px;
-}
-/deep/.el-pagination {
-  text-align: center;
-  white-space: nowrap;
-  padding: 2px 5px;
-  color: #303133;
-  font-weight: 700;
-  margin-bottom: 20px;
-}
-.el-select {
-  width: 30%;
-  margin-right: 10px;
-}
-/deep/.typeselect .el-input__inner {
-  color: #8890b1;
-}
+  .connert {
+    width: 90%;
+    margin: 0 auto;
+  }
+
+  .vertical-text-left {
+    width: 62px;
+    text-align: right;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+  }
+
+  .el-button--default {
+    color: #8890b1;
+    border-color: #e8eaf1;
+  }
+
+  /deep/.base_header_layout .grid-content.right .find.el-button--primary {
+    width: 30px;
+    margin-left: 0;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+
+  /deep/.findValue .el-input__inner {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
+
+  //操作按钮
+  .record,
+  .adjustment {
+    display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+    font-size: 14px;
+  }
+
+  .record:after {
+    position: absolute;
+    content: '';
+    display: block;
+    top: 5px;
+    right: -2px;
+    width: 1px;
+    height: 12px;
+    background: #e9ecf7;
+  }
+
+  //状态样式
+  .executory,
+  .inExecution,
+  .done {
+    width: 6px;
+    height: 6px;
+    display: inline-block;
+    border-radius: 50%;
+    position: relative;
+    top: -1px;
+    font-size: 14px;
+  }
+
+  .executory {
+    background: #ff9f24;
+  }
+
+  .inExecution {
+    background: #5878e8;
+  }
+
+  .done {
+    background: #50cad4;
+  }
+
+  .putstorage.el-button--default,
+  .deliverystorage.el-button--default {
+    border-color: #8890b1;
+    background-color: #fff;
+    color: #8890b1;
+  }
+
+  /deep/.el-table td,
+  /deep/.el-table th.is-leaf {
+    border-right: 1px solid #e9ecf7;
+    text-align: center;
+  }
+
+  /deep/.el-table tr td:first-child,
+  /deep/.el-table tr th.is-leaf:first-child {
+    border-left: 1px solid #e9ecf7;
+  }
+
+  .record,
+  .adjustment {
+    display: inline-block;
+    color: #5878e8;
+    padding: 0 4px !important;
+    position: relative;
+  }
+
+  .record:after {
+    position: absolute;
+    content: '';
+    display: block;
+    top: 5px;
+    right: -2px;
+    width: 1px;
+    height: 12px;
+    background: #e9ecf7;
+  }
+
+  .el-row {
+    height: 60px;
+  }
+
+  .base_header_layout .grid-content {
+    margin-top: 80px;
+  }
+
+  .el-input--small .el-input__inner {
+    margin-left: 20px;
+  }
+
+  .el-range-editor--small.el-input__inner {
+    height: 32px;
+    margin: 0 10px;
+  }
+
+  /deep/.el-pagination {
+    text-align: center;
+    white-space: nowrap;
+    padding: 2px 5px;
+    color: #303133;
+    font-weight: 700;
+    margin-bottom: 20px;
+  }
+
+  .el-select {
+    width: 30%;
+    margin-right: 10px;
+  }
+
+  /deep/.typeselect .el-input__inner {
+    color: #8890b1;
+  }
 </style>

src/views/warehouse/warehouseManagementList.vue

@@ -45,7 +45,8 @@
       </template>
     </BaseHeaderLayout>
     <div v-show="this.warehouseType == '1'" class="main_css">
-      <el-table show-summary :summary-method="getSummaries" class="wenzi" :data="warehouseList" style="width: 100%; margin-top: 20px" height="100%">
+      <el-table show-summary :summary-method="getSummaries" class="wenzi" :data="warehouseList"
+        style="width: 100%; margin-top: 20px" height="calc(100% - 50px)">
         <el-table-column prop="warehouseName" label="仓库名">
         </el-table-column>
         <el-table-column prop="binNumber" label="仓位编号">
@@ -228,7 +229,7 @@
             </el-form-item>
             <!--仓库名称-->
             <el-form-item label="仓库名称" span="1" prop="warehouseName">
-              <el-select v-model="parameter.warehouseName" placeholder="请选择仓库名称" filterable  clearable>
+              <el-select v-model="parameter.warehouseName" placeholder="请选择仓库名称" filterable clearable>
                 <el-option v-for="item in packtypeList" :key="item.constKey" :label="item.warehouseName"
                   :value="item.warehouseName" />
               </el-select>
@@ -346,69 +347,72 @@
 
     methods: {
       getSummaries(param) {
-      const { columns, data } = param
-      const sums = []
-      columns.forEach((column, index) => {
-        if (index === 0) {
-          sums[index] = '合计'
-        } else if (
-          index === 4 ||
-          index === 5 ||
-          index === 6 
-        ) {
-          const values = data.map((item) => {
-            var val=item.warehouseNumViewList.map((items) => {
-            if(column.label=='入库量（吨）'){
-              return items.inNetWeight
-            }else if(column.label=='出库量（吨）'){
-              return items.outNetWeight
-            }else if(column.label=='应余量（吨）'){
-              return items.storage
-            }
-          })
-            return val
-          })
-          if (!values.every((value) => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              if(curr.length>1){
-                var num=0
-                for (let i = 0; i < curr.length; i++) {
-                  num+=Number(curr[i])
+        const {
+          columns,
+          data
+        } = param
+        const sums = []
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = '合计'
+          } else if (
+            index === 4 ||
+            index === 5 ||
+            index === 6
+          ) {
+            const values = data.map((item) => {
+              var val = item.warehouseNumViewList.map((items) => {
+                if (column.label == '入库量（吨）') {
+                  return items.inNetWeight
+                } else if (column.label == '出库量（吨）') {
+                  return items.outNetWeight
+                } else if (column.label == '应余量（吨）') {
+                  return items.storage
                 }
-                return Number(prev) +num
-              }else{
-                const value = Number(curr)
-                if (!isNaN(value)) {
-                  return Number(prev) + Number(curr)
+              })
+              return val
+            })
+            if (!values.every((value) => isNaN(value))) {
+              sums[index] = values.reduce((prev, curr) => {
+                if (curr.length > 1) {
+                  var num = 0
+                  for (let i = 0; i < curr.length; i++) {
+                    num += Number(curr[i])
+                  }
+                  return Number(prev) + num
                 } else {
-                  return Number(prev)
+                  const value = Number(curr)
+                  if (!isNaN(value)) {
+                    return Number(prev) + Number(curr)
+                  } else {
+                    return Number(prev)
+                  }
                 }
-              }
-            }, 0)
+              }, 0)
+            } else {
+              sums[index] = '--'
+            }
           } else {
-          sums[index] = '--'
+            sums[index] = '--'
+          }
+        })
+        if (typeof sums[4] == 'number') {
+          sums[4] = sums[4].toFixed(3)
         }
-        } else {
-          sums[index] = '--'
+        if (typeof sums[5] == 'number') {
+          sums[5] = sums[5].toFixed(3)
         }
-      })
-      if(typeof sums[4] =='number'){
-        sums[4]=sums[4].toFixed(3)
-      }
-      if(typeof sums[5] =='number'){
-        sums[5]=sums[5].toFixed(3)
-      }
-      if(typeof sums[6] =='number'){
-        sums[6]=sums[6].toFixed(3)
-      }
-			// sums[5]=sums[5].toFixed(2)
-      // sums[6]=sums[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-12]=sums[sums.length-12].toFixed(2)
-      // sums[sums.length-13]=sums[sums.length-13].toFixed(2)
-      return sums
-    },
+        if (typeof sums[6] == 'number') {
+          sums[6] = sums[6].toFixed(3)
+        }
+        // sums[5]=sums[5].toFixed(2)
+        // sums[6]=sums[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-12]=sums[sums.length-12].toFixed(2)
+        // sums[sums.length-13]=sums[sums.length-13].toFixed(2)
+        return sums
+      },
       //导出、打印
       outData(index) {
         if (index == 1) {
@@ -556,7 +560,8 @@
                           if (response1.length == 0) {
                             sessionStorage.setItem('inOutWarehouse_Print', JSON.stringify(warehousePrint))
                             let _canshu = ''
-                            _canshu = this.parameter.radio +'&warehouseName=' + this.parameter.warehouseName+'&startDate=' + this.parameter.startDate+'&endDate=' + this.parameter.startDate
+                            _canshu = this.parameter.radio + '&warehouseName=' + this.parameter.warehouseName +
+                              '&startDate=' + this.parameter.startDate + '&endDate=' + this.parameter.startDate
                             window.open('../../../../../static/warehousePrint.html?type=' + _canshu)
                           }
                         } else { //增量为0时
@@ -566,14 +571,16 @@
                       //跳转
                       sessionStorage.setItem('inOutWarehouse_Print', JSON.stringify(warehousePrint))
                       let _canshu = ''
-                      _canshu = this.parameter.radio + '&warehouseName=' + this.parameter.warehouseName+'&startDate=' + this.parameter.startDate+'&endDate=' + this.parameter.startDate
+                      _canshu = this.parameter.radio + '&warehouseName=' + this.parameter.warehouseName +
+                        '&startDate=' + this.parameter.startDate + '&endDate=' + this.parameter.startDate
                       window.open('../../../../../static/warehousePrint.html?type=' + _canshu)
 
                     })
                 } else { //没有增量比例的直接打印
                   sessionStorage.setItem('inOutWarehouse_Print', JSON.stringify(response.records))
                   let _canshu1 = ''
-                  _canshu1 = this.parameter.radio + '&warehouseName=' + this.parameter.warehouseName+'&startDate=' + this.parameter.startDate+'&endDate=' + this.parameter.startDate
+                  _canshu1 = this.parameter.radio + '&warehouseName=' + this.parameter.warehouseName +
+                    '&startDate=' + this.parameter.startDate + '&endDate=' + this.parameter.startDate
                   window.open('../../../../../static/warehousePrint.html?type=' + _canshu1)
                 }
               }
@@ -1112,7 +1119,7 @@
   }
 
   .main_css {
-    height: calc(100vh - 124px);
+    height: calc(100% - 40px);
   }
 
   //打印弹窗