修改切换选项后搜索

src/views/contractManagement/futuresPurchaseContract.vue

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

src/views/contractManagement/futuresSalesContract.vue

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

src/views/contractManagement/purchaseContract.vue

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

src/views/contractManagement/salesContract.vue

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

src/views/financialManagement/collectionManagementList.vue

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

src/views/outboundManagement/weighingManagement.vue

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

src/views/purchasingManagement/purchaseOrderList.vue

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

src/views/salesManagement/salesPlanOrderList.vue

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

src/views/taskManagement/moveWarehouseTask.vue

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

src/views/taskManagement/tranManagementTransport.vue

@@ -32,81 +32,81 @@
         </div>
       </template>
     </BaseHeaderLayout>
-      <el-table class="wenzi" :data="gainList.records" style="width: 100%; " height="calc(100% - 110px)">
-        <el-table-column type="index" label="序号">
-          <template scope="scope">
-            <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
-            <span v-else>{{ scope.$index + 1 }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="taskNo" label="运输任务编号" width="140"></el-table-column>
-        <el-table-column prop="contractNo" label="合同编号" width="160"></el-table-column>
-        <el-table-column prop=" weight" class="table_td" label="货物（吨数）" width="130">
-          <template slot-scope="scope">{{ scope.row.goodsName }}({{ scope.row.weight }})</template>
-        </el-table-column>
-        <el-table-column prop="tranType" class="table_td" label="运输方式" width="120"></el-table-column>
-        <el-table-column prop class="table_td" label="起点">
-          <template slot-scope="scope">
-            {{ scope.row.startPrivate }}{{ scope.row.startCity
+    <el-table class="wenzi" :data="gainList.records" style="width: 100%; " height="calc(100% - 110px)">
+      <el-table-column type="index" label="序号">
+        <template scope="scope">
+          <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+          <span v-else>{{ scope.$index + 1 }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="taskNo" label="运输任务编号" width="140"></el-table-column>
+      <el-table-column prop="contractNo" label="合同编号" width="160"></el-table-column>
+      <el-table-column prop=" weight" class="table_td" label="货物（吨数）" width="130">
+        <template slot-scope="scope">{{ scope.row.goodsName }}({{ scope.row.weight }})</template>
+      </el-table-column>
+      <el-table-column prop="tranType" class="table_td" label="运输方式" width="120"></el-table-column>
+      <el-table-column prop class="table_td" label="起点">
+        <template slot-scope="scope">
+          {{ scope.row.startPrivate }}{{ scope.row.startCity
             }}{{ scope.row.startArea }}{{ scope.row.startDetailedAddress }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="currentTransferAddress" class="table_td" label="当前中转">
-        </el-table-column>
-        <el-table-column prop="end" class="table_td" label="终点">
-          <template slot-scope="scope">
-            {{ scope.row.endPrivate }}{{ scope.row.endCity
+        </template>
+      </el-table-column>
+      <el-table-column prop="currentTransferAddress" class="table_td" label="当前中转">
+      </el-table-column>
+      <el-table-column prop="end" class="table_td" label="终点">
+        <template slot-scope="scope">
+          {{ scope.row.endPrivate }}{{ scope.row.endCity
             }}{{ scope.row.endArea }}{{ scope.row.endDetailedAddress }}{{scope.row.receiveWarehouse}}
-          </template>
-        </el-table-column>
-
-        <el-table-column prop="status" label="状态" width="100">
-          <template slot-scope="scope">
-            <el-popover placement="left" :width="285" trigger="click" visible-arrow="false" @show="history(scope.row)">
-              <template>
-                <span slot="reference">
-                  <span v-if="scope.row.status == '待执行'" class="executory"></span>
-                  <span v-if="scope.row.status == '执行中'" class="inExecution"></span>
-                  <span v-if="scope.row.status == '已完成'" class="done"></span>
-                  {{ scope.row.status }}
-                </span>
-              </template>
-              <div>
-                <p style="margin-top: 0; padding-left: 10px">操作历史</p>
-                <div v-for="(item, index) in historyList" class="flex">
-                  <div class="vertical-text vertical-text-left">{{ item.updateDate }}</div>
-                  <div>
-                    <div class="vertical-circle"></div>
-                    <div v-if="index != historyList.length - 1" class="vertical-line"></div>
-                  </div>
-                  <div class="vertical-text">
-                    {{ item.operateUser }}
-                    <br />
-                    {{ item.dealMsg }}
-                  </div>
+        </template>
+      </el-table-column>
+
+      <el-table-column prop="status" label="状态" width="100">
+        <template slot-scope="scope">
+          <el-popover placement="left" :width="285" trigger="click" visible-arrow="false" @show="history(scope.row)">
+            <template>
+              <span slot="reference">
+                <span v-if="scope.row.status == '待执行'" class="executory"></span>
+                <span v-if="scope.row.status == '执行中'" class="inExecution"></span>
+                <span v-if="scope.row.status == '已完成'" class="done"></span>
+                {{ scope.row.status }}
+              </span>
+            </template>
+            <div>
+              <p style="margin-top: 0; padding-left: 10px">操作历史</p>
+              <div v-for="(item, index) in historyList" class="flex">
+                <div class="vertical-text vertical-text-left">{{ item.updateDate }}</div>
+                <div>
+                  <div class="vertical-circle"></div>
+                  <div v-if="index != historyList.length - 1" class="vertical-line"></div>
+                </div>
+                <div class="vertical-text">
+                  {{ item.operateUser }}
+                  <br />
+                  {{ item.dealMsg }}
                 </div>
               </div>
-            </el-popover>
-            <img width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
-              src="../../../public/img/edit.png" @click="editClick(scope.row)" alt />
-          </template>
-        </el-table-column>
-        <el-table-column prop="seller" label="操作" width="160">
-          <template slot-scope="scope">
-            <div class="record" @click="nocomplete(scope.row)" v-hasPermission="
+            </div>
+          </el-popover>
+          <img width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
+            src="../../../public/img/edit.png" @click="editClick(scope.row)" alt />
+        </template>
+      </el-table-column>
+      <el-table-column prop="seller" label="操作" width="160">
+        <template slot-scope="scope">
+          <div class="record" @click="nocomplete(scope.row)" v-hasPermission="
            `transportationTask.transportation.transportationInfo.view`
           ">查看</div>
-            <div class="record" @click="delivery(scope.row)" v-hasPermission="
+          <div class="record" @click="delivery(scope.row)" v-hasPermission="
            `transportationTask.transportation.transportationInfo.edit`
           ">编辑</div>
-            <div class="record1" @click="deleteclick(scope.row)" v-hasPermission="
+          <div class="record1" @click="deleteclick(scope.row)" v-hasPermission="
            `transportationTask.transportation.transportationInfo.delete`
           ">删除</div>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
-        :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal"></el-pagination>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+      :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal"></el-pagination>
   </div>
 </template>
 <script>
@@ -421,6 +421,7 @@
         for (var i = 0; i < this.taskTypeList.length; i++) {
           if (this.taskTypeList[i].value == e) {
             this.searchType = this.taskTypeList[i].type
+            this.find()
           }
         }
       },