Explorar o código

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

mxx %!s(int64=3) %!d(string=hai) anos
pai
achega
3a89e3d283
Modificáronse 28 ficheiros con 1982 adicións e 1787 borrados
  1. 1 1
      public/static/payprint.html
  2. 2 0
      src/components/mapdrag/mapdrag.vue
  3. 2 0
      src/views/contractManagement/futuresPurchaseContractAdd.vue
  4. 2 0
      src/views/contractManagement/futuresPurchaseContractEdit.vue
  5. 2 0
      src/views/contractManagement/futuresSalesContractEdit.vue
  6. 916 838
      src/views/contractManagement/purchaseContract.vue
  7. 3 0
      src/views/contractManagement/purchaseContractAdd.vue
  8. 2 0
      src/views/contractManagement/purchaseContractEdit.vue
  9. 923 868
      src/views/contractManagement/salesContract.vue
  10. 2 0
      src/views/contractManagement/salesContractAdd.vue
  11. 2 0
      src/views/contractManagement/salesContractEdit.vue
  12. 15 5
      src/views/houseSelfCollect/customerManagementAdd.vue
  13. 4 2
      src/views/houseSelfCollect/inspectionManagement.vue
  14. 37 24
      src/views/houseSelfCollect/paymentManagement.vue
  15. 3 2
      src/views/houseSelfCollect/weighingManagement.vue
  16. 0 1
      src/views/houseSelfCollect/weightCheck.vue
  17. 6 6
      src/views/login/index.vue
  18. 4 0
      src/views/statisticalReport/stockPurchaseReceiptReportList.vue
  19. 1 0
      src/views/taskManagement/tranManagementTransportAdd.vue
  20. 1 0
      src/views/taskManagement/tranManagementTransportEdit.vue
  21. 43 4
      src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue
  22. 2 8
      src/views/tradeServicesManagement/approveWarehouseReceipt.vue
  23. 1 1
      src/views/tradeServicesManagement/inOutRecord.vue
  24. 2 8
      src/views/tradeServicesManagement/reviewWarehouseReceipt.vue
  25. 2 9
      src/views/tradeServicesManagement/warehouseReceiptEdit.vue
  26. 2 8
      src/views/tradeServicesManagement/warehouseReceiptLook.vue
  27. 1 1
      src/views/tranManagement/tranManagementVehicleDispatching.vue
  28. 1 1
      src/views/warehouse/warehouseManagementRecord.vue

+ 1 - 1
public/static/payprint.html

@@ -172,7 +172,7 @@
       }
 
       .center {
-        height: 140vh;
+        height: 120vh;
       }
      /* .onlypz-center{
         height: 130vh;

+ 2 - 0
src/components/mapdrag/mapdrag.vue

@@ -411,6 +411,7 @@
           zoomEnable: true,
           dragEnable: true,
         }
+
         this.map.setStatus(status)
         this.loadmap()
       },
@@ -500,6 +501,7 @@
         _data.push(this.district)
         _data.push(this.address)
         _data.push(this.type)
+        _data.push(this.center)
         this.$emit('addressListen', _data)
         this.$parent.blurMap()
         console.log("submit")

+ 2 - 0
src/views/contractManagement/futuresPurchaseContractAdd.vue

@@ -552,12 +552,14 @@
           this.deptBudgetList.contractGoodsInfo.outputPrivate = data[0]
           this.deptBudgetList.contractGoodsInfo.outputCity = data[1]
           this.deptBudgetList.contractGoodsInfo.outputArea = data[2]
+          this.deptBudgetList.sourceLocation=data[5].lat+','+data[5].lng
         } else {
           this.newSelectedOptions1 = data[0] + '/' + data[1] + '/' + data[2]
           this.deptBudgetList.deliveryProvince = CodeToText[this.selectedOptions[0]]
           this.deptBudgetList.deliveryCity = data[1]
           this.deptBudgetList.deliveryArea = data[2]
           this.deptBudgetList.placeDelivery = data[3]
+          this.deptBudgetList.deliveryLocation=data[5].lat+','+data[5].lng
         }
       },
       mapInputClick(type) {

+ 2 - 0
src/views/contractManagement/futuresPurchaseContractEdit.vue

@@ -731,12 +731,14 @@ export default {
         this.deptBudgetList.contractGoodsInfo.outputPrivate =  data[0]
         this.deptBudgetList.contractGoodsInfo.outputCity =  data[1]
         this.deptBudgetList.contractGoodsInfo.outputArea =  data[2]
+        this.deptBudgetList.sourceLocation=data[5].lat+','+data[5].lng
       } else {
         this.newSelectedOptions1 = data[0] + '/' + data[1] + '/' + data[2]
         this.deptBudgetList.deliveryProvince = CodeToText[this.selectedOptions[0]]
         this.deptBudgetList.deliveryCity = data[1]
         this.deptBudgetList.deliveryArea = data[2]
         this.deptBudgetList.placeDelivery = data[3]
+        this.deptBudgetList.deliveryLocation=data[5].lat+','+data[5].lng
       }
     },
     mapInputClick(type) {

+ 2 - 0
src/views/contractManagement/futuresSalesContractEdit.vue

@@ -437,12 +437,14 @@
           this.deptBudgetList.contractGoodsInfo.outputPrivate = data[0]
           this.deptBudgetList.contractGoodsInfo.outputCity = data[1]
           this.deptBudgetList.contractGoodsInfo.outputArea = data[2]
+          this.deptBudgetList.sourceLocation=data[5].lat+','+data[5].lng
         } else {
           this.newSelectedOptions1 = data[0] + '/' + data[1] + '/' + data[2]
           this.deptBudgetList.deliveryProvince = CodeToText[this.selectedOptions[0]]
           this.deptBudgetList.deliveryCity = data[1]
           this.deptBudgetList.deliveryArea = data[2]
           this.deptBudgetList.placeDelivery = data[3]
+          this.deptBudgetList.deliveryLocation=data[5].lat+','+data[5].lng
         }
       },
       mapInputClick(type) {

+ 916 - 838
src/views/contractManagement/purchaseContract.vue

@@ -1,80 +1,128 @@
 <!--采购合同-->
 <!--2019年5月30日 20:25:16 by jlx-->
 <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>
-				<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-button
+        >
+      </template>
+      <template slot="right">
+        <span style="width: 142px; display: inline-block; color: #8890b1"
+          >状态:</span
+        >
+        <ws-select
+          v-model="searchTypeText"
+          placeholder=""
+          class="typeselect"
+          @change="selecttaskType"
+          :value="searchType"
+        >
+          <ws-option
+            v-for="item in taskTypeList"
+            :key="item.value"
+            :label="item.value"
+            :value="item.value"
+            style="color: #8890b1"
+          />
+        </ws-select>
+        <el-date-picker
+          v-model="value2"
+          type="daterange"
+          align="right"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :picker-options="pickerOptions"
+        >
+        </el-date-picker>
+        <ws-input
+          v-model="searchKeyWord"
+          placeholder="可按照合同编号、买方名称、卖方名称进行查找"
+          clearable
+          maxlength="500"
+          type="input"
+          class="findValue"
+        ></ws-input>
+        <ws-button class="find" type="primary" @click="find()"
+          ><img
+            width="16"
+            height="16"
+            style="
               vertical-align: text-top;
               position: relative;
               top: 0px;
               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="grade" label="品级" width="80">
-				<template slot-scope="scope">
-					<span v-if="scope.row.grade == '一等品'" class="top-grade">{{
+            "
+            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="grade" label="品级" width="80">
+        <template slot-scope="scope">
+          <span v-if="scope.row.grade == '一等品'" class="top-grade">{{
             scope.row.grade
           }}</span>
-					<span v-if="scope.row.grade == '二等品'" class="second-class">{{
+          <span v-if="scope.row.grade == '二等品'" class="second-class">{{
             scope.row.grade
           }}</span>
-					<span v-if="scope.row.grade == '三等品'" class="third-class">{{
+          <span v-if="scope.row.grade == '三等品'" class="third-class">{{
             scope.row.grade
           }}</span>
-					<span v-if="scope.row.grade == '等外'" class="substandard">{{
+          <span v-if="scope.row.grade == '等外'" class="substandard">{{
             scope.row.grade
           }}</span>
-				</template>
-			</el-table-column>
-			<el-table-column prop="weight" label="重量(吨)"> </el-table-column>
-			<el-table-column prop="unitContractPrice" label="合同单价(元)">
-			</el-table-column>
-			<el-table-column prop="packingMethod" label="包装方式"> </el-table-column>
-			<el-table-column prop="buyer" label="买方"> </el-table-column>
-			<el-table-column prop="seller" label="卖方"> </el-table-column>
-			<el-table-column prop="completedQuantity" label="已完成(吨)">
-				<template slot-scope="scope">
-					<span style="color: #5473e8; font-weight: 600">{{
+        </template>
+      </el-table-column>
+      <el-table-column prop="weight" label="重量(吨)"> </el-table-column>
+      <el-table-column prop="unitContractPrice" label="合同单价(元)">
+      </el-table-column>
+      <el-table-column prop="packingMethod" label="包装方式"> </el-table-column>
+      <el-table-column prop="buyer" label="买方"> </el-table-column>
+      <el-table-column prop="seller" label="卖方"> </el-table-column>
+      <el-table-column prop="completedQuantity" label="已完成(吨)">
+        <template slot-scope="scope">
+          <span style="color: #5473e8; font-weight: 600">{{
             scope.row.completedQuantity
           }}</span>
         </template>
       </el-table-column>
       <el-table-column prop="status" label="状态">
         <template slot-scope="scope">
-          <span v-if="scope.row.approveStatus">{{scope.row.approveStatus}}</span>
+          <span v-if="scope.row.approveStatus">{{
+            scope.row.approveStatus
+          }}</span>
           <el-popover
-           v-else
+            v-else
             placement="left"
             :width="285"
             trigger="click"
@@ -119,7 +167,7 @@
             </div>
           </el-popover>
           <img
-           v-if='!scope.row.approveStatus'
+            v-if="!scope.row.approveStatus"
             width="17"
             height="18"
             style="vertical-align: text-top; position: relative; top: -1px"
@@ -133,6 +181,8 @@
       <el-table-column prop="signingDate" label="签订日期"> </el-table-column>
       <el-table-column prop="mildewGrain" label="已付款(元)">
       </el-table-column>
+      <el-table-column prop="goodsNames" label="已开发票 (元)">
+      </el-table-column>
       <el-table-column prop="addressUrl" label="附件">
         <template slot-scope="scope">
           <img
@@ -144,11 +194,15 @@
             alt=""
           />
           <span v-if="scope.row.addressUrlArray != null">
-            {{scope.row.addressUrlArray.length == 0? "":scope.row.addressUrlArray.length}}
-            </span>
+            {{
+              scope.row.addressUrlArray.length == 0
+                ? ''
+                : scope.row.addressUrlArray.length
+            }}
+          </span>
         </template>
       </el-table-column>
-      <el-table-column prop="address" label="操作" width="200">
+      <el-table-column prop="address" label="操作" width="140">
         <template slot-scope="scope">
           <img
             width="16"
@@ -161,18 +215,25 @@
             "
             alt=""
           />
-          <div v-if='scope.row.approveStatus!="待决策人审核"&&scope.row.approveStatus||scope.row.status!="执行中"&&scope.row.status' style='display:inline-block;'>
-          <img
-            width="17"
-            height="16"
-            style="vertical-align: text-top; margin: 0 6px"
-            src="../../../public/img/bianji.png"
-            @click="handleEdit(scope.row)"
-            v-hasPermission="
-              `contractManagement.buyContract.buyContractInfo.edit`
+          <div
+            v-if="
+              (scope.row.approveStatus != '待决策人审核' &&
+                scope.row.approveStatus) ||
+              (scope.row.status != '执行中' && scope.row.status)
             "
-            alt=""
-          />
+            style="display: inline-block"
+          >
+            <img
+              width="17"
+              height="16"
+              style="vertical-align: text-top; margin: 0 6px"
+              src="../../../public/img/bianji.png"
+              @click="handleEdit(scope.row)"
+              v-hasPermission="
+                `contractManagement.buyContract.buyContractInfo.edit`
+              "
+              alt=""
+            />
           </div>
           <img
             width="16"
@@ -182,780 +243,797 @@
               position: relative;
               top: -1px;
               margin: 0 6px;
-            " src="../../../public/img/shanchu.png" v-hasPermission="
+            "
+            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" :size-limit="size"
-          @onChange="onChange" :comp-id="compId" :appendix-ids="appendixIdss"
-				accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
-		</WinseaContentModal>
-	</div>
+            "
+            @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"
+        :size-limit="size"
+        @onChange="onChange"
+        :comp-id="compId"
+        :appendix-ids="appendixIdss"
+        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:'',
-				//弹出框
-				dialogViewSpareMoney: false,
-				dialogApproveFormVisible: false,
-				// 船舶类型
-				monetaryKey: null,
-				// 表格显示数据
-				tableDate: [],
-				size: 10,
-				// 是否显示
-				showType: true,
-				// 年
-				year: '',
-				deliver_type: 1,
-				deptBudgetTotal: 0,
-				currentPage: 1,
-				pageSize: 10,
-				appendixIdsAdd: '',
-				searchType: 1,
-				searchTypeText: '未完成',
-				searchKeyWord: '',
-				contractType: 2,
-				goodsType: 1,
-				startDate: null,
-				endDate: null,
-				addressUrls: [],
-				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
-			},
-			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) {
-								if (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.accessoryTFs = true
-				this.appendixIdss = row.addressUrl
-				console.log(this.appendixIdss)
-			},
-			handleExamine(row) {
-				console.log(row)
-				this.$router.push({
-					name: 'purchaseContractExamine',
-					query: {
-						id: row.id,
-						status: row.status
-					},
-				})
-			},
-			handleAdd() {
-				this.$router.push({
-					path: 'purchaseContractAdd'
-				})
-			},
-			handleEdit(row) {
-				this.$router.push({
-					name: 'purchaseContractEdit',
-					query: {
-						id: row.id
-					},
-				})
-			},
-			// 关闭 dialog时 处理文件url 初始化upload组件
-			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: '',
+      //弹出框
+      dialogViewSpareMoney: false,
+      dialogApproveFormVisible: false,
+      // 船舶类型
+      monetaryKey: null,
+      // 表格显示数据
+      tableDate: [],
+      size: 10,
+      // 是否显示
+      showType: true,
+      // 年
+      year: '',
+      deliver_type: 1,
+      deptBudgetTotal: 0,
+      currentPage: 1,
+      pageSize: 10,
+      appendixIdsAdd: '',
+      searchType: 1,
+      searchTypeText: '未完成',
+      searchKeyWord: '',
+      contractType: 2,
+      goodsType: 1,
+      startDate: null,
+      endDate: null,
+      addressUrls: [],
+      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
+    },
+    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) {
+              if (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.accessoryTFs = true
+      this.appendixIdss = row.addressUrl
+      console.log(this.appendixIdss)
+    },
+    handleExamine(row) {
+      console.log(row)
+      this.$router.push({
+        name: 'purchaseContractExamine',
+        query: {
+          id: row.id,
+          status: row.status,
+        },
+      })
+    },
+    handleAdd() {
+      this.$router.push({
+        path: 'purchaseContractAdd',
+      })
+    },
+    handleEdit(row) {
+      this.$router.push({
+        name: 'purchaseContractEdit',
+        query: {
+          id: row.id,
+        },
+      })
+    },
+    // 关闭 dialog时 处理文件url 初始化upload组件
+    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(text, '提示', {
-						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(text, '提示', {
+        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>

+ 3 - 0
src/views/contractManagement/purchaseContractAdd.vue

@@ -585,12 +585,15 @@
           this.deptBudgetList.sourceCity = data[1]
           this.deptBudgetList.sourceArea = data[2]
           this.deptBudgetList.sourceGoods = data[3]
+          console.log(data[4])
+          this.deptBudgetList.sourceLocation=data[5].lat+','+data[5].lng
         } else {
           this.newSelectedOptions1 = data[0] + '/' + data[1] + '/' + data[2]
           this.deptBudgetList.deliveryProvince = data[0]
           this.deptBudgetList.deliveryCity = data[1]
           this.deptBudgetList.deliveryArea = data[2]
           this.deptBudgetList.placeDelivery = data[3]
+          this.deptBudgetList.deliveryLocation=data[5].lat+','+data[5].lng
         }
       },
       mapInputClick(type) {

+ 2 - 0
src/views/contractManagement/purchaseContractEdit.vue

@@ -393,12 +393,14 @@
           this.deptBudgetList.sourceCity = data[1]
           this.deptBudgetList.sourceArea = data[2]
           this.deptBudgetList.sourceGoods = data[3]
+          this.deptBudgetList.sourceLocation=data[5].lat+','+data[5].lng
         } else {
           this.newSelectedOptions1 = data[0] + '/' + data[1] + '/' + data[2]
           this.deptBudgetList.deliveryProvince = data[0]
           this.deptBudgetList.deliveryCity = data[1]
           this.deptBudgetList.deliveryArea = data[2]
           this.deptBudgetList.placeDelivery = data[3]
+          this.deptBudgetList.deliveryLocation=data[5].lat+','+data[5].lng
         }
       },
       mapInputClick(type) {

+ 923 - 868
src/views/contractManagement/salesContract.vue

@@ -1,20 +1,29 @@
 <!--销售合同-->
 <!--2019年5月30日 20:25:16 by jlx-->
 <template>
-	<div>
-		<BaseHeaderLayout :leftSpan="8">
-			<template slot="left">
-				<ws-button type="primary" @click="handleAdd()" v-hasPermission="
+  <div>
+    <BaseHeaderLayout :leftSpan="8">
+      <template slot="left">
+        <ws-button
+          type="primary"
+          @click="handleAdd()"
+          v-hasPermission="
             `contractManagement.salesContract.salesContractInfo.add`
-          ">添加</ws-button>
-				<ws-button @click="exportlist()" v-hasPermission="
-            `contractManagement.salesContract.salesContractInfo.view`"
+          "
+          >添加</ws-button
+        >
+        <ws-button
+          @click="exportlist()"
+          v-hasPermission="
+            `contractManagement.salesContract.salesContractInfo.view`
+          "
           >导出</ws-button
         >
       </template>
       <template slot="right">
         <span style="width: 142px; display: inline-block; color: #8890b1"
-          >状态:</span>
+          >状态:</span
+        >
         <ws-select
           v-model="searchTypeText"
           placeholder=""
@@ -59,32 +68,40 @@
               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="grade" label="品级" width="80">
-				<template slot-scope="scope">
-					<span v-if="scope.row.grade == '一等品'" class="top-grade">{{
+            "
+            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="grade" label="品级" width="80">
+        <template slot-scope="scope">
+          <span v-if="scope.row.grade == '一等品'" class="top-grade">{{
             scope.row.grade
           }}</span>
-					<span v-if="scope.row.grade == '二等品'" class="second-class">{{
+          <span v-if="scope.row.grade == '二等品'" class="second-class">{{
             scope.row.grade
           }}</span>
-					<span v-if="scope.row.grade == '三等品'" class="third-class">{{
+          <span v-if="scope.row.grade == '三等品'" class="third-class">{{
             scope.row.grade
           }}</span>
-					<span v-if="scope.row.grade == '等外'" class="substandard">{{
+          <span v-if="scope.row.grade == '等外'" class="substandard">{{
             scope.row.grade
           }}</span>
         </template>
@@ -111,8 +128,11 @@
       </el-table-column>
       <el-table-column prop="status" label="状态">
         <template slot-scope="scope">
-          <span v-if="scope.row.approveStatus">{{scope.row.approveStatus}}</span>
-          <el-popover v-else
+          <span v-if="scope.row.approveStatus">{{
+            scope.row.approveStatus
+          }}</span>
+          <el-popover
+            v-else
             placement="left"
             :width="285"
             trigger="click"
@@ -152,7 +172,8 @@
               </div>
             </div>
           </el-popover>
-          <img v-if='!scope.row.approveStatus'
+          <img
+            v-if="!scope.row.approveStatus"
             width="17"
             height="18"
             style="vertical-align: text-top; position: relative; top: -1px"
@@ -165,6 +186,8 @@
       <el-table-column prop="signingDate" label="签订日期"> </el-table-column>
       <el-table-column prop="mildewGrain" label="未回款(元)">
       </el-table-column>
+      <el-table-column prop="goodsNames" label="已开发票 (元)">
+      </el-table-column>
       <el-table-column prop="addressUrl" label="附件">
         <template slot-scope="scope">
           <img
@@ -176,33 +199,47 @@
             alt=""
           />
           <span v-if="scope.row.addressUrlArray != null">{{
-            scope.row.addressUrlArray.length == 0 ? "":scope.row.addressUrlArray.length
+            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="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.salesContract.salesContractInfo.view`
-            "
-            alt=""
-          />
-          <div v-if='scope.row.approveStatus!="待决策人审核"&&scope.row.approveStatus||scope.row.status!="执行中"&&scope.row.status' style='display:inline-block;'>
-            <img
-            width="17"
+          <!-- <i @click="fujian(scope.row)" class="el-icon-paperclip iconCss"></i> -->
+        </template>
+      </el-table-column>
+      <el-table-column prop="address" label="操作" width="140">
+        <template slot-scope="scope">
+          <img
+            width="16"
             height="16"
             style="vertical-align: text-top; margin: 0 6px"
-            src="../../../public/img/bianji.png"
+            src="../../../public/img/chakan.png"
+            @click="handleExamine(scope.row)"
             v-hasPermission="
-              `contractManagement.salesContract.salesContractInfo.edit`
+              `contractManagement.salesContract.salesContractInfo.view`
             "
-            @click="handleEdit(scope.row)"
             alt=""
           />
+          <div
+            v-if="
+              (scope.row.approveStatus != '待决策人审核' &&
+                scope.row.approveStatus) ||
+              (scope.row.status != '执行中' && scope.row.status)
+            "
+            style="display: inline-block"
+          >
+            <img
+              width="17"
+              height="16"
+              style="vertical-align: text-top; margin: 0 6px"
+              src="../../../public/img/bianji.png"
+              v-hasPermission="
+                `contractManagement.salesContract.salesContractInfo.edit`
+              "
+              @click="handleEdit(scope.row)"
+              alt=""
+            />
           </div>
-          
+
           <img
             width="16"
             height="17"
@@ -211,829 +248,847 @@
               position: relative;
               top: -1px;
               margin: 0 6px;
-            " src="../../../public/img/shanchu.png" v-hasPermission="
+            "
+            src="../../../public/img/shanchu.png"
+            v-hasPermission="
               `contractManagement.salesContract.salesContractInfo.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" :size-limit="size"
-          @onChange="onChange" :comp-id="compId" :appendix-ids="appendixIdss"
-				accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
-		</WinseaContentModal>
-	</div>
+            "
+            @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"
+        :size-limit="size"
+        @onChange="onChange"
+        :comp-id="compId"
+        :appendix-ids="appendixIdss"
+        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,
-		fmoney,
-		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:'',
-				//弹出框
-				dialogViewSpareMoney: false,
-				dialogApproveFormVisible: false,
-				// 船舶类型
-				monetaryKey: null,
-				// 表格显示数据
-				tableDate: [],
-				size: 10,
-				// 是否显示
-				showType: true,
-				// 年
-				year: '',
-				deptBudgetTotal: 0,
-				currentPage: 1,
-				pageSize: 10,
-				appendixIdsAdd: '',
-				searchType: 1,
-				searchTypeText: '未完成',
-				searchKeyWord: '',
-				contractType: 1,
-				goodsType: 1,
-				startDate: null,
-				endDate: null,
-				// 提交类型
-				submitType: true,
-				contractForm: {},
-				categoryIndex: 0,
-				rulesVendor: {},
-				size: 10,
-				appendixIdss: [],
-				compId: localStorage.getItem('ws-pf_compId'),
-				deptCircularPage: {},
-				date: {
-					year: dayjs().format('YYYY'),
-					month: dayjs().format('MM'),
-				},
-				contractList: [],
-				deptBudgetList: {},
-				historyList: [],
-				pickerBeginDateBefore: {
-					disabledDate: (time) => {
-						return time.getTime() > Date.now()
-					},
-				},
-				accessoryTFs: false,
-				accesscard: false,
-				accessurl: '',
-				fileList: [],
-				taskTypeList: [{
-						value: '未完成',
-						type: 1
-					},
-					{
-						value: '已完成',
-						type: 2
-					},
-					{
-						value: '未回款',
-						type: 3
-					},
-					{
-						value: '全部合同',
-						type: ''
-					},
-				],
-				addressUrls: [],
-				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) {
-								if (response.records[i].addressUrl != '') {
-									response.records[i].addressUrlArray =
-										response.records[i].addressUrl.split(',')
-								}
-							} else {
-								response.records[i].addressUrlArray = []
-							}
-
-							if (response.records[i].imperfectGrain != null) {
-								response.records[i].proportion =
-									Math.floor(
-										(response.records[i].imperfectGrain /
-											response.records[i].weight) *
-										10000
-									) / 100
-							} else {
-								response.records[i].proportion = 0
-							}
-						}
-						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 = '已完成'
-				}
-				//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
-					}
-				}
-			},
-			// receiveAttachmentPath
-			fujian(row) {
-				this.id=row.id
-				this.accessoryTFs = true
-				this.appendixIdss = row.addressUrl
-				console.log(this.appendixIdss)
-			},
-			handleExamine(row) {
-				this.$router.push({
-					name: 'salesContractExamine',
-					query: {
-						id: row.id
-					},
-				})
-			},
-			handleAdd() {
-				this.$router.push({
-					path: 'salesContractAdd'
-				})
-			},
-			handleEdit(row) {
-				this.$router.push({
-					name: 'salesContractEdit',
-					query: {
-						id: row.id
-					},
-				})
-			},
-
-			// 关闭 dialog时 处理文件url 初始化upload组件
-			handleCloe() {
-				this.dialogViewSpareMoney = false
-			},
-			history(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, fmoney, 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: '',
+      //弹出框
+      dialogViewSpareMoney: false,
+      dialogApproveFormVisible: false,
+      // 船舶类型
+      monetaryKey: null,
+      // 表格显示数据
+      tableDate: [],
+      size: 10,
+      // 是否显示
+      showType: true,
+      // 年
+      year: '',
+      deptBudgetTotal: 0,
+      currentPage: 1,
+      pageSize: 10,
+      appendixIdsAdd: '',
+      searchType: 1,
+      searchTypeText: '未完成',
+      searchKeyWord: '',
+      contractType: 1,
+      goodsType: 1,
+      startDate: null,
+      endDate: null,
+      // 提交类型
+      submitType: true,
+      contractForm: {},
+      categoryIndex: 0,
+      rulesVendor: {},
+      size: 10,
+      appendixIdss: [],
+      compId: localStorage.getItem('ws-pf_compId'),
+      deptCircularPage: {},
+      date: {
+        year: dayjs().format('YYYY'),
+        month: dayjs().format('MM'),
+      },
+      contractList: [],
+      deptBudgetList: {},
+      historyList: [],
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          return time.getTime() > Date.now()
+        },
+      },
+      accessoryTFs: false,
+      accesscard: false,
+      accessurl: '',
+      fileList: [],
+      taskTypeList: [
+        {
+          value: '未完成',
+          type: 1,
+        },
+        {
+          value: '已完成',
+          type: 2,
+        },
+        {
+          value: '未回款',
+          type: 3,
+        },
+        {
+          value: '全部合同',
+          type: '',
+        },
+      ],
+      addressUrls: [],
+      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) {
+              if (response.records[i].addressUrl != '') {
+                response.records[i].addressUrlArray =
+                  response.records[i].addressUrl.split(',')
+              }
+            } else {
+              response.records[i].addressUrlArray = []
+            }
+
+            if (response.records[i].imperfectGrain != null) {
+              response.records[i].proportion =
+                Math.floor(
+                  (response.records[i].imperfectGrain /
+                    response.records[i].weight) *
+                    10000
+                ) / 100
+            } else {
+              response.records[i].proportion = 0
+            }
+          }
+          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 = '已完成'
+      }
+      //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
+        }
+      }
+    },
+    // receiveAttachmentPath
+    fujian(row) {
+      this.id = row.id
+      this.accessoryTFs = true
+      this.appendixIdss = row.addressUrl
+      console.log(this.appendixIdss)
+    },
+    handleExamine(row) {
+      this.$router.push({
+        name: 'salesContractExamine',
+        query: {
+          id: row.id,
+        },
+      })
+    },
+    handleAdd() {
+      this.$router.push({
+        path: 'salesContractAdd',
+      })
+    },
+    handleEdit(row) {
+      this.$router.push({
+        name: 'salesContractEdit',
+        query: {
+          id: row.id,
+        },
+      })
+    },
+
+    // 关闭 dialog时 处理文件url 初始化upload组件
+    handleCloe() {
+      this.dialogViewSpareMoney = false
+    },
+    history(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',
-				})
-			},
-
-			handleDelete(row) {
-				var handleDelete = ' '
-				if (row.handleDelete == '') {}
-				this.$confirm(
-						`删除该合同将同时永久删除合同对应的临时仓库相关数据,是否确定删除?`, {
-							cancelButtonText: '取消',
-							confirmButtonText: '确定',
-							type: 'warning',
-						}
-					)
-					.then(() => {
-						deletecontract({
-								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
-					})
-			},
-		},
-	}
+        type: 'xls',
+      })
+    },
+
+    handleDelete(row) {
+      var handleDelete = ' '
+      if (row.handleDelete == '') {
+      }
+      this.$confirm(
+        `删除该合同将同时永久删除合同对应的临时仓库相关数据,是否确定删除?`,
+        {
+          cancelButtonText: '取消',
+          confirmButtonText: '确定',
+          type: 'warning',
+        }
+      )
+        .then(() => {
+          deletecontract({
+            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
+        })
+    },
+  },
+}
 </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: 100px;
-		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;
-		}
-
-		.el-message-box {
-			width: 440px;
-			height: 160px;
-			background: #ffffff;
-			box-shadow: 0px 2px 31px 0px rgba(66, 75, 112, 0.23);
-			border-radius: 4px;
-		}
-
-		/deep/.el-message-box__message p {
-			width: 351px;
-			height: 20px;
-			font-size: 14px;
-			font-weight: 400;
-			color: #191919;
-			line-height: 20px;
-		}
-
-		.el-message-box__title {
-			width: 440px;
-			height: 160px;
-			background: #ffffff;
-			box-shadow: 0px 2px 31px 0px rgba(66, 75, 112, 0.23);
-			border-radius: 4px;
-		}
-	}
-
-	/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: 100px;
+  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;
+  }
+
+  .el-message-box {
+    width: 440px;
+    height: 160px;
+    background: #ffffff;
+    box-shadow: 0px 2px 31px 0px rgba(66, 75, 112, 0.23);
+    border-radius: 4px;
+  }
+
+  /deep/.el-message-box__message p {
+    width: 351px;
+    height: 20px;
+    font-size: 14px;
+    font-weight: 400;
+    color: #191919;
+    line-height: 20px;
+  }
+
+  .el-message-box__title {
+    width: 440px;
+    height: 160px;
+    background: #ffffff;
+    box-shadow: 0px 2px 31px 0px rgba(66, 75, 112, 0.23);
+    border-radius: 4px;
+  }
+}
+
+/deep/.typeselect .el-input__inner {
+  color: #8890b1;
+}
 </style>

+ 2 - 0
src/views/contractManagement/salesContractAdd.vue

@@ -556,12 +556,14 @@
           this.deptBudgetList.sourceCity = data[1]
           this.deptBudgetList.sourceArea = data[2]
           this.deptBudgetList.sourceGoods = data[3]
+          this.deptBudgetList.sourceLocation=data[5].lat+','+data[5].lng
         } else {
           this.newSelectedOptions1 = data[0] + '/' + data[1] + '/' + data[2]
           this.deptBudgetList.deliveryProvince = data[0]
           this.deptBudgetList.deliveryCity = data[1]
           this.deptBudgetList.deliveryArea = data[2]
           this.deptBudgetList.placeDelivery = data[3]
+          this.deptBudgetList.deliveryLocation=data[5].lat+','+data[5].lng
         }
       },
       mapInputClick(type) {

+ 2 - 0
src/views/contractManagement/salesContractEdit.vue

@@ -476,12 +476,14 @@
           this.deptBudgetList.sourceCity = data[1]
           this.deptBudgetList.sourceArea = data[2]
           this.deptBudgetList.sourceGoods = data[3]
+          this.deptBudgetList.sourceLocation=data[5].lat+','+data[5].lng
         } else {
           this.newSelectedOptions1 = data[0] + '/' + data[1] + '/' + data[2]
           this.deptBudgetList.deliveryProvince = data[0]
           this.deptBudgetList.deliveryCity = data[1]
           this.deptBudgetList.deliveryArea = data[2]
           this.deptBudgetList.placeDelivery = data[3]
+          this.deptBudgetList.deliveryLocation=data[5].lat+','+data[5].lng
         }
       },
       mapInputClick(type) {

+ 15 - 5
src/views/houseSelfCollect/customerManagementAdd.vue

@@ -269,7 +269,7 @@
         disabled: false,
         identity: [],
         bank: [],
-        trader: '新增',
+        trader: '',
         switchType: '',
         identityImgUp: [{
           url: '',
@@ -298,12 +298,15 @@
     },
     activated() {
       this.switchType = this.$route.query.types
-      if (this.$route.query.types == null) {
+      if (!this.switchType) {
         this.switchType = 1
+        this.trader = '新增'
         this.imageUrl1 = ''
         this.imageUrl2 = ''
         this.imageUrl3 = ''
         this.imageUrl4 = ''
+        this.trader = '新增'
+         this.disabled = false
         this.customerList = {}
       }
       let id = this.$route.query.id
@@ -395,25 +398,32 @@
               } else {}
             })
         }
-
-
       },
       cancel() {
         this.customerList = {}
         this.verifyCode = ''
+        this.disabled = false
+        this.trader = ''
         this.$router.push({
           path: 'customerManagement'
         })
       },
       obtainWH(e,index){
           //获取图片宽高
+          let type = this.$route.query.types
           var img_url = e.url;//图片URL地址
              var imgObj = new Image();//创建对象
              imgObj.src = img_url;//改变图片地址
              imgObj.onload = function(){
                if(Number(imgObj.width) < Number(imgObj.height)){
                  let i = document.getElementsByClassName("avatar");
-                 i[index].style.width='auto'
+                 if(!type){
+                   for( j = 0 ; j < i.length ; j++){
+                     i[j].style.width='auto'
+                   }
+                 }else{
+                    i[index].style.width='auto'
+                 }
                   let j = document.getElementsByClassName("avatar-uploader" + (index+1))
                   j[0].style.background = "#e7e3e3"
                }

+ 4 - 2
src/views/houseSelfCollect/inspectionManagement.vue

@@ -183,10 +183,12 @@
 			},
 			inspectInfo(row, index) {
 				for (let i = 0; i < this.warehouseList.length; i++) {
-					if (this.WAREHOUSE[1].payname == this.warehouseList[i].value) {
+					if (this.warehouseName == this.warehouseList[i].value) {
+						// console.log(this.warehouseList[i])
 						this.cangid = this.warehouseList[i].id
 					}
 				}
+				// console.log(this.cangid)
 				//添加,编辑,查看
 				this.$router.push({
 					path: 'inspectInfo',
@@ -264,7 +266,7 @@
 						let _wareHouse = localStorage.getItem('houseSelfCollect_house1')
 						_wareHouse = JSON.parse(_wareHouse)
 						if (_wareHouse) {
-								this.cangid = _wareHouse.id
+								this.cangid = _wareHouse.warehouseId
 								this.warehouseName = _wareHouse.value
 								this.warehouseNo = _wareHouse.No
 								this.warehouseCount = _wareHouse.count

+ 37 - 24
src/views/houseSelfCollect/paymentManagement.vue

@@ -24,15 +24,13 @@
         <!-- <ws-button type="primary" @click="screen(2)">待结算</ws-button>
         <ws-button type="primary" @click="screen(0)">待审核</ws-button>
         <ws-button type="primary"  @click="screen()">全部</ws-button>-->
-        <ws-button :type="searchType == 1 ? 'primary' : ''" @click="screen(1)" >待审核
-        </ws-button>
+        <ws-button :type="searchType == ''? 'primary' : ''" @click="screen(-1)">全部</ws-button>
+        <ws-button :type="searchType == 1 ? 'primary' : ''" @click="screen(1)">待审核</ws-button>
         <div v-hasPermission="`acquisitionManagement.acquisitionPay.pay`">
-          <ws-button :type="searchType == 7 ? 'primary' : ''" @click="screen(7)"
-          >待付款</ws-button>
-          </div>
-        <ws-button :type="searchType == 2 ? 'primary' : ''" @click="screen(2)"
-          v-hasPermission="`acquisitionManagement.acquisitionPay.add`">待结算</ws-button>
-        <ws-button :type="searchType == -1 ? 'primary' : ''" @click="screen(-1)">全部</ws-button>
+          <ws-button :type="searchType == 7 ? 'primary' : ''" @click="screen(7)">待付款</ws-button>
+        </div>
+        <ws-button :type="searchType == 2 ? 'primary' : ''" @click="screen(2)" v-hasPermission="`acquisitionManagement.acquisitionPay.add`">待结算</ws-button>
+        <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" style="margin: 0 10px">
@@ -111,6 +109,12 @@
           <span v-else>{{ scope.row.status }}</span>
         </template>
       </el-table-column>
+      <el-table-column class="table_td" prop="status" width="100" label="是否开票">
+        <template scope="scope">
+          <span v-if="scope.row.approveStatus">未开票</span>
+          <span v-else>已开票</span>
+        </template>
+      </el-table-column>
       <el-table-column class="table_td" prop="collectionEdPayable" label="操作" width="300">
 
         <template scope="scope">
@@ -300,6 +304,7 @@ import download from '../../components/WsDownload/download'
         customerInfo: false,
         form: {},
         formLabelWidth: '300px',
+        invoicing:'',
         customerlist: {
           payeeAddressUrls: [],
         },
@@ -329,7 +334,7 @@ import download from '../../components/WsDownload/download'
         deptCircularPage: {},
         deptBudgetTotal: 0,
         paymentForm: false,
-        searchType: 1,
+        searchType: "",
         searchTypeText: '',
         searchKeyWord: '',
         warehouseList: [],
@@ -788,6 +793,7 @@ import download from '../../components/WsDownload/download'
         searchType: searchParam,
         warehouseName: this.warehouseName,
         managementType: 1,
+        invoicing:this.invoicing,
         compId: localStorage.getItem('ws-pf_compId')
       })
         .toPromise()
@@ -829,7 +835,11 @@ import download from '../../components/WsDownload/download'
           })
       },
       screen(num) {
-        this.searchType = num
+        if(num==0){
+          this.invoicing=num
+        }else{
+          this.searchType = num
+        }
         this.getList()
       },
       find() {
@@ -1047,20 +1057,20 @@ import download from '../../components/WsDownload/download'
       },
       selectInit(row) {
         //在这里一定要记得类型匹配的上。
-        if (row.status != '已驳回') {
-          if (
-            row.taskId == null &&
-            row.status != '已通过' &&
-            row.status != '部分付款'
-          ) {
-            return false
-          } else {
-            return true
-          }
-        } else {
-          return true
-        }
-        // return true
+        // if (row.status != '已驳回') {
+        //   if (
+        //     row.taskId == null &&
+        //     row.status != '已通过' &&
+        //     row.status != '部分付款'
+        //   ) {
+        //     return false
+        //   } else {
+        //     return true
+        //   }
+        // } else {
+        //   return true
+        // }
+        return true
       },
       handleSelectionChange(val) {
         this.modification = val
@@ -1293,4 +1303,7 @@ import download from '../../components/WsDownload/download'
   .warehouse_select{
     width:100%;
   }
+  .el-button{
+    margin: 5px;
+  }
 </style>

+ 3 - 2
src/views/houseSelfCollect/weighingManagement.vue

@@ -248,6 +248,7 @@
         this.getList()
       },
       weightCheck(row, num) {
+        console.log(this.cangid)
         this.$router.push({
           path: 'weightCheck',
           query: {
@@ -307,10 +308,10 @@
                 warehouseNo: response[i].commonWarehouseNo
               })
               if (_wareHouse) {
-                this.cangid = _wareHouse.id
+                this.cangid = _wareHouse.warehouseId
                 this.warehouseName = _wareHouse.value
                 this.common.name = _wareHouse.value
-                this.warehouseId = _wareHouse.id
+                this.warehouseId = _wareHouse.warehouseId
                 this.warehouseNo = _wareHouse.warehouseNo
                 this.monitorUrl1 = _wareHouse.monitorUrl1
                 this.allowEdit = _wareHouse.allowEdit

+ 0 - 1
src/views/houseSelfCollect/weightCheck.vue

@@ -694,7 +694,6 @@
                 .toPromise()
                 .then((response) => {
                   for (let i = 0; i < this.purchasePriceList.length; i++) {
-                    console.log(this.purchasePriceList, 'shangxiang')
                     if (
                       this.weighingList.goodsName == this.purchasePriceList[i].goodsName
                     ) {

+ 6 - 6
src/views/login/index.vue

@@ -175,22 +175,22 @@
                       $t('login.rememberPwd')
                     }}</span>
                   </el-checkbox>
-                  <div class="fr pointer forget-pwd">
+                  <!-- <div class="fr pointer forget-pwd">
                     <LangSelectText />
                     <span style="margin: 0 5px">|</span>
                     <span @click="forgetPassword">{{
                       $t('login.forgetPwd')
                     }}</span>
-                  </div>
+                  </div> -->
                 </div>
               </el-row>
               <div class="sign_up">
                 <el-button :loading="loading" type="primary" class="signIn-buttom" @click.native.prevent="handleLogin">
                   {{ $t('login.login') }}
                 </el-button>
-                <span class="register-buttom" @click="toRegister">{{
+                <!-- <span class="register-buttom" @click="toRegister">{{
                   $t('login.register')
-                }}</span>
+                }}</span> -->
               </div>
             </el-form>
             <!-- 快捷登录 -->
@@ -1202,7 +1202,7 @@
           .forget-pwd {
             display: inline-block;
             white-space: nowrap;
-            color: #fff;
+            // color: #fff;
             font-size: 12px;
             line-height: 19px;
           }
@@ -1383,7 +1383,7 @@
     .register-buttom {
       width: 15%;
       margin: 0 auto;
-      color: #fff;
+      // color: #fff;
       display: block;
       text-align: center;
       font-size: 12px;

+ 4 - 0
src/views/statisticalReport/stockPurchaseReceiptReportList.vue

@@ -988,6 +988,10 @@ export default {
             this.payNotMoney += response.records[i].amountNotPayable
             this.settlementWeight1 += response.records[i].settlementWeight
           }
+          this.payingMoney=this.payingMoney.toFixed(2)
+          this.payedMoney=this.payedMoney.toFixed(2)
+          this.payNotMoney=this.payNotMoney.toFixed(2)
+          this.settlementWeight1=this.settlementWeight1.toFixed(2)
           this.deptBudgetTotal = response.total
           this.warehouseList = response
         })

+ 1 - 0
src/views/taskManagement/tranManagementTransportAdd.vue

@@ -562,6 +562,7 @@ export default {
       for (var i = 0; i < this.contractNoList.length; i++) {
         if (this.contractNoList[i].contractNo == val) {
             this.deptBudgetList.goodsName = this.contractNoList[i].goodsName
+            this.deptBudgetList.weight= this.contractNoList[i].weight
         }
       }
     },

+ 1 - 0
src/views/taskManagement/tranManagementTransportEdit.vue

@@ -502,6 +502,7 @@ export default {
       for (var i = 0; i < this.contractNoList.length; i++) {
         if (this.contractNoList[i].contractNo == val) {
             this.deptBudgetList.goodsName = this.contractNoList[i].goodsName
+            this.deptBudgetList.weight= this.contractNoList[i].weight
         }
       }
     },

+ 43 - 4
src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -324,7 +324,7 @@
 					</el-form-item>
 							<!--预估运费(元/吨)-->
 					<el-form-item label="预估运费(元/吨)" span="1" >
-						<el-input v-model="dataList1.estimatedFreight" placeholder="请输入预估运费"
+						<el-input v-model="dataList.estimatedFreight" placeholder="请输入预估运费"
 							maxlength="20" size="small"  />
 					</el-form-item>
 					<!--发货人-->
@@ -861,7 +861,8 @@
 						})
 						return
 					}
-					if (!this.dataList.unitPrice) {
+					if(this.Pricetype){
+						if (!this.dataList.unitPrice) {
 						this.$message({
 							message: '单价不能为空!',
 							type: 'warning'
@@ -883,6 +884,9 @@
 						})
 						return
 					}
+					}
+					
+					
 					if (!this.dataList.predictDate) {
 						this.$message({
 							message: '预计出库日期不能为空!',
@@ -890,6 +894,13 @@
 						})
 						return
 					}
+				    if (isNaN(this.dataList.estimatedFreight)) {
+						this.$message({
+							message: '预估运费输入错误!',
+							type: 'warning'
+						})
+						return
+					}
 					// if (!this.dataList.agent) {
 					//   this.$message({
 					//     message: '出库经办人不能为空!',
@@ -1001,7 +1012,8 @@
 						})
 						return
 					}
-					if (!this.dataList1.unitPrice) {
+					if(this.Pricetype){
+						if (!this.dataList1.unitPrice) {
 						this.$message({
 							message: '单价不能为空!',
 							type: 'warning'
@@ -1023,12 +1035,21 @@
 						})
 						return
 					}
+					}
+					
 					if (!this.dataList1.predictDate) {
 						this.$message({
 							message: '预计入库日期不能为空!',
 							type: 'warning'
 						})
 						return
+					}
+					 if (isNaN(this.dataList1.estimatedFreight)) {
+						this.$message({
+							message: '预估运费输入错误!',
+							type: 'warning'
+						})
+						return
 					}
 					// if (!this.dataList1.agent) {
 					//   this.$message({
@@ -1095,6 +1116,13 @@
 							type: 'warning'
 						})
 						return
+					}
+					 if (isNaN(this.dataList1.estimatedFreight)) {
+						this.$message({
+							message: '预估运费输入错误!',
+							type: 'warning'
+						})
+						return
 					}
 					if (!this.dataList1.predictDate) {
 						this.$message({
@@ -1235,7 +1263,8 @@
 						})
 						return
 					}
-					if (!this.dataList1.unitPrice) {
+					if(this.Pricetype){
+						if (!this.dataList1.unitPrice) {
 						this.$message({
 							message: '单价不能为空!',
 							type: 'warning'
@@ -1257,6 +1286,8 @@
 						})
 						return
 					}
+					}
+					
 					if (!this.dataList.predictDate) {
 						this.$message({
 							message: '预计出库日期不能为空!',
@@ -1264,12 +1295,20 @@
 						})
 						return
 					}
+					
 					if (!this.dataList1.predictDate) {
 						this.$message({
 							message: '预计入库日期不能为空!',
 							type: 'warning'
 						})
 						return
+					}
+					 if (isNaN(this.dataList1.estimatedFreight)) {
+						this.$message({
+							message: '预估运费输入错误!',
+							type: 'warning'
+						})
+						return
 					}
 					// if (!this.dataList.agent) {
 					//   this.$message({

+ 2 - 8
src/views/tradeServicesManagement/approveWarehouseReceipt.vue

@@ -317,8 +317,8 @@
         </el-table-column>
         <el-table-column prop="inOutTaskNo" label="审核结果">
           <template scope="scope">
-            <span v-if="scope.row.approved" class="examine1">通过</span>
-            <span v-if="!scope.row.approved" class="examine2">驳回</span>
+            <span v-if="scope.row.approved" >通过</span>
+            <span v-if="!scope.row.approved" >驳回</span>
           </template>
         </el-table-column>
         <el-table-column prop="endTime" label="审核时间"></el-table-column>
@@ -793,10 +793,4 @@ export default {
     margin-left: 10px;
 	}
 }
-.examine1{
-    color: #50CAD4;
-  }
-   .examine2{
-    color: #FF9F24;
-  }
 </style>

+ 1 - 1
src/views/tradeServicesManagement/inOutRecord.vue

@@ -101,7 +101,7 @@
       <div>
         <el-input
           v-model="adjustment"
-          placeholder="输入申请金额"
+          placeholder=""
           size="small"
         ></el-input>
       </div>

+ 2 - 8
src/views/tradeServicesManagement/reviewWarehouseReceipt.vue

@@ -260,8 +260,8 @@
         </el-table-column>
         <el-table-column prop="inOutTaskNo" label="审核结果">
           <template scope="scope">
-            <span v-if="scope.row.approved" class="examine1">通过</span>
-            <span v-if="!scope.row.approved" class="examine2">驳回</span>
+            <span v-if="scope.row.approved" >通过</span>
+            <span v-if="!scope.row.approved" >驳回</span>
           </template>
         </el-table-column>
         <el-table-column prop="endTime" label="审核时间"></el-table-column>
@@ -559,10 +559,4 @@ export default {
   font-weight: 600;
   margin: 20px 0;
 }
-.examine1{
-    color: #50CAD4;
-  }
-   .examine2{
-    color: #FF9F24;
-  }
 </style>

+ 2 - 9
src/views/tradeServicesManagement/warehouseReceiptEdit.vue

@@ -187,8 +187,8 @@
         </el-table-column>
         <el-table-column prop="inOutTaskNo" label="审核结果">
           <template scope="scope">
-            <span v-if="scope.row.approved" class="examine1">通过</span>
-            <span v-if="!scope.row.approved" class="examine2">驳回</span>
+            <span v-if="scope.row.approved" >通过</span>
+            <span v-if="!scope.row.approved" >驳回</span>
           </template>
         </el-table-column>
         <el-table-column prop="endTime" label="审核时间"></el-table-column>
@@ -528,11 +528,4 @@ export default {
     font-weight: 600;
     margin: 20px 0;
   }
-  .examine1{
-    color: #50CAD4;
-  }
-   .examine2{
-    color: #FF9F24;
-  }
-
 </style>

+ 2 - 8
src/views/tradeServicesManagement/warehouseReceiptLook.vue

@@ -259,8 +259,8 @@
         </el-table-column>
         <el-table-column prop="inOutTaskNo" label="审核结果">
           <template scope="scope">
-            <span v-if="scope.row.approved" class="examine1">通过</span>
-            <span v-if="!scope.row.approved" class="examine2">驳回</span>
+            <span v-if="scope.row.approved" >通过</span>
+            <span v-if="!scope.row.approved" >驳回</span>
           </template>
         </el-table-column>
         <el-table-column prop="endTime" label="审核时间"></el-table-column>
@@ -500,12 +500,6 @@ export default {
     font-weight: 600;
     margin: 20px 0;
   }
-  .examine1{
-    color: #50CAD4;
-  }
-   .examine2{
-    color: #FF9F24;
-  }
   //轮播图
   .el-carousel__item h3 {
     color: #475669;

+ 1 - 1
src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -111,7 +111,7 @@
               <el-col :span="8">
 
                 <el-form-item label="姓名:" span="1" prop="driverName" label-width="125px">
-                  <el-select v-show="!item.temporaryDriverFlag" v-model="item.driver" placeholder="请选择司机"
+                  <el-select v-show="!item.temporaryDriverFlag" v-model="item.driver" filterable clearable placeholder="请选择司机"
                     class="row-item" @change="
                              (val) => {
                                carchange(val, index)

+ 1 - 1
src/views/warehouse/warehouseManagementRecord.vue

@@ -5,7 +5,7 @@
 				<h2 class="bg-left title">流转记录</h2>
 			</el-col>
 			<el-col :span="6" class="bg-right">
-				<el-button class="bg-bottom adjustment" type="primary" size="small" @click="iossrecord()"
+				<el-button class="bg-bottom" type="primary" size="small" @click="iossrecord()"
 					v-show="this.warehouseType != 2">盘损记录</el-button>
 				<el-button class="bg-bottom" type="primary" size="small" @click="returnWarehouse()">返回</el-button>
 			</el-col>