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

src/api/common/index.js

@@ -99,3 +99,5 @@ export const API_POST_UPLOADFILES = `/appendix/api/uploadFiles`
 export const API_POST_DELETEFILES = `/appendix/api/deleteFiles`
 // 上传附件
 export const API_POST_OTHERUPLOADFILES = `/appendix/api/uploadFiles`
+//获取公司下拉列表
+export const API_GET_API_COMPLIST = `/commonUser/getComp`

src/model/signIn/index.js

@@ -13,7 +13,8 @@ import {
   API_POST_VERICODE_API_SENDREGISTERCODE,
   API_POST_AUTH_API_GETTENANTINFOBYUSER,
   API_GET_COMPANY_COMPANYINFOBYDOMAINNAME,
-  API_GET_SYSTEM_FINDVESSELSYSVERSION
+  API_GET_SYSTEM_FINDVESSELSYSVERSION,
+  API_GET_API_COMPLIST
 } from '@/api/common'
 import { API_POST_REGISTER } from '@/api/V2/operation'
 // 登录页注册接口
@@ -34,3 +35,6 @@ export const getTenantInfoByUser = appRx.post(API_POST_AUTH_API_GETTENANTINFOBYU
 // 通过域名获取公司信息
 export const getCompanyInfo = appRx.get(API_GET_COMPANY_COMPANYINFOBYDOMAINNAME, errorCatcher, errorHandle, filter)
 export const findVesselSysVersion = appRx.get(API_GET_SYSTEM_FINDVESSELSYSVERSION, errorCatcher, errorHandle, filter)
+
+//获取公司下拉列表
+export const getcompList = appRx.get(API_GET_API_COMPLIST, errorCatcher, errorHandle, filter)

src/views/contractManagement/futuresPurchaseContract.vue

@@ -1,916 +1,881 @@
 <!--期货采购合同-->
 <template>
-  <div>
-    <BaseHeaderLayout :leftSpan="8">
-      <template slot="left">
-        <ws-button
-          type="primary"
-          @click="handleAdd()"
-          v-hasPermission="`contractManagement.buyContract.buyContractInfo.add`"
-          ><img
-            width="13"
-            height="13"
-            style="
+	<div>
+		<BaseHeaderLayout :leftSpan="8">
+			<template slot="left">
+				<ws-button type="primary" @click="handleAdd()"
+					v-hasPermission="`contractManagement.buyContract.buyContractInfo.add`"><img width="13" height="13"
+						style="
               vertical-align: text-top;
               position: relative;
               top: 2px;
               left: -4px;
-            "
-            src="../../../public/img/header-add.png"
-            alt=""
-          />添加</ws-button
-        >
-        <ws-button
-          @click="exportlist()"
-          v-hasPermission="
+            " src="../../../public/img/header-add.png" alt="" />添加</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>
-        <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
-        <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>
+				<!-- v-hasPermission="'procurement.sparepart.directShip'" -->
+				<ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
               vertical-align: text-top;
               position: relative;
               top: 0px;
               left: -8px;
-            "
-            src="../../../public/img/sousuo.png"
-            alt=""
-        /></ws-button>
-      </template>
-    </BaseHeaderLayout>
-    <el-table
-      class="wenzi"
-      :data="contractList.records"
-      style="width: 100%; margin-top: 10px"
-      height="780"
-    >
-      <el-table-column type="index" label="序号">
-        <template scope="scope">
-          <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
-          <span v-else>{{ scope.$index + 1 }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="contractNo" label="合同编号" width="80">
-      </el-table-column>
-      <el-table-column prop="goodsName" label="货名" width="80">
-      </el-table-column>
-      <el-table-column prop="weight" label="重量（吨）"> </el-table-column>
-      <el-table-column prop="pointPrice" label="暂定点价（元/吨）">
-      </el-table-column>
-      <el-table-column prop="basisPrice" label="基差（元/吨）"> </el-table-column>
-      <el-table-column prop="buyer" label="买方"> </el-table-column>
-      <el-table-column prop="seller" label="卖方"> </el-table-column>
-      <el-table-column prop="status" label="状态">
-        <template slot-scope="scope">
-          <el-popover
-            placement="left"
-            :width="285"
-            trigger="click"
-            visible-arrow="false"
-            @show="history(scope.row)"
-          >
-            <template>
-              <span slot="reference">
-                <span
-                  v-if="scope.row.status == '待执行'"
-                  class="executory"
-                ></span>
-                <span
-                  v-if="scope.row.status == '执行中'"
-                  class="inExecution"
-                ></span>
-                <span v-if="scope.row.status == '已完成'" class="done"></span
-                >{{ scope.row.status }}
-              </span>
-            </template>
-            <div>
-              <p style="margin-top: 0; padding-left: 10px">操作历史</p>
-              <div
-                v-for="(item, index) in historyList"
-                :key="index"
-                class="flex"
-              >
-                <div class="vertical-text vertical-text-left">
-                  {{ item.updateDate }}
-                </div>
-                <div>
-                  <div class="vertical-circle"></div>
-                  <div
-                    v-if="index != historyList.length - 1"
-                    class="vertical-line"
-                  ></div>
-                </div>
-                <div class="vertical-text">
-                  {{ item.operateUser }}<br />{{ item.dealMsg }}
-                </div>
-              </div>
-            </div>
-          </el-popover>
-          <img
-            width="17"
-            height="18"
-            style="vertical-align: text-top; position: relative; top: -1px"
-            src="../../../public/img/edit.png"
-            @click="editClick(scope.row)"
-            alt=""
-          />
-        </template>
-      </el-table-column>
-      <el-table-column prop="signingDate" label="签订日期"> </el-table-column>
-      <el-table-column prop="mildewGrain" label="已付款（元）">
-      </el-table-column>
-      <el-table-column prop="addressUrl" label="附件">
-        <template slot-scope="scope">
-          <img
-            width="18"
-            height="20"
-            style="vertical-align: text-top; position: relative; top: -1px"
-            src="../../../public/img/fujian.png"
-            @click="fujian(scope.row)"
-            alt=""
-          />
-          <span v-if="scope.row.addressUrlArray.length > 0">{{
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button>
+			</template>
+		</BaseHeaderLayout>
+		<el-table class="wenzi" :data="contractList.records" style="width: 100%; margin-top: 10px" height="780">
+			<el-table-column type="index" label="序号">
+				<template scope="scope">
+					<span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+					<span v-else>{{ scope.$index + 1 }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column prop="contractNo" label="合同编号" width="150">
+			</el-table-column>
+			<el-table-column prop="goodsName" label="货名" width="80">
+			</el-table-column>
+			<el-table-column prop="weight" label="重量（吨）"> </el-table-column>
+			<el-table-column prop="pointPrice" label="暂定点价（元/吨）">
+			</el-table-column>
+			<el-table-column prop="basisPrice" label="基差（元/吨）"> </el-table-column>
+			<el-table-column prop="buyer" label="买方"> </el-table-column>
+			<el-table-column prop="seller" label="卖方"> </el-table-column>
+			<el-table-column prop="status" label="状态">
+				<template slot-scope="scope">
+					<el-popover placement="left" :width="285" trigger="click" visible-arrow="false"
+						@show="history(scope.row)">
+						<template>
+							<span slot="reference">
+								<span v-if="scope.row.status == '待执行'" class="executory"></span>
+								<span v-if="scope.row.status == '执行中'" class="inExecution"></span>
+								<span v-if="scope.row.status == '已完成'" class="done"></span>{{ scope.row.status }}
+							</span>
+						</template>
+						<div>
+							<p style="margin-top: 0; padding-left: 10px">操作历史</p>
+							<div v-for="(item, index) in historyList" :key="index" class="flex">
+								<div class="vertical-text vertical-text-left">
+									{{ item.updateDate }}
+								</div>
+								<div>
+									<div class="vertical-circle"></div>
+									<div v-if="index != historyList.length - 1" class="vertical-line"></div>
+								</div>
+								<div class="vertical-text">
+									{{ item.operateUser }}<br />{{ item.dealMsg }}
+								</div>
+							</div>
+						</div>
+					</el-popover>
+					<img width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
+						src="../../../public/img/edit.png" @click="editClick(scope.row)" alt="" />
+				</template>
+			</el-table-column>
+			<el-table-column prop="signingDate" label="签订日期"> </el-table-column>
+			<el-table-column prop="mildewGrain" label="已付款（元）">
+			</el-table-column>
+			<el-table-column prop="addressUrl" label="附件">
+				<template slot-scope="scope">
+					<img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
+						src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
+					<span v-if="scope.row.addressUrlArray.length > 0">{{
             scope.row.addressUrlArray.length
           }}</span>
-          <!-- <i @click="fujian(scope.row)" class="el-icon-paperclip iconCss"></i> -->
-        </template>
-      </el-table-column>
-      <el-table-column prop="confirmCount" label="确认单" >
-      </el-table-column>
-      <el-table-column prop="address" label="操作" width="200">
-        <template slot-scope="scope">
-          <img
-            width="16"
-            height="16"
-            style="vertical-align: text-top; margin: 0 6px"
-            src="../../../public/img/chakan.png"
-            @click="handleExamine(scope.row)"
-            v-hasPermission="
+					<!-- <i @click="fujian(scope.row)" class="el-icon-paperclip iconCss"></i> -->
+				</template>
+			</el-table-column>
+			<el-table-column prop="confirmCount" label="确认单">
+			</el-table-column>
+			<el-table-column prop="address" label="操作" width="140">
+				<template slot-scope="scope">
+					<img width="16" height="16" style="vertical-align: text-top; margin: 0 6px"
+						src="../../../public/img/chakan.png" @click="handleExamine(scope.row)" v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.view`
-            "
-            alt=""
-          />
-          <img
-            width="17"
-            height="16"
-            style="vertical-align: text-top; margin: 0 6px"
-            src="../../../public/img/bianji.png"
-            @click="handleEdit(scope.row)"
-            v-hasPermission="
+            " alt="" />
+					<img width="17" height="16" style="vertical-align: text-top; margin: 0 6px"
+						src="../../../public/img/bianji.png" @click="handleEdit(scope.row)" v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.edit`
-            "
-            alt=""
-          />
-          <img
-            width="16"
-            height="17"
-            style="
+            " alt="" />
+					<img width="16" height="17" style="
               vertical-align: text-top;
               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"
-        :comp-id="compId"
-        :appendix-ids="appendixIdss"
-        :editable="false"
-        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" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
+				accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+
+		</WinseaContentModal>
+	</div>
 </template>
 <script>
-import {
-  getList,
-  export1,
-  editstatus,
-  billoperatehis,
-  deletecontract,
-} from '@/model/contarct/index'
-import { downloadFile } from '@/utils/batchDown'
-import Pagination from '@/components/Pagination'
-import WsUpload from '@/components/WsUpload'
-import { dayjs, EventBus } from 'base-core-lib'
-export default {
-  name: 'viewSpareMoney',
-  components: {
-    WsUpload,
-    Pagination,
-  },
-  watch: {
-    vesselId(val) {
-      this.getList()
-    },
-    isShow(val) {
-      this.showType = val
-    },
-  },
-  data() {
-    return {
-      //弹出框
-      dialogViewSpareMoney: false,
-      dialogApproveFormVisible: false,
-      // 船舶类型
-      monetaryKey: null,
-      // 表格显示数据
-      tableDate: [],
-      size: 10,
-      // 是否显示
-      showType: true,
-      // 年
-      year: '',
-      deliver_type: 1,
-      deptBudgetTotal: 0,
-      currentPage: 1,
-      pageSize: 10,
-      appendixIdsAdd: '',
-      searchType: 1,
-      searchTypeText: '未完成',
-      searchKeyWord: '',
-      contractType: 2,
-      goodsType: 2,
-      startDate: null,
-      endDate: null,
-      addressUrls: [],
-      accessurl: '',
-      accesscard: false,
-      // 提交类型
-      submitType: true,
-      deptCircularPage: {},
-      date: {
-        year: dayjs().format('YYYY'),
-        month: dayjs().format('MM'),
-      },
-      contractList: [],
-      deptBudgetList: {},
-      historyList: [],
-      appendixIdss: [],
-      fileList:[],
-      compId: sessionStorage.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: {
-    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: sessionStorage.getItem('ws-pf_compId'),
-        contractType: this.contractType,
-        goodsType:this.goodsType,
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        searchType: this.searchType,
-        searchKeyWord: this.searchKeyWord,
-        startDate: this.startDate,
-        endDate: this.endDate,
-        contrPage: this.contrPage,
-      })
-        .toPromise()
-        .then((response) => {
-          for (var i = 0; i < response.records.length; i++) {
-            if (response.records[i].addressUrl != null&&response.records[i].addressUrl != "") {
-              response.records[i].addressUrlArray =
-                response.records[i].addressUrl.split(',')
-            } else {
-              response.records[i].addressUrlArray = []
-            }
-          }
-          this.deptCircularPage.currentPage = response.current
-          this.deptCircularPage.pageSize = response.size
-          this.deptBudgetTotal = response.total
-          this.contractList = response
-          for (var i = 0; i < response.records.length; i++) {
-            var arr = new Array()
-            this.addressUrls[i] = new Array()
-            if (this.contractList.records[i].addressUrl != null) {
-              arr = this.contractList.records[i].addressUrl.split(',')
-              this.addressUrls[i] = arr
-            }
-          }
-        })
-    },
-    // 上传附件
-    uploadSuccess(data, files, url) {
-      console.log(data, files, url)
-
-      // this.deptBudgetList.
-      // this.formData.append('files', files)
-      // this.feedbackObj.uploadNameAttachment = data.appendixName
-      // this.feedbackObj.pathUploadAttachment = data.appendixPath
-      // // this.newAppendixs = files
-      // this.onChangeFlag = true
-    },
-    editClick(row) {
-      var status = ''
-      if (row.status == '待执行' || row.status == '已完成') {
-        status = '执行中'
-      } else if (row.status == '执行中') {
-        status = '已完成'
-      }
-      this.$confirm(`是否将状态改为${status}`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          editstatus({ id: row.id })
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '状态修改成功',
-              })
-              this.getList()
-            })
-            .catch((response) => {
-              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-            })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    selecttaskType(e) {
-      for (var i = 0; i < this.taskTypeList.length; i++) {
-        if (this.taskTypeList[i].value == e) {
-          this.searchType = this.taskTypeList[i].type
-        }
-      }
-    },
-    fujian(row) {
-      if (row.addressUrl === null || row.addressUrl === '') {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
-      }
-      this.appendixIdss = row.addressUrl
-      console.log(this.appendixIdss)
-      this.accessoryTFs = true
-    },
-    handleExamine(row) {
-      console.log(row)
-      this.$router.push({
-        name: 'futuresPurchaseContractExamine',
-        query: { id: row.id, status: row.status },
-      })
-    },
-    handleAdd() {
-      this.$router.push({ path: 'futuresPurchaseContractAdd' })
-    },
-    handleEdit(row) {
-      this.$router.push({
-        name: 'futuresPurchaseContractEdit',
-        query: { id: row.id },
-      })
-    },
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    handleCloe() {
-      this.dialogViewSpareMoney = false
-    },
-    history(row) {
-      console.log(row)
-      billoperatehis({ id: row.id })
-        .toPromise()
-        .then((response) => {
-          this.historyList = response
-        })
-    },
-    find() {
-      if (this.value2) {
-        this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
-        this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
-      } else {
-        this.startDate = ''
-        this.endDate = ''
-      }
-      this.currentPage = 1
-      this.getList()
-    },
-    async exportlist() {
-      const { data } = await export1(
-        {
-          compId: sessionStorage.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,
+	} from '@/model/contarct/index'
+	import {
+		downloadFile
+	} from '@/utils/batchDown'
+	import Pagination from '@/components/Pagination'
+	import WsUpload from '@/components/WsUpload'
+	import {
+		dayjs,
+		EventBus
+	} from 'base-core-lib'
+	export default {
+		name: 'viewSpareMoney',
+		components: {
+			WsUpload,
+			Pagination,
+		},
+		watch: {
+			vesselId(val) {
+				this.getList()
+			},
+			isShow(val) {
+				this.showType = val
+			},
+		},
+		data() {
+			return {
+				//弹出框
+				dialogViewSpareMoney: false,
+				dialogApproveFormVisible: false,
+				// 船舶类型
+				monetaryKey: null,
+				// 表格显示数据
+				tableDate: [],
+				size: 10,
+				// 是否显示
+				showType: true,
+				// 年
+				year: '',
+				deliver_type: 1,
+				deptBudgetTotal: 0,
+				currentPage: 1,
+				pageSize: 10,
+				appendixIdsAdd: '',
+				searchType: 1,
+				searchTypeText: '未完成',
+				searchKeyWord: '',
+				contractType: 2,
+				goodsType: 2,
+				startDate: null,
+				endDate: null,
+				addressUrls: [],
+				accessurl: '',
+				accesscard: false,
+				// 提交类型
+				submitType: true,
+				deptCircularPage: {},
+				date: {
+					year: dayjs().format('YYYY'),
+					month: dayjs().format('MM'),
+				},
+				contractList: [],
+				deptBudgetList: {},
+				historyList: [],
+				appendixIdss: [],
+				fileList: [],
+				compId: sessionStorage.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: {
+			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: sessionStorage.getItem('ws-pf_compId'),
+						contractType: this.contractType,
+						goodsType: this.goodsType,
+						currentPage: this.currentPage,
+						pageSize: this.pageSize,
+						searchType: this.searchType,
+						searchKeyWord: this.searchKeyWord,
+						startDate: this.startDate,
+						endDate: this.endDate,
+						contrPage: this.contrPage,
+					})
+					.toPromise()
+					.then((response) => {
+						for (var i = 0; i < response.records.length; i++) {
+							if (response.records[i].addressUrl != null && response.records[i].addressUrl != "") {
+								response.records[i].addressUrlArray =
+									response.records[i].addressUrl.split(',')
+							} else {
+								response.records[i].addressUrlArray = []
+							}
+						}
+						this.deptCircularPage.currentPage = response.current
+						this.deptCircularPage.pageSize = response.size
+						this.deptBudgetTotal = response.total
+						this.contractList = response
+						for (var i = 0; i < response.records.length; i++) {
+							var arr = new Array()
+							this.addressUrls[i] = new Array()
+							if (this.contractList.records[i].addressUrl != null) {
+								arr = this.contractList.records[i].addressUrl.split(',')
+								this.addressUrls[i] = arr
+							}
+						}
+					})
+			},
+			// 上传附件
+			uploadSuccess(data, files, url) {
+				console.log(data, files, url)
+
+				// this.deptBudgetList.
+				// this.formData.append('files', files)
+				// this.feedbackObj.uploadNameAttachment = data.appendixName
+				// this.feedbackObj.pathUploadAttachment = data.appendixPath
+				// // this.newAppendixs = files
+				// this.onChangeFlag = true
+			},
+			editClick(row) {
+				var status = ''
+				if (row.status == '待执行' || row.status == '已完成') {
+					status = '执行中'
+				} else if (row.status == '执行中') {
+					status = '已完成'
+				}
+				this.$confirm(`是否将状态改为${status}`, '提示', {
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					})
+					.then(() => {
+						editstatus({
+								id: row.id
+							})
+							.toPromise()
+							.then((response) => {
+								this.$notify.success({
+									title: '成功',
+									message: '状态修改成功',
+								})
+								this.getList()
+							})
+							.catch((response) => {
+								// EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+							})
+					})
+					.catch(() => {
+						return false
+					})
+			},
+			selecttaskType(e) {
+				for (var i = 0; i < this.taskTypeList.length; i++) {
+					if (this.taskTypeList[i].value == e) {
+						this.searchType = this.taskTypeList[i].type
+					}
+				}
+			},
+			fujian(row) {
+				if (row.addressUrl === null || row.addressUrl === '') {
+					EventBus.$emit(
+						'warning',
+						this.$t('system.noticeCircular.NoInformation')
+					)
+				}
+				this.appendixIdss = row.addressUrl
+				console.log(this.appendixIdss)
+				this.accessoryTFs = true
+			},
+			handleExamine(row) {
+				console.log(row)
+				this.$router.push({
+					name: 'futuresPurchaseContractExamine',
+					query: {
+						id: row.id,
+						status: row.status
+					},
+				})
+			},
+			handleAdd() {
+				this.$router.push({
+					path: 'futuresPurchaseContractAdd'
+				})
+			},
+			handleEdit(row) {
+				this.$router.push({
+					name: 'futuresPurchaseContractEdit',
+					query: {
+						id: row.id
+					},
+				})
+			},
+			// 关闭 dialog时 处理文件url 初始化upload组件
+			handleCloe() {
+				this.dialogViewSpareMoney = false
+			},
+			history(row) {
+				console.log(row)
+				billoperatehis({
+						id: row.id
+					})
+					.toPromise()
+					.then((response) => {
+						this.historyList = response
+					})
+			},
+			find() {
+				if (this.value2) {
+					this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
+					this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
+				} else {
+					this.startDate = ''
+					this.endDate = ''
+				}
+				this.currentPage = 1
+				this.getList()
+			},
+			async exportlist() {
+				const {
+					data
+				} = await export1({
+					compId: sessionStorage.getItem('ws-pf_compId'),
+					contractType: this.contractType,
+					goodsType: this.goodsType,
+					currentPage: this.currentPage,
+					pageSize: this.pageSize,
+					searchType: this.searchType,
+					searchKeyWord: this.searchKeyWord,
+					startDate: this.startDate,
+					endDate: this.endDate,
+				}, {}, {
+					responseType: 'blob'
+				}).toPromise()
+				downloadFile({
+					res: data,
+					fileName: `${
           this.date.year + (this.date.month ? `-${this.date.month}` : '')
         }_采购合同`,
-        type: 'xls',
-      })
-    },
-    // deletecontract(){},
-    //删除
-    handleDelete(row) {
-      var text = ''
-    //   if (row.deliverType == 1) {
-    //     text =
-    //       '删除该合同将同时永久删除合同对应的临时仓库相关数据，是否确定删除？'
-    //   } else {
-    //     text = '合同删除后不可恢复，是否继续删除？'
-    //   }
-      this.$confirm('合同删除后不可恢复，是否继续删除？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          deletecontract({ id: row.id })
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '删除成功',
-              })
-              this.getList()
-            })
-            .catch((response) => {})
-        })
-        .catch(() => {
-          return false
-        })
-    },
-  },
-}
+					type: 'xls',
+				})
+			},
+			// deletecontract(){},
+			//删除
+			handleDelete(row) {
+				var text = ''
+				//   if (row.deliverType == 1) {
+				//     text =
+				//       '删除该合同将同时永久删除合同对应的临时仓库相关数据，是否确定删除？'
+				//   } else {
+				//     text = '合同删除后不可恢复，是否继续删除？'
+				//   }
+				this.$confirm('合同删除后不可恢复，是否继续删除？', '提示', {
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					})
+					.then(() => {
+						deletecontract({
+								id: row.id
+							})
+							.toPromise()
+							.then((response) => {
+								this.$notify.success({
+									title: '成功',
+									message: '删除成功',
+								})
+								this.getList()
+							})
+							.catch((response) => {})
+					})
+					.catch(() => {
+						return false
+					})
+			},
+		},
+	}
 </script>
 <style lang="scss" scoped>
-.vertical-text-left {
-  width: 62px;
-  text-align: right;
-}
-.flex {
-  display: flex;
-}
-.el-range-editor.el-input__inner {
-  margin-left: 10px;
-}
-/deep/.base_header_layout .grid-content.right .find.el-button--primary {
-  width: 30px;
-  margin-left: -10px;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-}
-.el-button--primary {
-  background-color: #5878e8;
-  border-color: #5878e8;
-}
-.el-button--default {
-  border: 1px solid #5473e8;
-  color: #5473e8;
-}
-.warning {
-  width: 100%;
-  height: 2px;
-  background: red;
-}
-.executory,
-.inExecution,
-.done {
-  width: 6px;
-  height: 6px;
-  display: inline-block;
-  border-radius: 50%;
-  position: relative;
-  top: -1px;
-}
-.executory {
-  background: #ff9f24;
-}
-.inExecution {
-  background: #5878e8;
-}
-.done {
-  background: #50cad4;
-}
-.top-grade {
-  background: linear-gradient(90deg, #5678e9, #7993f6);
-  color: #fff;
-  padding: 3px;
-  border-radius: 2px;
-}
-.second-class {
-  background: linear-gradient(90deg, #50cdd9, #82e2ea);
-  color: #fff;
-  padding: 3px;
-  border-radius: 2px;
-}
-.third-class {
-  background: linear-gradient(90deg, #ffa735, #ffbf70);
-  color: #fff;
-  padding: 3px;
-  border-radius: 2px;
-}
-.substandard {
-  background: linear-gradient(90deg, #b2b4bb, #ced0d5);
-  color: #fff;
-  padding: 3px;
-  border-radius: 2px;
-}
-.wrap {
-  width: 400px;
-  position: absolute;
-  top: 131px;
-  left: 794px;
-  transform-origin: right center;
-  z-index: 2005;
-}
-.vertical-line {
-  height: 64px;
-  border-left: 2px solid #e9ecf7;
-  margin-left: 4px;
-  padding: 0 3px;
-  // border-image: -webkit-linear-gradient(#00eba7, #08b8e6) 30 30;
-  // border-image: -moz-linear-gradient(#00eba7, #08b8e6) 30 30;
-  // border-image: linear-gradient(#00eba7, #08b8e6) 30 30;
-}
-.el-pagination {
-  padding: 10px 15px;
-  margin-bottom: 0;
-  text-align: center;
-}
-/deep/.el-pager li.active {
-  color: #5878e8;
-  cursor: default;
-}
-/deep/.el-pager li:hover {
-  color: #5878e8;
-  cursor: default;
-}
-.vertical-circle {
-  width: 10px;
-  height: 10px;
-  border: 2px solid #5878e8;
-  background-color: #ffffff;
-  -webkit-border-radius: 100px;
-}
-.vertical-circle:first-child {
-  color: red;
-}
-.vertical-text {
-  margin: 0 10px;
-  color: #8890b1;
-  font-size: 12px;
-  margin-top: -4px;
-}
-/deep/.el-table .el-table__header .cell,
-/deep/.el-table .el-table__body .cell {
-  text-align: center;
-}
-.typeselect {
-  width: 500px;
-}
-.padding-xs {
-  padding: 15px;
-  text-align: right;
-}
-.clearfix:after {
-  content: '';
-  display: block;
-  clear: both;
-}
-.el-table {
-  font-size: 16px;
-}
-.taskType {
-  width: 100%;
-  background-color: #fff;
-  margin-top: 2px;
-  margin-bottom: 10px;
-  list-style: none;
-  // padding-bottom: 20px;
-  li {
-    float: left;
-    border: 1px solid #6ea0f3;
-    border-radius: 5px;
-    max-width: 190px;
-    padding: 0 5px;
-    text-align: center;
-    margin: 10px 20px;
-    cursor: pointer;
-    font-size: 14px;
-    p {
-      margin: 8px 0px;
-      span {
-        color: #e74c3c;
-      }
-    }
-  }
-  li:hover {
-    background-color: #e4eeff;
-    color: #1d6ced;
-  }
-}
-.el-date-editor--date {
-  margin: 0 10px;
-}
-.findValue {
-  margin: 0 10px;
-}
-/deep/.findValue .el-input__inner {
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
-.button-container {
-  display: flex;
-  flex-wrap: nowrap;
-  justify-content: space-between;
-  align-items: center;
-  background-color: #fff;
-  width: 100%;
-  height: 50px;
-  padding: 0 10px;
-  & > div {
-    margin-left: 10px;
-    display: flex;
-    flex-wrap: nowrap;
-    flex-direction: row;
-    & > span {
-      line-height: 50px;
-    }
-  }
-
-  /deep/.auditFlow-box {
-    position: unset;
-    margin-left: 10px;
-    &/deep/.auditFlow-icon {
-      width: auto;
-      padding-right: 30px;
-    }
-    &/deep/.auditFlow-main {
-      position: absolute;
-    }
-  }
-}
-.box-app {
-  display: inline-block;
-  float: left;
-  margin-left: 30px;
-  line-height: 50px;
-}
-/deep/.el-dialog {
-  .el-form-item {
-    margin-bottom: 0 !important;
-    .el-input--medium {
-      textarea {
-        min-height: 100px !important;
-      }
-    }
-  }
-}
-.collapse-bottom {
-  margin-bottom: 20px;
-}
-
-.input-main .textarea .el-textarea__inner {
-  width: 100%;
-  z-index: 1;
-}
-/*.crt-main .textarea /deep/ .el-form-item__label {*/
-/*  height: 82px;*/
-/*}*/
-// 控制select为只读的时候显示样式
-
-.hide-sel {
-  .el-input__inner {
-    border: 0px;
-  }
-  .el-icon-arrow-up {
-    display: none;
-  }
-  .el-textarea__inner {
-    background-color: #fff !important;
-    border: 0;
-  }
-  .el-date-editor {
-    i {
-      display: none;
-    }
-  }
-  .is-disabled {
-    .el-input__inner:hover {
-      background-color: #fff !important;
-      border: 0;
-    }
-    color: #606266;
-    .el-input__inner {
-      background-color: #fff !important;
-      border: 0;
-      color: #606266;
-    }
-    .el-textarea__inner {
-      background-color: #fff !important;
-      border: 0;
-      color: #606266;
-    }
-  }
-}
-// 控制select为只读的时候显示样式
-/deep/.ws-class-table-col {
-  height: auto;
-  padding: 0px 2px;
-  /deep/.el-input__inner {
-    padding: 0px 2px;
-  }
-}
-/deep/.is-disabled {
-  .el-input__prefix,
-  .el-input__suffix {
-    display: none;
-  }
-  .el-input__inner {
-    background-color: #fff;
-    border-color: #fff !important;
-    color: #000 !important;
-    font-size: 14px;
-    cursor: text;
-    padding: 0 !important;
-  }
-}
-/deep/.typeselect .el-input__inner {
-  color: #8890b1;
-}
+	.vertical-text-left {
+		width: 62px;
+		text-align: right;
+	}
+
+	.flex {
+		display: flex;
+	}
+
+	.el-range-editor.el-input__inner {
+		margin-left: 10px;
+	}
+
+	/deep/.base_header_layout .grid-content.right .find.el-button--primary {
+		width: 30px;
+		margin-left: -10px;
+		border-top-left-radius: 0px;
+		border-bottom-left-radius: 0px;
+	}
+
+	.el-button--primary {
+		background-color: #5878e8;
+		border-color: #5878e8;
+	}
+
+	.el-button--default {
+		border: 1px solid #5473e8;
+		color: #5473e8;
+	}
+
+	.warning {
+		width: 100%;
+		height: 2px;
+		background: red;
+	}
+
+	.executory,
+	.inExecution,
+	.done {
+		width: 6px;
+		height: 6px;
+		display: inline-block;
+		border-radius: 50%;
+		position: relative;
+		top: -1px;
+	}
+
+	.executory {
+		background: #ff9f24;
+	}
+
+	.inExecution {
+		background: #5878e8;
+	}
+
+	.done {
+		background: #50cad4;
+	}
+
+	.top-grade {
+		background: linear-gradient(90deg, #5678e9, #7993f6);
+		color: #fff;
+		padding: 3px;
+		border-radius: 2px;
+	}
+
+	.second-class {
+		background: linear-gradient(90deg, #50cdd9, #82e2ea);
+		color: #fff;
+		padding: 3px;
+		border-radius: 2px;
+	}
+
+	.third-class {
+		background: linear-gradient(90deg, #ffa735, #ffbf70);
+		color: #fff;
+		padding: 3px;
+		border-radius: 2px;
+	}
+
+	.substandard {
+		background: linear-gradient(90deg, #b2b4bb, #ced0d5);
+		color: #fff;
+		padding: 3px;
+		border-radius: 2px;
+	}
+
+	.wrap {
+		width: 400px;
+		position: absolute;
+		top: 131px;
+		left: 794px;
+		transform-origin: right center;
+		z-index: 2005;
+	}
+
+	.vertical-line {
+		height: 64px;
+		border-left: 2px solid #e9ecf7;
+		margin-left: 4px;
+		padding: 0 3px;
+		// border-image: -webkit-linear-gradient(#00eba7, #08b8e6) 30 30;
+		// border-image: -moz-linear-gradient(#00eba7, #08b8e6) 30 30;
+		// border-image: linear-gradient(#00eba7, #08b8e6) 30 30;
+	}
+
+	.el-pagination {
+		padding: 10px 15px;
+		margin-bottom: 0;
+		text-align: center;
+	}
+
+	/deep/.el-pager li.active {
+		color: #5878e8;
+		cursor: default;
+	}
+
+	/deep/.el-pager li:hover {
+		color: #5878e8;
+		cursor: default;
+	}
+
+	.vertical-circle {
+		width: 10px;
+		height: 10px;
+		border: 2px solid #5878e8;
+		background-color: #ffffff;
+		-webkit-border-radius: 100px;
+	}
+
+	.vertical-circle:first-child {
+		color: red;
+	}
+
+	.vertical-text {
+		margin: 0 10px;
+		color: #8890b1;
+		font-size: 12px;
+		margin-top: -4px;
+	}
+
+	/deep/.el-table .el-table__header .cell,
+	/deep/.el-table .el-table__body .cell {
+		text-align: center;
+	}
+
+	.typeselect {
+		width: 500px;
+	}
+
+	.padding-xs {
+		padding: 15px;
+		text-align: right;
+	}
+
+	.clearfix:after {
+		content: '';
+		display: block;
+		clear: both;
+	}
+
+	.el-table {
+		font-size: 16px;
+	}
+
+	.taskType {
+		width: 100%;
+		background-color: #fff;
+		margin-top: 2px;
+		margin-bottom: 10px;
+		list-style: none;
+
+		// padding-bottom: 20px;
+		li {
+			float: left;
+			border: 1px solid #6ea0f3;
+			border-radius: 5px;
+			max-width: 190px;
+			padding: 0 5px;
+			text-align: center;
+			margin: 10px 20px;
+			cursor: pointer;
+			font-size: 14px;
+
+			p {
+				margin: 8px 0px;
+
+				span {
+					color: #e74c3c;
+				}
+			}
+		}
+
+		li:hover {
+			background-color: #e4eeff;
+			color: #1d6ced;
+		}
+	}
+
+	.el-date-editor--date {
+		margin: 0 10px;
+	}
+
+	.findValue {
+		margin: 0 10px;
+	}
+
+	/deep/.findValue .el-input__inner {
+		border-top-right-radius: 0px;
+		border-bottom-right-radius: 0px;
+	}
+
+	.button-container {
+		display: flex;
+		flex-wrap: nowrap;
+		justify-content: space-between;
+		align-items: center;
+		background-color: #fff;
+		width: 100%;
+		height: 50px;
+		padding: 0 10px;
+
+		&>div {
+			margin-left: 10px;
+			display: flex;
+			flex-wrap: nowrap;
+			flex-direction: row;
+
+			&>span {
+				line-height: 50px;
+			}
+		}
+
+		/deep/.auditFlow-box {
+			position: unset;
+			margin-left: 10px;
+
+			&/deep/.auditFlow-icon {
+				width: auto;
+				padding-right: 30px;
+			}
+
+			&/deep/.auditFlow-main {
+				position: absolute;
+			}
+		}
+	}
+
+	.box-app {
+		display: inline-block;
+		float: left;
+		margin-left: 30px;
+		line-height: 50px;
+	}
+
+	/deep/.el-dialog {
+		.el-form-item {
+			margin-bottom: 0 !important;
+
+			.el-input--medium {
+				textarea {
+					min-height: 100px !important;
+				}
+			}
+		}
+	}
+
+	.collapse-bottom {
+		margin-bottom: 20px;
+	}
+
+	.input-main .textarea .el-textarea__inner {
+		width: 100%;
+		z-index: 1;
+	}
+
+	/*.crt-main .textarea /deep/ .el-form-item__label {*/
+	/*  height: 82px;*/
+	/*}*/
+	// 控制select为只读的时候显示样式
+
+	.hide-sel {
+		.el-input__inner {
+			border: 0px;
+		}
+
+		.el-icon-arrow-up {
+			display: none;
+		}
+
+		.el-textarea__inner {
+			background-color: #fff !important;
+			border: 0;
+		}
+
+		.el-date-editor {
+			i {
+				display: none;
+			}
+		}
+
+		.is-disabled {
+			.el-input__inner:hover {
+				background-color: #fff !important;
+				border: 0;
+			}
+
+			color: #606266;
+
+			.el-input__inner {
+				background-color: #fff !important;
+				border: 0;
+				color: #606266;
+			}
+
+			.el-textarea__inner {
+				background-color: #fff !important;
+				border: 0;
+				color: #606266;
+			}
+		}
+	}
+
+	// 控制select为只读的时候显示样式
+	/deep/.ws-class-table-col {
+		height: auto;
+		padding: 0px 2px;
+
+		/deep/.el-input__inner {
+			padding: 0px 2px;
+		}
+	}
+
+	/deep/.is-disabled {
+		.el-input__prefix,
+		.el-input__suffix {
+			display: none;
+		}
+
+		.el-input__inner {
+			background-color: #fff;
+			border-color: #fff !important;
+			color: #000 !important;
+			font-size: 14px;
+			cursor: text;
+			padding: 0 !important;
+		}
+	}
+
+	/deep/.typeselect .el-input__inner {
+		color: #8890b1;
+	}
 </style>

src/views/contractManagement/futuresSalesContract.vue

@@ -1,917 +1,882 @@
 <!--期货销售合同-->
 <template>
-  <div>
-    <BaseHeaderLayout :leftSpan="8">
-      <template slot="left">
-        <ws-button
-          type="primary"
-          @click="handleAdd()"
-          v-hasPermission="`contractManagement.buyContract.buyContractInfo.add`"
-          ><img
-            width="13"
-            height="13"
-            style="
+	<div>
+		<BaseHeaderLayout :leftSpan="8">
+			<template slot="left">
+				<ws-button type="primary" @click="handleAdd()"
+					v-hasPermission="`contractManagement.buyContract.buyContractInfo.add`"><img width="13" height="13"
+						style="
               vertical-align: text-top;
               position: relative;
               top: 2px;
               left: -4px;
-            "
-            src="../../../public/img/header-add.png"
-            alt=""
-          />添加</ws-button
-        >
-        <ws-button
-          @click="exportlist()"
-          v-hasPermission="
+            " src="../../../public/img/header-add.png" alt="" />添加</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>
-        <!-- v-hasPermission="'procurement.sparepart.directShip'" -->
-        <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>
+				<!-- v-hasPermission="'procurement.sparepart.directShip'" -->
+				<ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
               vertical-align: text-top;
               position: relative;
               top: 0px;
               left: -8px;
-            "
-            src="../../../public/img/sousuo.png"
-            alt=""
-        /></ws-button>
-      </template>
-    </BaseHeaderLayout>
-    <el-table
-      class="wenzi"
-      :data="contractList.records"
-      style="width: 100%; margin-top: 10px"
-      height="780"
-    >
-      <el-table-column type="index" label="序号">
-        <template scope="scope">
-          <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
-          <span v-else>{{ scope.$index + 1 }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="contractNo" label="合同编号" width="80">
-      </el-table-column>
-      <el-table-column prop="goodsName" label="货名" width="80">
-      </el-table-column>
-      <el-table-column prop="weight" label="重量（吨）"> </el-table-column>
-      <el-table-column prop="pointPrice" label="暂定点价（元/吨）">
-      </el-table-column>
-      <el-table-column prop="basisPrice" label="基差（元/吨）"> </el-table-column>
-      <el-table-column prop="buyer" label="买方"> </el-table-column>
-      <el-table-column prop="seller" label="卖方"> </el-table-column>
-      <el-table-column prop="status" label="状态">
-        <template slot-scope="scope">
-          <el-popover
-            placement="left"
-            :width="285"
-            trigger="click"
-            visible-arrow="false"
-            @show="history(scope.row)"
-          >
-            <template>
-              <span slot="reference">
-                <span
-                  v-if="scope.row.status == '待执行'"
-                  class="executory"
-                ></span>
-                <span
-                  v-if="scope.row.status == '执行中'"
-                  class="inExecution"
-                ></span>
-                <span v-if="scope.row.status == '已完成'" class="done"></span
-                >{{ scope.row.status }}
-              </span>
-            </template>
-            <div>
-              <p style="margin-top: 0; padding-left: 10px">操作历史</p>
-              <div
-                v-for="(item, index) in historyList"
-                :key="index"
-                class="flex"
-              >
-                <div class="vertical-text vertical-text-left">
-                  {{ item.updateDate }}
-                </div>
-                <div>
-                  <div class="vertical-circle"></div>
-                  <div
-                    v-if="index != historyList.length - 1"
-                    class="vertical-line"
-                  ></div>
-                </div>
-                <div class="vertical-text">
-                  {{ item.operateUser }}<br />{{ item.dealMsg }}
-                </div>
-              </div>
-            </div>
-          </el-popover>
-          <img
-            width="17"
-            height="18"
-            style="vertical-align: text-top; position: relative; top: -1px"
-            src="../../../public/img/edit.png"
-            @click="editClick(scope.row)"
-            alt=""
-          />
-          <!-- <i class="el-icon-edit" @click="editClick(scope.row)"></i> -->
-        </template>
-      </el-table-column>
-      <el-table-column prop="signingDate" label="签订日期"> </el-table-column>
-      <el-table-column prop="mildewGrain" label="已付款（元）">
-      </el-table-column>
-      <el-table-column prop="addressUrl" label="附件">
-        <template slot-scope="scope">
-          <img
-            width="18"
-            height="20"
-            style="vertical-align: text-top; position: relative; top: -1px"
-            src="../../../public/img/fujian.png"
-            @click="fujian(scope.row)"
-            alt=""
-          />
-          <span v-if="scope.row.addressUrlArray.length > 0">{{
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button>
+			</template>
+		</BaseHeaderLayout>
+		<el-table class="wenzi" :data="contractList.records" style="width: 100%; margin-top: 10px" height="780">
+			<el-table-column type="index" label="序号">
+				<template scope="scope">
+					<span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+					<span v-else>{{ scope.$index + 1 }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column prop="contractNo" label="合同编号" width="150">
+			</el-table-column>
+			<el-table-column prop="goodsName" label="货名" width="80">
+			</el-table-column>
+			<el-table-column prop="weight" label="重量（吨）"> </el-table-column>
+			<el-table-column prop="pointPrice" label="暂定点价（元/吨）">
+			</el-table-column>
+			<el-table-column prop="basisPrice" label="基差（元/吨）"> </el-table-column>
+			<el-table-column prop="buyer" label="买方"> </el-table-column>
+			<el-table-column prop="seller" label="卖方"> </el-table-column>
+			<el-table-column prop="status" label="状态">
+				<template slot-scope="scope">
+					<el-popover placement="left" :width="285" trigger="click" visible-arrow="false"
+						@show="history(scope.row)">
+						<template>
+							<span slot="reference">
+								<span v-if="scope.row.status == '待执行'" class="executory"></span>
+								<span v-if="scope.row.status == '执行中'" class="inExecution"></span>
+								<span v-if="scope.row.status == '已完成'" class="done"></span>{{ scope.row.status }}
+							</span>
+						</template>
+						<div>
+							<p style="margin-top: 0; padding-left: 10px">操作历史</p>
+							<div v-for="(item, index) in historyList" :key="index" class="flex">
+								<div class="vertical-text vertical-text-left">
+									{{ item.updateDate }}
+								</div>
+								<div>
+									<div class="vertical-circle"></div>
+									<div v-if="index != historyList.length - 1" class="vertical-line"></div>
+								</div>
+								<div class="vertical-text">
+									{{ item.operateUser }}<br />{{ item.dealMsg }}
+								</div>
+							</div>
+						</div>
+					</el-popover>
+					<img width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
+						src="../../../public/img/edit.png" @click="editClick(scope.row)" alt="" />
+					<!-- <i class="el-icon-edit" @click="editClick(scope.row)"></i> -->
+				</template>
+			</el-table-column>
+			<el-table-column prop="signingDate" label="签订日期"> </el-table-column>
+			<el-table-column prop="mildewGrain" label="已付款（元）">
+			</el-table-column>
+			<el-table-column prop="addressUrl" label="附件">
+				<template slot-scope="scope">
+					<img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
+						src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
+					<span v-if="scope.row.addressUrlArray.length > 0">{{
             scope.row.addressUrlArray.length
           }}</span>
-          <!-- <i @click="fujian(scope.row)" class="el-icon-paperclip iconCss"></i> -->
-        </template>
-      </el-table-column>
-      <el-table-column prop="confirmCount" label="确认单" >
-      </el-table-column>
-      <el-table-column prop="address" label="操作" width="200">
-        <template slot-scope="scope">
-          <img
-            width="16"
-            height="16"
-            style="vertical-align: text-top; margin: 0 6px"
-            src="../../../public/img/chakan.png"
-            @click="handleExamine(scope.row)"
-            v-hasPermission="
+					<!-- <i @click="fujian(scope.row)" class="el-icon-paperclip iconCss"></i> -->
+				</template>
+			</el-table-column>
+			<el-table-column prop="confirmCount" label="确认单">
+			</el-table-column>
+			<el-table-column prop="address" label="操作" width="140">
+				<template slot-scope="scope">
+					<img width="16" height="16" style="vertical-align: text-top; margin: 0 6px"
+						src="../../../public/img/chakan.png" @click="handleExamine(scope.row)" v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.view`
-            "
-            alt=""
-          />
-          <img
-            width="17"
-            height="16"
-            style="vertical-align: text-top; margin: 0 6px"
-            src="../../../public/img/bianji.png"
-            @click="handleEdit(scope.row)"
-            v-hasPermission="
+            " alt="" />
+					<img width="17" height="16" style="vertical-align: text-top; margin: 0 6px"
+						src="../../../public/img/bianji.png" @click="handleEdit(scope.row)" v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.edit`
-            "
-            alt=""
-          />
-          <img
-            width="16"
-            height="17"
-            style="
+            " alt="" />
+					<img width="16" height="17" style="
               vertical-align: text-top;
               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"
-        :comp-id="compId"
-        :appendix-ids="appendixIdss"
-        :editable="false"
-        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" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
+				accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+		</WinseaContentModal>
+	</div>
 </template>
 <script>
-import {
-  getList,
-  export1,
-  editstatus,
-  billoperatehis,
-  deletecontract,
-} from '@/model/contarct/index'
-import { downloadFile } from '@/utils/batchDown'
-import Pagination from '@/components/Pagination'
-import WsUpload from '@/components/WsUpload'
-import { dayjs, EventBus } from 'base-core-lib'
-export default {
-  name: 'viewSpareMoney',
-  components: {
-    WsUpload,
-    Pagination,
-  },
-  watch: {
-    vesselId(val) {
-      this.getList()
-    },
-    isShow(val) {
-      this.showType = val
-    },
-  },
-  data() {
-    return {
-      //弹出框
-      dialogViewSpareMoney: false,
-      dialogApproveFormVisible: false,
-      // 船舶类型
-      monetaryKey: null,
-      // 表格显示数据
-      tableDate: [],
-      size: 10,
-      // 是否显示
-      showType: true,
-      // 年
-      year: '',
-      deliver_type: 1,
-      deptBudgetTotal: 0,
-      currentPage: 1,
-      pageSize: 10,
-      appendixIdsAdd: '',
-      searchType: 1,
-      searchTypeText: '未完成',
-      searchKeyWord: '',
-      contractType: 1,
-      goodsType: 2,
-      startDate: null,
-      endDate: null,
-      addressUrls: [],
-      accessurl: '',
-      accesscard: false,
-      // 提交类型
-      submitType: true,
-      deptCircularPage: {},
-      date: {
-        year: dayjs().format('YYYY'),
-        month: dayjs().format('MM'),
-      },
-      contractList: [],
-      deptBudgetList: {},
-      historyList: [],
-      appendixIdss: [],
-      fileList:[],
-      compId: sessionStorage.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: {
-    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: sessionStorage.getItem('ws-pf_compId'),
-        contractType: this.contractType,
-        goodsType:this.goodsType,
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        searchType: this.searchType,
-        searchKeyWord: this.searchKeyWord,
-        startDate: this.startDate,
-        endDate: this.endDate,
-        contrPage: this.contrPage,
-      })
-        .toPromise()
-        .then((response) => {
-          for (var i = 0; i < response.records.length; i++) {
-            if (response.records[i].addressUrl != null&&response.records[i].addressUrl != "") {
-              response.records[i].addressUrlArray =
-                response.records[i].addressUrl.split(',')
-            } else {
-              response.records[i].addressUrlArray = []
-            }
-          }
-          this.deptCircularPage.currentPage = response.current
-          this.deptCircularPage.pageSize = response.size
-          this.deptBudgetTotal = response.total
-          this.contractList = response
-          for (var i = 0; i < response.records.length; i++) {
-            var arr = new Array()
-            this.addressUrls[i] = new Array()
-            if (this.contractList.records[i].addressUrl != null) {
-              arr = this.contractList.records[i].addressUrl.split(',')
-              this.addressUrls[i] = arr
-            }
-             this.contractList.records[i].basisPrice = '+'+this.contractList.records[i].basisPrice
-          }
-        })
-    },
-    // 上传附件
-    uploadSuccess(data, files, url) {
-      console.log(data, files, url)
-
-      // this.deptBudgetList.
-      // this.formData.append('files', files)
-      // this.feedbackObj.uploadNameAttachment = data.appendixName
-      // this.feedbackObj.pathUploadAttachment = data.appendixPath
-      // // this.newAppendixs = files
-      // this.onChangeFlag = true
-    },
-    editClick(row) {
-      var status = ''
-      if (row.status == '待执行' || row.status == '已完成') {
-        status = '执行中'
-      } else if (row.status == '执行中') {
-        status = '已完成'
-      }
-      this.$confirm(`是否将状态改为${status}`, '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          editstatus({ id: row.id })
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '状态修改成功',
-              })
-              this.getList()
-            })
-            .catch((response) => {
-              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-            })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    selecttaskType(e) {
-      for (var i = 0; i < this.taskTypeList.length; i++) {
-        if (this.taskTypeList[i].value == e) {
-          this.searchType = this.taskTypeList[i].type
-        }
-      }
-    },
-    fujian(row) {
-      if (row.addressUrl === null || row.addressUrl === '') {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
-      } else {
-        this.accessoryTFs = true
-      }
-      this.appendixIdss = row.addressUrl
-    },
-    handleExamine(row) {
-      console.log(row)
-      this.$router.push({
-        name: 'futuresSalesContractExamine',
-        query: { id: row.id, status: row.status },
-      })
-    },
-    handleAdd() {
-      this.$router.push({ path: 'futuresSalesContractAdd' })
-    },
-    handleEdit(row) {
-      this.$router.push({
-        name: 'futuresSalesContractEdit',
-        query: { id: row.id },
-      })
-    },
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    handleCloe() {
-      this.dialogViewSpareMoney = false
-    },
-    history(row) {
-      console.log(row)
-      billoperatehis({ id: row.id })
-        .toPromise()
-        .then((response) => {
-          this.historyList = response
-        })
-    },
-    find() {
-      if (this.value2) {
-        this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
-        this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
-      } else {
-        this.startDate = ''
-        this.endDate = ''
-      }
-      this.currentPage = 1
-      this.getList()
-    },
-    async exportlist() {
-      const { data } = await export1(
-        {
-          compId: sessionStorage.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,
+	} from '@/model/contarct/index'
+	import {
+		downloadFile
+	} from '@/utils/batchDown'
+	import Pagination from '@/components/Pagination'
+	import WsUpload from '@/components/WsUpload'
+	import {
+		dayjs,
+		EventBus
+	} from 'base-core-lib'
+	export default {
+		name: 'viewSpareMoney',
+		components: {
+			WsUpload,
+			Pagination,
+		},
+		watch: {
+			vesselId(val) {
+				this.getList()
+			},
+			isShow(val) {
+				this.showType = val
+			},
+		},
+		data() {
+			return {
+				//弹出框
+				dialogViewSpareMoney: false,
+				dialogApproveFormVisible: false,
+				// 船舶类型
+				monetaryKey: null,
+				// 表格显示数据
+				tableDate: [],
+				size: 10,
+				// 是否显示
+				showType: true,
+				// 年
+				year: '',
+				deliver_type: 1,
+				deptBudgetTotal: 0,
+				currentPage: 1,
+				pageSize: 10,
+				appendixIdsAdd: '',
+				searchType: 1,
+				searchTypeText: '未完成',
+				searchKeyWord: '',
+				contractType: 1,
+				goodsType: 2,
+				startDate: null,
+				endDate: null,
+				addressUrls: [],
+				accessurl: '',
+				accesscard: false,
+				// 提交类型
+				submitType: true,
+				deptCircularPage: {},
+				date: {
+					year: dayjs().format('YYYY'),
+					month: dayjs().format('MM'),
+				},
+				contractList: [],
+				deptBudgetList: {},
+				historyList: [],
+				appendixIdss: [],
+				fileList: [],
+				compId: sessionStorage.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: {
+			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: sessionStorage.getItem('ws-pf_compId'),
+						contractType: this.contractType,
+						goodsType: this.goodsType,
+						currentPage: this.currentPage,
+						pageSize: this.pageSize,
+						searchType: this.searchType,
+						searchKeyWord: this.searchKeyWord,
+						startDate: this.startDate,
+						endDate: this.endDate,
+						contrPage: this.contrPage,
+					})
+					.toPromise()
+					.then((response) => {
+						for (var i = 0; i < response.records.length; i++) {
+							if (response.records[i].addressUrl != null && response.records[i].addressUrl != "") {
+								response.records[i].addressUrlArray =
+									response.records[i].addressUrl.split(',')
+							} else {
+								response.records[i].addressUrlArray = []
+							}
+						}
+						this.deptCircularPage.currentPage = response.current
+						this.deptCircularPage.pageSize = response.size
+						this.deptBudgetTotal = response.total
+						this.contractList = response
+						for (var i = 0; i < response.records.length; i++) {
+							var arr = new Array()
+							this.addressUrls[i] = new Array()
+							if (this.contractList.records[i].addressUrl != null) {
+								arr = this.contractList.records[i].addressUrl.split(',')
+								this.addressUrls[i] = arr
+							}
+							this.contractList.records[i].basisPrice = '+' + this.contractList.records[i].basisPrice
+						}
+					})
+			},
+			// 上传附件
+			uploadSuccess(data, files, url) {
+				console.log(data, files, url)
+
+				// this.deptBudgetList.
+				// this.formData.append('files', files)
+				// this.feedbackObj.uploadNameAttachment = data.appendixName
+				// this.feedbackObj.pathUploadAttachment = data.appendixPath
+				// // this.newAppendixs = files
+				// this.onChangeFlag = true
+			},
+			editClick(row) {
+				var status = ''
+				if (row.status == '待执行' || row.status == '已完成') {
+					status = '执行中'
+				} else if (row.status == '执行中') {
+					status = '已完成'
+				}
+				this.$confirm(`是否将状态改为${status}`, '提示', {
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					})
+					.then(() => {
+						editstatus({
+								id: row.id
+							})
+							.toPromise()
+							.then((response) => {
+								this.$notify.success({
+									title: '成功',
+									message: '状态修改成功',
+								})
+								this.getList()
+							})
+							.catch((response) => {
+								// EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+							})
+					})
+					.catch(() => {
+						return false
+					})
+			},
+			selecttaskType(e) {
+				for (var i = 0; i < this.taskTypeList.length; i++) {
+					if (this.taskTypeList[i].value == e) {
+						this.searchType = this.taskTypeList[i].type
+					}
+				}
+			},
+			fujian(row) {
+				if (row.addressUrl === null || row.addressUrl === '') {
+					EventBus.$emit(
+						'warning',
+						this.$t('system.noticeCircular.NoInformation')
+					)
+				} else {
+					this.accessoryTFs = true
+				}
+				this.appendixIdss = row.addressUrl
+			},
+			handleExamine(row) {
+				console.log(row)
+				this.$router.push({
+					name: 'futuresSalesContractExamine',
+					query: {
+						id: row.id,
+						status: row.status
+					},
+				})
+			},
+			handleAdd() {
+				this.$router.push({
+					path: 'futuresSalesContractAdd'
+				})
+			},
+			handleEdit(row) {
+				this.$router.push({
+					name: 'futuresSalesContractEdit',
+					query: {
+						id: row.id
+					},
+				})
+			},
+			// 关闭 dialog时 处理文件url 初始化upload组件
+			handleCloe() {
+				this.dialogViewSpareMoney = false
+			},
+			history(row) {
+				console.log(row)
+				billoperatehis({
+						id: row.id
+					})
+					.toPromise()
+					.then((response) => {
+						this.historyList = response
+					})
+			},
+			find() {
+				if (this.value2) {
+					this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
+					this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
+				} else {
+					this.startDate = ''
+					this.endDate = ''
+				}
+				this.currentPage = 1
+				this.getList()
+			},
+			async exportlist() {
+				const {
+					data
+				} = await export1({
+					compId: sessionStorage.getItem('ws-pf_compId'),
+					contractType: this.contractType,
+					goodsType: this.goodsType,
+					currentPage: this.currentPage,
+					pageSize: this.pageSize,
+					searchType: this.searchType,
+					searchKeyWord: this.searchKeyWord,
+					startDate: this.startDate,
+					endDate: this.endDate,
+				}, {}, {
+					responseType: 'blob'
+				}).toPromise()
+				downloadFile({
+					res: data,
+					fileName: `${
           this.date.year + (this.date.month ? `-${this.date.month}` : '')
         }_采购合同`,
-        type: 'xls',
-      })
-    },
-    // deletecontract(){},
-    //删除
-    handleDelete(row) {
-      var text = ''
-    //   if (row.deliverType == 1) {
-    //     text =
-    //       '删除该合同将同时永久删除合同对应的临时仓库相关数据，是否确定删除？'
-    //   } else {
-    //     text = '合同删除后不可恢复，是否继续删除？'
-    //   }
-      this.$confirm('合同删除后不可恢复，是否继续删除？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          deletecontract({ id: row.id })
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '删除成功',
-              })
-              this.getList()
-            })
-            .catch((response) => {})
-        })
-        .catch(() => {
-          return false
-        })
-    },
-  },
-}
+					type: 'xls',
+				})
+			},
+			// deletecontract(){},
+			//删除
+			handleDelete(row) {
+				var text = ''
+				//   if (row.deliverType == 1) {
+				//     text =
+				//       '删除该合同将同时永久删除合同对应的临时仓库相关数据，是否确定删除？'
+				//   } else {
+				//     text = '合同删除后不可恢复，是否继续删除？'
+				//   }
+				this.$confirm('合同删除后不可恢复，是否继续删除？', '提示', {
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					})
+					.then(() => {
+						deletecontract({
+								id: row.id
+							})
+							.toPromise()
+							.then((response) => {
+								this.$notify.success({
+									title: '成功',
+									message: '删除成功',
+								})
+								this.getList()
+							})
+							.catch((response) => {})
+					})
+					.catch(() => {
+						return false
+					})
+			},
+		},
+	}
 </script>
 <style lang="scss" scoped>
-.vertical-text-left {
-  width: 62px;
-  text-align: right;
-}
-.flex {
-  display: flex;
-}
-.el-range-editor.el-input__inner {
-  margin-left: 10px;
-}
-/deep/.base_header_layout .grid-content.right .find.el-button--primary {
-  width: 30px;
-  margin-left: -10px;
-  border-top-left-radius: 0px;
-  border-bottom-left-radius: 0px;
-}
-.el-button--primary {
-  background-color: #5878e8;
-  border-color: #5878e8;
-}
-.el-button--default {
-  border: 1px solid #5473e8;
-  color: #5473e8;
-}
-.warning {
-  width: 100%;
-  height: 2px;
-  background: red;
-}
-.executory,
-.inExecution,
-.done {
-  width: 6px;
-  height: 6px;
-  display: inline-block;
-  border-radius: 50%;
-  position: relative;
-  top: -1px;
-}
-.executory {
-  background: #ff9f24;
-}
-.inExecution {
-  background: #5878e8;
-}
-.done {
-  background: #50cad4;
-}
-.top-grade {
-  background: linear-gradient(90deg, #5678e9, #7993f6);
-  color: #fff;
-  padding: 3px;
-  border-radius: 2px;
-}
-.second-class {
-  background: linear-gradient(90deg, #50cdd9, #82e2ea);
-  color: #fff;
-  padding: 3px;
-  border-radius: 2px;
-}
-.third-class {
-  background: linear-gradient(90deg, #ffa735, #ffbf70);
-  color: #fff;
-  padding: 3px;
-  border-radius: 2px;
-}
-.substandard {
-  background: linear-gradient(90deg, #b2b4bb, #ced0d5);
-  color: #fff;
-  padding: 3px;
-  border-radius: 2px;
-}
-.wrap {
-  width: 400px;
-  position: absolute;
-  top: 131px;
-  left: 794px;
-  transform-origin: right center;
-  z-index: 2005;
-}
-.vertical-line {
-  height: 64px;
-  border-left: 2px solid #e9ecf7;
-  margin-left: 4px;
-  padding: 0 3px;
-  // border-image: -webkit-linear-gradient(#00eba7, #08b8e6) 30 30;
-  // border-image: -moz-linear-gradient(#00eba7, #08b8e6) 30 30;
-  // border-image: linear-gradient(#00eba7, #08b8e6) 30 30;
-}
-.el-pagination {
-  padding: 10px 15px;
-  margin-bottom: 0;
-  text-align: center;
-}
-/deep/.el-pager li.active {
-  color: #5878e8;
-  cursor: default;
-}
-/deep/.el-pager li:hover {
-  color: #5878e8;
-  cursor: default;
-}
-.vertical-circle {
-  width: 10px;
-  height: 10px;
-  border: 2px solid #5878e8;
-  background-color: #ffffff;
-  -webkit-border-radius: 100px;
-}
-.vertical-circle:first-child {
-  color: red;
-}
-.vertical-text {
-  margin: 0 10px;
-  color: #8890b1;
-  font-size: 12px;
-  margin-top: -4px;
-}
-/deep/.el-table .el-table__header .cell,
-/deep/.el-table .el-table__body .cell {
-  text-align: center;
-}
-.typeselect {
-  width: 500px;
-}
-.padding-xs {
-  padding: 15px;
-  text-align: right;
-}
-.clearfix:after {
-  content: '';
-  display: block;
-  clear: both;
-}
-.el-table {
-  font-size: 16px;
-}
-.taskType {
-  width: 100%;
-  background-color: #fff;
-  margin-top: 2px;
-  margin-bottom: 10px;
-  list-style: none;
-  // padding-bottom: 20px;
-  li {
-    float: left;
-    border: 1px solid #6ea0f3;
-    border-radius: 5px;
-    max-width: 190px;
-    padding: 0 5px;
-    text-align: center;
-    margin: 10px 20px;
-    cursor: pointer;
-    font-size: 14px;
-    p {
-      margin: 8px 0px;
-      span {
-        color: #e74c3c;
-      }
-    }
-  }
-  li:hover {
-    background-color: #e4eeff;
-    color: #1d6ced;
-  }
-}
-.el-date-editor--date {
-  margin: 0 10px;
-}
-.findValue {
-  margin: 0 10px;
-}
-/deep/.findValue .el-input__inner {
-  border-top-right-radius: 0px;
-  border-bottom-right-radius: 0px;
-}
-.button-container {
-  display: flex;
-  flex-wrap: nowrap;
-  justify-content: space-between;
-  align-items: center;
-  background-color: #fff;
-  width: 100%;
-  height: 50px;
-  padding: 0 10px;
-  & > div {
-    margin-left: 10px;
-    display: flex;
-    flex-wrap: nowrap;
-    flex-direction: row;
-    & > span {
-      line-height: 50px;
-    }
-  }
-
-  /deep/.auditFlow-box {
-    position: unset;
-    margin-left: 10px;
-    &/deep/.auditFlow-icon {
-      width: auto;
-      padding-right: 30px;
-    }
-    &/deep/.auditFlow-main {
-      position: absolute;
-    }
-  }
-}
-.box-app {
-  display: inline-block;
-  float: left;
-  margin-left: 30px;
-  line-height: 50px;
-}
-/deep/.el-dialog {
-  .el-form-item {
-    margin-bottom: 0 !important;
-    .el-input--medium {
-      textarea {
-        min-height: 100px !important;
-      }
-    }
-  }
-}
-.collapse-bottom {
-  margin-bottom: 20px;
-}
-
-.input-main .textarea .el-textarea__inner {
-  width: 100%;
-  z-index: 1;
-}
-/*.crt-main .textarea /deep/ .el-form-item__label {*/
-/*  height: 82px;*/
-/*}*/
-// 控制select为只读的时候显示样式
-
-.hide-sel {
-  .el-input__inner {
-    border: 0px;
-  }
-  .el-icon-arrow-up {
-    display: none;
-  }
-  .el-textarea__inner {
-    background-color: #fff !important;
-    border: 0;
-  }
-  .el-date-editor {
-    i {
-      display: none;
-    }
-  }
-  .is-disabled {
-    .el-input__inner:hover {
-      background-color: #fff !important;
-      border: 0;
-    }
-    color: #606266;
-    .el-input__inner {
-      background-color: #fff !important;
-      border: 0;
-      color: #606266;
-    }
-    .el-textarea__inner {
-      background-color: #fff !important;
-      border: 0;
-      color: #606266;
-    }
-  }
-}
-// 控制select为只读的时候显示样式
-/deep/.ws-class-table-col {
-  height: auto;
-  padding: 0px 2px;
-  /deep/.el-input__inner {
-    padding: 0px 2px;
-  }
-}
-/deep/.is-disabled {
-  .el-input__prefix,
-  .el-input__suffix {
-    display: none;
-  }
-  .el-input__inner {
-    background-color: #fff;
-    border-color: #fff !important;
-    color: #000 !important;
-    font-size: 14px;
-    cursor: text;
-    padding: 0 !important;
-  }
-}
-/deep/.typeselect .el-input__inner {
-  color: #8890b1;
-}
+	.vertical-text-left {
+		width: 62px;
+		text-align: right;
+	}
+
+	.flex {
+		display: flex;
+	}
+
+	.el-range-editor.el-input__inner {
+		margin-left: 10px;
+	}
+
+	/deep/.base_header_layout .grid-content.right .find.el-button--primary {
+		width: 30px;
+		margin-left: -10px;
+		border-top-left-radius: 0px;
+		border-bottom-left-radius: 0px;
+	}
+
+	.el-button--primary {
+		background-color: #5878e8;
+		border-color: #5878e8;
+	}
+
+	.el-button--default {
+		border: 1px solid #5473e8;
+		color: #5473e8;
+	}
+
+	.warning {
+		width: 100%;
+		height: 2px;
+		background: red;
+	}
+
+	.executory,
+	.inExecution,
+	.done {
+		width: 6px;
+		height: 6px;
+		display: inline-block;
+		border-radius: 50%;
+		position: relative;
+		top: -1px;
+	}
+
+	.executory {
+		background: #ff9f24;
+	}
+
+	.inExecution {
+		background: #5878e8;
+	}
+
+	.done {
+		background: #50cad4;
+	}
+
+	.top-grade {
+		background: linear-gradient(90deg, #5678e9, #7993f6);
+		color: #fff;
+		padding: 3px;
+		border-radius: 2px;
+	}
+
+	.second-class {
+		background: linear-gradient(90deg, #50cdd9, #82e2ea);
+		color: #fff;
+		padding: 3px;
+		border-radius: 2px;
+	}
+
+	.third-class {
+		background: linear-gradient(90deg, #ffa735, #ffbf70);
+		color: #fff;
+		padding: 3px;
+		border-radius: 2px;
+	}
+
+	.substandard {
+		background: linear-gradient(90deg, #b2b4bb, #ced0d5);
+		color: #fff;
+		padding: 3px;
+		border-radius: 2px;
+	}
+
+	.wrap {
+		width: 400px;
+		position: absolute;
+		top: 131px;
+		left: 794px;
+		transform-origin: right center;
+		z-index: 2005;
+	}
+
+	.vertical-line {
+		height: 64px;
+		border-left: 2px solid #e9ecf7;
+		margin-left: 4px;
+		padding: 0 3px;
+		// border-image: -webkit-linear-gradient(#00eba7, #08b8e6) 30 30;
+		// border-image: -moz-linear-gradient(#00eba7, #08b8e6) 30 30;
+		// border-image: linear-gradient(#00eba7, #08b8e6) 30 30;
+	}
+
+	.el-pagination {
+		padding: 10px 15px;
+		margin-bottom: 0;
+		text-align: center;
+	}
+
+	/deep/.el-pager li.active {
+		color: #5878e8;
+		cursor: default;
+	}
+
+	/deep/.el-pager li:hover {
+		color: #5878e8;
+		cursor: default;
+	}
+
+	.vertical-circle {
+		width: 10px;
+		height: 10px;
+		border: 2px solid #5878e8;
+		background-color: #ffffff;
+		-webkit-border-radius: 100px;
+	}
+
+	.vertical-circle:first-child {
+		color: red;
+	}
+
+	.vertical-text {
+		margin: 0 10px;
+		color: #8890b1;
+		font-size: 12px;
+		margin-top: -4px;
+	}
+
+	/deep/.el-table .el-table__header .cell,
+	/deep/.el-table .el-table__body .cell {
+		text-align: center;
+	}
+
+	.typeselect {
+		width: 500px;
+	}
+
+	.padding-xs {
+		padding: 15px;
+		text-align: right;
+	}
+
+	.clearfix:after {
+		content: '';
+		display: block;
+		clear: both;
+	}
+
+	.el-table {
+		font-size: 16px;
+	}
+
+	.taskType {
+		width: 100%;
+		background-color: #fff;
+		margin-top: 2px;
+		margin-bottom: 10px;
+		list-style: none;
+
+		// padding-bottom: 20px;
+		li {
+			float: left;
+			border: 1px solid #6ea0f3;
+			border-radius: 5px;
+			max-width: 190px;
+			padding: 0 5px;
+			text-align: center;
+			margin: 10px 20px;
+			cursor: pointer;
+			font-size: 14px;
+
+			p {
+				margin: 8px 0px;
+
+				span {
+					color: #e74c3c;
+				}
+			}
+		}
+
+		li:hover {
+			background-color: #e4eeff;
+			color: #1d6ced;
+		}
+	}
+
+	.el-date-editor--date {
+		margin: 0 10px;
+	}
+
+	.findValue {
+		margin: 0 10px;
+	}
+
+	/deep/.findValue .el-input__inner {
+		border-top-right-radius: 0px;
+		border-bottom-right-radius: 0px;
+	}
+
+	.button-container {
+		display: flex;
+		flex-wrap: nowrap;
+		justify-content: space-between;
+		align-items: center;
+		background-color: #fff;
+		width: 100%;
+		height: 50px;
+		padding: 0 10px;
+
+		&>div {
+			margin-left: 10px;
+			display: flex;
+			flex-wrap: nowrap;
+			flex-direction: row;
+
+			&>span {
+				line-height: 50px;
+			}
+		}
+
+		/deep/.auditFlow-box {
+			position: unset;
+			margin-left: 10px;
+
+			&/deep/.auditFlow-icon {
+				width: auto;
+				padding-right: 30px;
+			}
+
+			&/deep/.auditFlow-main {
+				position: absolute;
+			}
+		}
+	}
+
+	.box-app {
+		display: inline-block;
+		float: left;
+		margin-left: 30px;
+		line-height: 50px;
+	}
+
+	/deep/.el-dialog {
+		.el-form-item {
+			margin-bottom: 0 !important;
+
+			.el-input--medium {
+				textarea {
+					min-height: 100px !important;
+				}
+			}
+		}
+	}
+
+	.collapse-bottom {
+		margin-bottom: 20px;
+	}
+
+	.input-main .textarea .el-textarea__inner {
+		width: 100%;
+		z-index: 1;
+	}
+
+	/*.crt-main .textarea /deep/ .el-form-item__label {*/
+	/*  height: 82px;*/
+	/*}*/
+	// 控制select为只读的时候显示样式
+
+	.hide-sel {
+		.el-input__inner {
+			border: 0px;
+		}
+
+		.el-icon-arrow-up {
+			display: none;
+		}
+
+		.el-textarea__inner {
+			background-color: #fff !important;
+			border: 0;
+		}
+
+		.el-date-editor {
+			i {
+				display: none;
+			}
+		}
+
+		.is-disabled {
+			.el-input__inner:hover {
+				background-color: #fff !important;
+				border: 0;
+			}
+
+			color: #606266;
+
+			.el-input__inner {
+				background-color: #fff !important;
+				border: 0;
+				color: #606266;
+			}
+
+			.el-textarea__inner {
+				background-color: #fff !important;
+				border: 0;
+				color: #606266;
+			}
+		}
+	}
+
+	// 控制select为只读的时候显示样式
+	/deep/.ws-class-table-col {
+		height: auto;
+		padding: 0px 2px;
+
+		/deep/.el-input__inner {
+			padding: 0px 2px;
+		}
+	}
+
+	/deep/.is-disabled {
+		.el-input__prefix,
+		.el-input__suffix {
+			display: none;
+		}
+
+		.el-input__inner {
+			background-color: #fff;
+			border-color: #fff !important;
+			color: #000 !important;
+			font-size: 14px;
+			cursor: text;
+			padding: 0 !important;
+		}
+	}
+
+	/deep/.typeselect .el-input__inner {
+		color: #8890b1;
+	}
 </style>

src/views/contractManagement/purchaseContract.vue

@@ -1,932 +1,897 @@
 <!--采购合同-->
 <!--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`"
-          ><img
-            width="13"
-            height="13"
-            style="
+	<div>
+		<BaseHeaderLayout :leftSpan="8">
+			<template slot="left">
+				<ws-button type="primary" @click="handleAdd()"
+					v-hasPermission="`contractManagement.buyContract.buyContractInfo.add`"><img width="13" height="13"
+						style="
               vertical-align: text-top;
               position: relative;
               top: 2px;
               left: -4px;
-            "
-            src="../../../public/img/header-add.png"
-            alt=""
-          />添加</ws-button
-        >
-        <ws-button
-          @click="exportlist()"
-          v-hasPermission="
+            " src="../../../public/img/header-add.png" alt="" />添加</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="80">
-      </el-table-column>
-      <el-table-column prop="goodsName" label="货名" width="80">
-      </el-table-column>
-      <el-table-column prop="grade" label="品级">
-        <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">
-          <el-popover
-            placement="left"
-            :width="285"
-            trigger="click"
-            visible-arrow="false"
-            @show="history(scope.row)"
-          >
-            <template>
-              <span slot="reference">
-                <span
-                  v-if="scope.row.status == '待执行'"
-                  class="executory"
-                ></span>
-                <span
-                  v-if="scope.row.status == '执行中'"
-                  class="inExecution"
-                ></span>
-                <span v-if="scope.row.status == '已完成'" class="done"></span
-                >{{ scope.row.status }}
-              </span>
-            </template>
-            <div>
-              <p style="margin-top: 0; padding-left: 10px">操作历史</p>
-              <div
-                v-for="(item, index) in historyList"
-                :key="index"
-                class="flex"
-              >
-                <div class="vertical-text vertical-text-left">
-                  {{ item.updateDate }}
-                </div>
-                <div>
-                  <div class="vertical-circle"></div>
-                  <div
-                    v-if="index != historyList.length - 1"
-                    class="vertical-line"
-                  ></div>
-                </div>
-                <div class="vertical-text">
-                  {{ item.operateUser }}<br />{{ item.dealMsg }}
-                </div>
-              </div>
-            </div>
-          </el-popover>
-          <img
-            width="17"
-            height="18"
-            style="vertical-align: text-top; position: relative; top: -1px"
-            src="../../../public/img/edit.png"
-            @click="editClick(scope.row)"
-            alt=""
-          />
-          <!-- <i class="el-icon-edit" @click="editClick(scope.row)"></i> -->
-        </template>
-      </el-table-column>
-      <el-table-column prop="signingDate" label="签订日期"> </el-table-column>
-      <el-table-column prop="mildewGrain" label="已付款（元）">
-      </el-table-column>
-      <el-table-column prop="addressUrl" label="附件">
-        <template slot-scope="scope">
-          <img
-            width="18"
-            height="20"
-            style="vertical-align: text-top; position: relative; top: -1px"
-            src="../../../public/img/fujian.png"
-            @click="fujian(scope.row)"
-            alt=""
-          />
-          <span v-if="scope.row.addressUrlArray != null">
-            {{scope.row.addressUrlArray.length == 0? "":scope.row.addressUrlArray.length}}
-            </span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="address" label="操作" width="200">
-        <template slot-scope="scope">
-          <img
-            width="16"
-            height="16"
-            style="vertical-align: text-top; margin: 0 6px"
-            src="../../../public/img/chakan.png"
-            @click="handleExamine(scope.row)"
-            v-hasPermission="
+				</template>
+			</el-table-column>
+			<el-table-column prop="status" label="状态">
+				<template slot-scope="scope">
+					<el-popover placement="left" :width="285" trigger="click" visible-arrow="false"
+						@show="history(scope.row)">
+						<template>
+							<span slot="reference">
+								<span v-if="scope.row.status == '待执行'" class="executory"></span>
+								<span v-if="scope.row.status == '执行中'" class="inExecution"></span>
+								<span v-if="scope.row.status == '已完成'" class="done"></span>{{ scope.row.status }}
+							</span>
+						</template>
+						<div>
+							<p style="margin-top: 0; padding-left: 10px">操作历史</p>
+							<div v-for="(item, index) in historyList" :key="index" class="flex">
+								<div class="vertical-text vertical-text-left">
+									{{ item.updateDate }}
+								</div>
+								<div>
+									<div class="vertical-circle"></div>
+									<div v-if="index != historyList.length - 1" class="vertical-line"></div>
+								</div>
+								<div class="vertical-text">
+									{{ item.operateUser }}<br />{{ item.dealMsg }}
+								</div>
+							</div>
+						</div>
+					</el-popover>
+					<img width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
+						src="../../../public/img/edit.png" @click="editClick(scope.row)" alt="" />
+					<!-- <i class="el-icon-edit" @click="editClick(scope.row)"></i> -->
+				</template>
+			</el-table-column>
+			<el-table-column prop="signingDate" label="签订日期"> </el-table-column>
+			<el-table-column prop="mildewGrain" label="已付款（元）">
+			</el-table-column>
+			<el-table-column prop="addressUrl" label="附件">
+				<template slot-scope="scope">
+					<img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
+						src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
+					<span v-if="scope.row.addressUrlArray != null">
+						{{scope.row.addressUrlArray.length == 0? "":scope.row.addressUrlArray.length}}
+					</span>
+				</template>
+			</el-table-column>
+			<el-table-column prop="address" label="操作" width="140">
+				<template slot-scope="scope">
+					<img width="16" height="16" style="vertical-align: text-top; margin: 0 6px"
+						src="../../../public/img/chakan.png" @click="handleExamine(scope.row)" v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.view`
-            "
-            alt=""
-          />
-          <img
-            width="17"
-            height="16"
-            style="vertical-align: text-top; margin: 0 6px"
-            src="../../../public/img/bianji.png"
-            @click="handleEdit(scope.row)"
-            v-hasPermission="
+            " alt="" />
+					<img width="17" height="16" style="vertical-align: text-top; margin: 0 6px"
+						src="../../../public/img/bianji.png" @click="handleEdit(scope.row)" v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.edit`
-            "
-            alt=""
-          />
-          <img
-            width="16"
-            height="17"
-            style="
+            " alt="" />
+					<img width="16" height="17" style="
               vertical-align: text-top;
               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"
-        :comp-id="compId"
-        :appendix-ids="appendixIdss"
-        :editable="false"
-        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" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
+				accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+		</WinseaContentModal>
+	</div>
 </template>
 <script>
-import {
-  getList,
-  export1,
-  editstatus,
-  billoperatehis,
-  deletecontract,
-} from '@/model/contarct/index'
-import { downloadFile } from '@/utils/batchDown'
-import Pagination from '@/components/Pagination'
-import WsUpload from '@/components/WsUpload'
-import { dayjs, EventBus } from 'base-core-lib'
-export default {
-  name: 'viewSpareMoney',
-  components: {
-    WsUpload,
-    Pagination,
-  },
-  watch: {
-    vesselId(val) {
-      this.getList()
-    },
-    isShow(val) {
-      this.showType = val
-    },
-  },
-  data() {
-    return {
-      //弹出框
-      dialogViewSpareMoney: false,
-      dialogApproveFormVisible: false,
-      // 船舶类型
-      monetaryKey: null,
-      // 表格显示数据
-      tableDate: [],
-      size: 10,
-      // 是否显示
-      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: sessionStorage.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: {
-    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: sessionStorage.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) {
-      if (row.addressUrl === null || row.addressUrl === '') {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
-      } else {
-        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: sessionStorage.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,
+	} from '@/model/contarct/index'
+	import {
+		downloadFile
+	} from '@/utils/batchDown'
+	import Pagination from '@/components/Pagination'
+	import WsUpload from '@/components/WsUpload'
+	import {
+		dayjs,
+		EventBus
+	} from 'base-core-lib'
+	export default {
+		name: 'viewSpareMoney',
+		components: {
+			WsUpload,
+			Pagination,
+		},
+		watch: {
+			vesselId(val) {
+				this.getList()
+			},
+			isShow(val) {
+				this.showType = val
+			},
+		},
+		data() {
+			return {
+				//弹出框
+				dialogViewSpareMoney: false,
+				dialogApproveFormVisible: false,
+				// 船舶类型
+				monetaryKey: null,
+				// 表格显示数据
+				tableDate: [],
+				size: 10,
+				// 是否显示
+				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: sessionStorage.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: {
+			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: sessionStorage.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) {
+				if (row.addressUrl === null || row.addressUrl === '') {
+					EventBus.$emit(
+						'warning',
+						this.$t('system.noticeCircular.NoInformation')
+					)
+				} else {
+					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: sessionStorage.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>

src/views/contractManagement/salesContract.vue

@@ -1,982 +1,946 @@
-
 <!--销售合同-->
 <!--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`
-          "
-          ><img
-            width="13"
-            height="13"
-            style="
+          "><img width="13" height="13" style="
               vertical-align: text-top;
               position: relative;
               top: 2px;
               left: -4px;
-            "
-            src="../../../public/img/header-add.png"
-            alt=""
-          />添加</ws-button
-        >
-        <ws-button
-          @click="exportlist()"
-          v-hasPermission="
+            " src="../../../public/img/header-add.png" alt="" />添加</ws-button>
+				<ws-button @click="exportlist()" v-hasPermission="
             `contractManagement.salesContract.salesContractInfo.view`
-          "
-          >导出</ws-button
-        >
-      </template>
-      <template slot="right">
-        <span style="width: 142px; display: inline-block; color: #8890b1"
-          >状态：</span
-        >
-        <ws-select
-          v-model="searchTypeText"
-          placeholder=""
-          class="typeselect"
-          @change="selecttaskType"
-          :value="searchType"
-        >
-          <ws-option
-            v-for="item in taskTypeList"
-            :key="item.value"
-            :label="item.value"
-            :value="item.value"
-            style="color: #8890b1"
-          />
-        </ws-select>
-
-        <el-date-picker
-          v-model="value2"
-          type="daterange"
-          align="right"
-          unlink-panels
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :picker-options="pickerOptions"
-        >
-        </el-date-picker>
-        <ws-input
-          v-model="searchKeyWord"
-          placeholder="可按照合同编号、买方名称、卖方名称进行查找"
-          clearable
-          maxlength="500"
-          type="input"
-          class="findValue"
-        ></ws-input>
-        <ws-button class="find" type="primary" @click="find()"
-          ><img
-            width="16"
-            height="16"
-            style="
+          ">导出</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="80">
-      </el-table-column>
-      <el-table-column prop="goodsName" label="货名" width="80">
-      </el-table-column>
-      <el-table-column prop="grade" label="品级">
-        <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
-            v-if="scope.row.proportion < 90"
-            style="color: #5473e8; font-weight: 600"
-            >{{ scope.row.completedQuantity }}</span
-          >
-          <span
-            v-if="scope.row.proportion > 90"
-            style="color: red; font-weight: 600"
-            >{{ scope.row.completedQuantity }}</span
-          >
-        </template>
-      </el-table-column>
-      <el-table-column prop="status" label="状态">
-        <template slot-scope="scope">
-          <el-popover
-            placement="left"
-            :width="285"
-            trigger="click"
-            visible-arrow="false"
-            @show="history(scope.row)"
-          >
-            <template>
-              <span slot="reference">
-                <span
-                  v-if="scope.row.status == '待执行'"
-                  class="executory"
-                ></span>
-                <span
-                  v-if="scope.row.status == '执行中'"
-                  class="inExecution"
-                ></span>
-                <span v-if="scope.row.status == '已完成'" class="done"></span
-                >{{ scope.row.status }}
-              </span>
-            </template>
-            <div>
-              <p style="margin-top: 0; padding-left: 10px">操作历史</p>
-              <div v-for="(item, index) in historyList" class="flex">
-                <div class="vertical-text vertical-text-left">
-                  {{ item.updateDate }}
-                </div>
-                <div>
-                  <div class="vertical-circle"></div>
-                  <div
-                    v-if="index != historyList.length - 1"
-                    class="vertical-line"
-                  ></div>
-                </div>
-                <div class="vertical-text">
-                  {{ item.operateUser }}<br />{{ item.dealMsg }}
-                </div>
-              </div>
-            </div>
-          </el-popover>
-          <img
-            width="17"
-            height="18"
-            style="vertical-align: text-top; position: relative; top: -1px"
-            src="../../../public/img/edit.png"
-            @click="editClick(scope.row)"
-            alt=""
-          />
-        </template>
-      </el-table-column>
-      <el-table-column prop="signingDate" label="签订日期"> </el-table-column>
-      <el-table-column prop="mildewGrain" label="未回款（元）">
-      </el-table-column>
-      <el-table-column prop="addressUrl" label="附件">
-        <template slot-scope="scope">
-          <img
-            width="18"
-            height="20"
-            style="vertical-align: text-top; position: relative; top: -1px"
-            src="../../../public/img/fujian.png"
-            @click="fujian(scope.row)"
-            alt=""
-          />
-          <span v-if="scope.row.addressUrlArray != null">{{
+				</template>
+			</el-table-column>
+			<el-table-column prop="weight" label="重量（吨）"> </el-table-column>
+			<el-table-column prop="unitContractPrice" label="合同单价（元）">
+			</el-table-column>
+			<el-table-column prop="packingMethod" label="包装方式"> </el-table-column>
+			<el-table-column prop="buyer" label="买方"> </el-table-column>
+			<el-table-column prop="seller" label="卖方"> </el-table-column>
+			<el-table-column prop="completedQuantity" label="已完成（吨）">
+				<template slot-scope="scope">
+					<span v-if="scope.row.proportion < 90"
+						style="color: #5473e8; font-weight: 600">{{ scope.row.completedQuantity }}</span>
+					<span v-if="scope.row.proportion > 90"
+						style="color: red; font-weight: 600">{{ scope.row.completedQuantity }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column prop="status" label="状态">
+				<template slot-scope="scope">
+					<el-popover placement="left" :width="285" trigger="click" visible-arrow="false"
+						@show="history(scope.row)">
+						<template>
+							<span slot="reference">
+								<span v-if="scope.row.status == '待执行'" class="executory"></span>
+								<span v-if="scope.row.status == '执行中'" class="inExecution"></span>
+								<span v-if="scope.row.status == '已完成'" class="done"></span>{{ scope.row.status }}
+							</span>
+						</template>
+						<div>
+							<p style="margin-top: 0; padding-left: 10px">操作历史</p>
+							<div v-for="(item, index) in historyList" class="flex">
+								<div class="vertical-text vertical-text-left">
+									{{ item.updateDate }}
+								</div>
+								<div>
+									<div class="vertical-circle"></div>
+									<div v-if="index != historyList.length - 1" class="vertical-line"></div>
+								</div>
+								<div class="vertical-text">
+									{{ item.operateUser }}<br />{{ item.dealMsg }}
+								</div>
+							</div>
+						</div>
+					</el-popover>
+					<img width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
+						src="../../../public/img/edit.png" @click="editClick(scope.row)" alt="" />
+				</template>
+			</el-table-column>
+			<el-table-column prop="signingDate" label="签订日期"> </el-table-column>
+			<el-table-column prop="mildewGrain" label="未回款（元）">
+			</el-table-column>
+			<el-table-column prop="addressUrl" label="附件">
+				<template slot-scope="scope">
+					<img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
+						src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" />
+					<span v-if="scope.row.addressUrlArray != null">{{
             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="200">
-        <template slot-scope="scope">
-          <img
-            width="16"
-            height="16"
-            style="vertical-align: text-top; margin: 0 6px"
-            src="../../../public/img/chakan.png"
-            @click="handleExamine(scope.row)"
-            v-hasPermission="
+					<!-- <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=""
-          />
-          <img
-            width="17"
-            height="16"
-            style="vertical-align: text-top; margin: 0 6px"
-            src="../../../public/img/bianji.png"
-            v-hasPermission="
+            " alt="" />
+					<img width="17" height="16" style="vertical-align: text-top; margin: 0 6px"
+						src="../../../public/img/bianji.png" v-hasPermission="
               `contractManagement.salesContract.salesContractInfo.edit`
-            "
-            @click="handleEdit(scope.row)"
-            alt=""
-          />
-          <img
-            width="16"
-            height="17"
-            style="
+            " @click="handleEdit(scope.row)" alt="" />
+					<img width="16" height="17" style="
               vertical-align: text-top;
               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"
-        :comp-id="compId"
-        :appendix-ids="appendixIdss"
-        :editable="false"
-        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" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
+				accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+		</WinseaContentModal>
+	</div>
 </template>
 <script>
-import {
-  getList,
-  export1,
-  editstatus,
-  billoperatehis,
-  deletecontract,
-} 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 {
-      //弹出框
-      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: sessionStorage.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: {
-    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: sessionStorage.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) {
-      if (row.addressUrl === null || row.addressUrl === '') {
-        EventBus.$emit(
-          'warning',
-          this.$t('system.noticeCircular.NoInformation')
-        )
-      } else {
-        this.accessoryTFs = true
-      }
-      this.appendixIdss = row.addressUrl
-    },
-    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: sessionStorage.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,
+	} 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 {
+				//弹出框
+				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: sessionStorage.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: {
+			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: sessionStorage.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) {
+				if (row.addressUrl === null || row.addressUrl === '') {
+					EventBus.$emit(
+						'warning',
+						this.$t('system.noticeCircular.NoInformation')
+					)
+				} else {
+					this.accessoryTFs = true
+				}
+				this.appendixIdss = row.addressUrl
+			},
+			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: sessionStorage.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;
-}
-</style>
+	.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>

src/views/houseSelfCollect/inspectionManagement.vue

@@ -1,415 +1,386 @@
 <!--质检管理-->
 <template>
-  <div>
-    <BaseHeaderLayout :leftSpan="16">
-      <template slot="left">
-        <ws-button type="primary" @click="inspectInfo(1)" v-hasPermission="`acquisitionManagement.acquisitionQuality.add`">添加</ws-button>
-      </template>
-      <template slot="right">
-        <ws-select
-          v-model="warehouseName"
-          placeholder=""
-          @change="warehouseNameChange"
-          :value="searchType"
-          style="margin: 0 10px"
-        >
-          <ws-option
-            v-for="item in warehouseList"
-            :key="item.value"
-            :label="item.value"
-            :value="item.value"
-            style="color: #8890b1"
-          />
-        </ws-select>
-        <div></div>
-        <ws-input
-          v-model="searchKeyWord"
-          placeholder="可按编号、客户名、车牌号查找"
-          clearable
-          maxlength="500"
-          type="input"
-        >
-        </ws-input>
-        <ws-button class="find" type="primary" @click="find()"
-          ><img
-            width="16"
-            height="16"
-            style="
+	<div>
+		<BaseHeaderLayout :leftSpan="16">
+			<template slot="left">
+				<ws-button type="primary" @click="inspectInfo(1)"
+					v-hasPermission="`acquisitionManagement.acquisitionQuality.add`">添加</ws-button>
+			</template>
+			<template slot="right">
+				<ws-select v-model="warehouseName" placeholder="" @change="warehouseNameChange" :value="searchType"
+					style="margin: 0 10px">
+					<ws-option v-for="item in warehouseList" :key="item.value" :label="item.value" :value="item.value"
+						style="color: #8890b1" />
+				</ws-select>
+				<div></div>
+				<ws-input v-model="searchKeyWord" placeholder="可按编号、客户名、车牌号查找" clearable maxlength="500" type="input">
+				</ws-input>
+				<ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
               vertical-align: text-top;
               position: relative;
               top: 0px;
               
-            "
-            src="../../../public/img/sousuo.png"
-            alt=""
-        /></ws-button>
-      </template>
-    </BaseHeaderLayout>
-    <el-table
-      :data="inspect"
-      style="width: 100%; margin-top: 20px"
-      ref="inspect"
-      border
-      height="780"
-    >
-      <el-table-column type="index" label="序号" width="50">
-        <template scope="scope">
-          <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
-          <span v-else>{{ scope.$index + 1 }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="qualityNo"
-        width="120"
-        label="编号"
-      ></el-table-column>
-      <el-table-column prop="customerName" label="客户"></el-table-column>
-      <el-table-column prop="carNumber" label="车牌号"></el-table-column>
-      <el-table-column prop="goodsName" label="货名"></el-table-column>
-      <el-table-column prop="waterContent" label="水分（%）" width="120">
-        <template scope="scope">
-          <span class="water-left">{{scope.row.waterContent}}</span> 
-          <span class="water-line">|</span> 
-          <span class="water-right">{{scope.row.reWaterContent ? scope.row.reWaterContent : '未复检' }}</span> 
-        </template>
-      </el-table-column>
-       <el-table-column prop="buckleMiscellaneous" label="扣杂"  width="120">
-         <template scope="scope">
-           <div v-if="scope.row.paramType == 1">
-           <span class="water-left">{{scope.row.buckleMiscellaneous}} </span> 
-          <span class="water-line">|</span> 
-          <span class="water-right">{{scope.row.reBuckleMiscellaneous ? scope.row.reBuckleMiscellaneous : '未复检'}}</span> 
-         </div>
-        </template>
-       </el-table-column>
-       <el-table-column prop="type" label="类型"></el-table-column>
-      <el-table-column
-        prop="tidalGrainPrice"
-        label="单价（元/公斤）"
-        width="120px"
-      >
-      <template scope="scope">
-          <span v-if="scope.row.type == '潮粮'">{{ scope.row.tidalGrainPrice }}</span>
-          <span v-else>{{ scope.row.dryGrainPrice }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="binNumber" label="仓位号"></el-table-column>
-      <el-table-column prop="storageTagNo" label="囤位号"></el-table-column>
-      <el-table-column prop="qualityInspector" label="质检员" width="100px">
-          <template scope="scope">
-            <span>{{scope.row.qualityInspector}}</span>
-            <span v-if="scope.row.reInspector && scope.row.qualityInspector != scope.row.reInspector">,{{scope.row.reInspector}}</span>
-          </template>
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button>
+			</template>
+		</BaseHeaderLayout>
+		<el-table :data="inspect" style="width: 100%; margin-top: 20px" ref="inspect" border height="780">
+			<el-table-column type="index" label="序号" width="50">
+				<template scope="scope">
+					<span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+					<span v-else>{{ scope.$index + 1 }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column prop="qualityNo" width="100" label="编号"></el-table-column>
+			<el-table-column prop="customerName" label="客户"></el-table-column>
+			<el-table-column prop="carNumber" label="车牌号"></el-table-column>
+			<el-table-column prop="goodsName" label="货名"></el-table-column>
+			<el-table-column prop="waterContent" label="水分（%）" width="120">
+				<template scope="scope">
+					<span class="water-left">{{scope.row.waterContent}}</span>
+					<span class="water-line">|</span>
+					<span class="water-right">{{scope.row.reWaterContent ? scope.row.reWaterContent : '未复检' }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column prop="buckleMiscellaneous" label="扣杂" width="120">
+				<template scope="scope">
+					<div v-if="scope.row.paramType == 1">
+						<span class="water-left">{{scope.row.buckleMiscellaneous}} </span>
+						<span class="water-line">|</span>
+						<span
+							class="water-right">{{scope.row.reBuckleMiscellaneous ? scope.row.reBuckleMiscellaneous : '未复检'}}</span>
+					</div>
+				</template>
+			</el-table-column>
+			<el-table-column prop="type" label="类型"></el-table-column>
+			<el-table-column prop="tidalGrainPrice" label="单价（元/公斤）" width="120px">
+				<template scope="scope">
+					<span v-if="scope.row.type == '潮粮'">{{ scope.row.tidalGrainPrice }}</span>
+					<span v-else>{{ scope.row.dryGrainPrice }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column prop="binNumber" label="仓位号"></el-table-column>
+			<el-table-column prop="storageTagNo" label="囤位号"></el-table-column>
+			<el-table-column prop="qualityInspector" label="质检员" width="120px">
+				<template scope="scope">
+					<span>{{scope.row.qualityInspector}}</span>
+					<span
+						v-if="scope.row.reInspector && scope.row.qualityInspector != scope.row.reInspector">,{{scope.row.reInspector}}</span>
+				</template>
 
 
 
-      </el-table-column>
-      <el-table-column prop="updateDate" label="质检时间"  width="90px"></el-table-column>
-      <el-table-column prop="status" label="状态">
-        <template slot-scope="scope">
-          <span v-if='scope.row.confirm=="1"'>
-            已确认
-          </span>
-          <span v-else>
-            {{scope.row.status}}
-          </span>
-          </template>
-      </el-table-column>
-      <el-table-column width="500" label="操作">
-        <template slot-scope="scope">
-           <el-button @click="inspectInfo(scope.row, 2)" v-hasPermission="`acquisitionManagement.acquisitionQuality.view`">查看</el-button>
-          <el-button @click="inspectInfo(scope.row, 3)" v-if="scope.row.status=='已初检'&& scope.row.confirm!='1'" v-hasPermission="`acquisitionManagement.acquisitionQuality.initial`">初检</el-button>
-          <div v-show="scope.row.confirm !='1' && scope.row.status == '已复检'" style="display: inline-block;">
-           <el-button @click="inspectInfo(scope.row, 5)" v-hasPermission="`acquisitionManagement.acquisitionQuality.con`">确认</el-button></div>
-           <el-button @click="inspectInfo(scope.row, 4)" v-if="scope.row.confirm !='1'" v-hasPermission="`acquisitionManagement.acquisitionQuality.again`">复检</el-button>
-          <div  style="display: inline-block;" v-if="scope.row.weighingManagement&&scope.row.weighingManagement.status=='已质检'">
-            <el-button @click="del(scope.row)" type="danger" v-hasPermission="`acquisitionManagement.acquisitionQuality.delete`">删除</el-button>
-          </div>
-          <el-button @click="print(scope.row)" v-hasPermission="`acquisitionManagement.acquisitionQuality.print`">打印</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-     <el-dialog
-      width="70%"
-      class="table-content"
-      center
-      :visible.sync="isShowPrint"
-      title="粮食质检单"
-    >
-    <!-- <inspectInfoPrint :printData="printData"></inspectInfoPrint> -->
-    <inspectInfoPrint :printData="printData" ref="saveImg"></inspectInfoPrint>
-    <div style="text-align:center">
-          <el-button type="primary" @click="closePrint">关闭</el-button>
-          <el-button type="primary" @click="printSmall">打印小票</el-button>
-          <el-button type="primary" @click="printBig">打印单据</el-button>
-        </div>
-    </el-dialog>
-    <div style="text-align: center">
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="currentPage"
-        :page-size="deptCircularPage.pageSize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="deptBudgetTotal"
-      >
-      </el-pagination>
-    </div>
-  </div>
+			</el-table-column>
+			<el-table-column prop="updateDate" label="质检时间" width="90px"></el-table-column>
+			<el-table-column prop="status" label="状态">
+				<template slot-scope="scope">
+					<span v-if='scope.row.confirm=="1"'>
+						已确认
+					</span>
+					<span v-else>
+						{{scope.row.status}}
+					</span>
+				</template>
+			</el-table-column>
+			<el-table-column width="410" label="操作">
+				<template slot-scope="scope">
+					<el-button @click="inspectInfo(scope.row, 2)"
+						v-hasPermission="`acquisitionManagement.acquisitionQuality.view`">查看</el-button>
+					<el-button @click="inspectInfo(scope.row, 3)"
+						v-if="scope.row.status=='已初检'&& scope.row.confirm!='1'"
+						v-hasPermission="`acquisitionManagement.acquisitionQuality.initial`">初检</el-button>
+					<div v-show="scope.row.confirm !='1' && scope.row.status == '已复检'" style="display: inline-block;">
+						<el-button @click="inspectInfo(scope.row, 5)"
+							v-hasPermission="`acquisitionManagement.acquisitionQuality.con`">确认</el-button>
+					</div>
+					<el-button @click="inspectInfo(scope.row, 4)" v-if="scope.row.confirm !='1'"
+						v-hasPermission="`acquisitionManagement.acquisitionQuality.again`">复检</el-button>
+					<div style="display: inline-block;"
+						v-if="scope.row.weighingManagement&&scope.row.weighingManagement.status=='已质检'">
+						<el-button @click="del(scope.row)" type="danger"
+							v-hasPermission="`acquisitionManagement.acquisitionQuality.delete`">删除</el-button>
+					</div>
+					<el-button @click="print(scope.row)"
+						v-hasPermission="`acquisitionManagement.acquisitionQuality.print`">打印</el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+		 <el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint" title="粮食质检单">
+			<!-- <inspectInfoPrint :printData="printData"></inspectInfoPrint> -->
+			<inspectInfoPrint :printData="printData" ref="saveImg"></inspectInfoPrint>
+			<div style="text-align:center">
+				<el-button type="primary" @click="closePrint">关闭</el-button>
+				<el-button type="primary" @click="printSmall">打印小票</el-button>
+				<el-button type="primary" @click="printBig">打印单据</el-button>
+			</div>
+		</el-dialog>
+		<div style="text-align: center">
+			<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+				:current-page="currentPage" :page-size="deptCircularPage.pageSize"
+				layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+			</el-pagination>
+		</div>
+	</div>
 </template>
 <script>
-import {
-  selectWarehouseSelf,
-  getinspectList,
-  getinspectDelete,
-  getinspectLook,
-} from '@/model/houseSelfCollect/index'
-import inspectInfoPrint from './component/inspectInfoPrint.vue'
-export default {
-  components: {inspectInfoPrint},
-  watch: {},
-  data() {
-    return {
-      //分页
-      currentPage: 1,
-      pageSize: 10,
-      deptCircularPage: {},
-      deptBudgetTotal: 0,
+	import {
+		selectWarehouseSelf,
+		getinspectList,
+		getinspectDelete,
+		getinspectLook,
+	} from '@/model/houseSelfCollect/index'
+	import inspectInfoPrint from './component/inspectInfoPrint.vue'
+	export default {
+		components: {
+			inspectInfoPrint
+		},
+		watch: {},
+		data() {
+			return {
+				//分页
+				currentPage: 1,
+				pageSize: 10,
+				deptCircularPage: {},
+				deptBudgetTotal: 0,
 
-      searchKeyWord: '',
-      taskTypeList: [],
-      searchType: 0,
-      warehouseName: '',
-      inspect: [],
-      warehouseList1:[],
-      warehouseList: [],
-      cangid: '', //仓库id
-      warehouseCount: '',
-      warehouseNo: '',
-      isShowPrint: false,
-      printData: {},
-      deductWeight:'',//扣重比
-      saleLimit:''
-    }
-  },
-  activated() {
-    this.selectWarehouse()
-  },
-  methods: {
-    printSmall() {
-      window.open('../../../static/inspection.html?type=1&dataList=' +JSON.stringify(this.printData))
-      },
-      printBig() {
-         window.open('../../../static/inspection.html?type=2&dataList=' +JSON.stringify(this.printData))
-      },
-     closePrint(){
-        this.isShowPrint = false
-        this.$router.push({path:'inspectionManagement'})
-      },
-    find() {
-      this.getList()
-    },
-    inspectInfo(row, index) {
-      for(let i = 0 ; i < this.warehouseList.length ; i++){
-        if(this.WAREHOUSE[1].payname == this.warehouseList[i].value){
-          this.cangid = this.warehouseList[i].id
-        }
-      }
-      //添加,编辑，查看
-      this.$router.push({
-        path: 'inspectInfo',
-        query: {
-          type: index,
-          cangid: this.cangid,
-          id: row.id,
-          warehouseName: this.warehouseName,
-          count: this.warehouseCount,
-          warehouseNo: this.warehouseNo
-        },
-      })
-    },
-    warehouseNameChange(e) {
-      // console.log(e)
-      for(let i = 0 ; i < this.warehouseList.length; i++){
-        if(this.warehouseList[i].value == e){
-           this.warehouseName = this.warehouseList[i].value
-          this.warehouseCount = this.warehouseList[i].count
-          this.warehouseNo = this.warehouseList[i].No
-          this.cangid = this.warehouseList[i].id
-          this.WAREHOUSE[1].payname = this.warehouseList[i].value
-        }
-      }
-      for(let i = 0 ; i < this.warehouseList1.length; i++){
-        if(this.warehouseList1[i].warehouseName == e){
-           sessionStorage.setItem('houseSelfCollect_house',JSON.stringify(this.warehouseList[i]))
-        }
-      }
-      this.getList()
-    },
-    del(row) {
-      //删除
-      this.$confirm('确定删除质检信息？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning',
-      })
-        .then(() => {
-          getinspectDelete({
-            id: row.id,
-          })
-            .toPromise()
-            .then((response) => {
-              this.$notify.success({
-                title: '成功',
-                message: '删除成功',
-              })
-              this.getList()
-            })
-            .catch((response) => {
-              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-            })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getList()
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val
-      console.log(`当前页: ${val}`)
-      this.getList()
-    },
-    selectWarehouse(){
-       selectWarehouseSelf({
-        compId: sessionStorage.getItem('ws-pf_compId'),
-      })
-        .toPromise()
-        .then((response) => {
-          this.warehouseList1=response
-          this.warehouseList = []
-          let _wareHouse = sessionStorage.getItem('houseSelfCollect_house')
-          _wareHouse = JSON.parse(_wareHouse)
-          for (let i = 0; i < response.length; i++) {
-            this.warehouseList.push({
-              value: response[i].warehouseName,
-              id: response[i].id,
-              count: response[i].count,
-              No:response[i].commonWarehouseNo
-            })  
-            if (_wareHouse) {
-            this.cangid = _wareHouse.id
-            this.warehouseName = _wareHouse.warehouseName
-             this.warehouseNo =_wareHouse.commonWarehouseNo
-             this.warehouseCount = _wareHouse.count
-          } else {
-            if (this.cangid&&this.cangid == response[i].id) {
-              this.warehouseName = response[i].warehouseName
-              this.warehouseCount =  response[i].count
-              this.warehouseNo =  response[i].commonWarehouseNo
-            } 
-            if(this.warehouseList.length > 0 && !this.cangid){
-              this.warehouseName = this.warehouseList[0].value
-              this.warehouseCount =  this.warehouseList[0].count
-              this.warehouseNo =  this.warehouseList[0].No
-              this.cangid =  this.warehouseList[0].id
-              this.WAREHOUSE[1].payname = this.warehouseList[0].value
-            }
-          }
-          }
-          this.getList()
-        })
-    },
-    getList() {
-      getinspectList({
-        compId: sessionStorage.getItem('ws-pf_compId'),
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        searchKeyWord: (this.searchKeyWord).toUpperCase(),
-        warehouseName: this.warehouseName,
-        managementType:1
-      })
-        .toPromise()
-        .then((response) => {
-          console.log(response)
-          this.inspect = response.records
-          this.deptBudgetTotal = response.total
-        })
-    },
-    print(row) {
-      
-      getinspectLook({
-        id: row.id,
-      })
-        .toPromise()
-        .then((response) => {
-          this.isShowPrint = true
-          this.printData = response
-          // window.location.href="../../../static/inspection.html?dataList="+JSON.stringify(response)
-        })
-    },
-  },
-}
+				searchKeyWord: '',
+				taskTypeList: [],
+				searchType: 0,
+				warehouseName: '',
+				inspect: [],
+				warehouseList1: [],
+				warehouseList: [],
+				cangid: '', //仓库id
+				warehouseCount: '',
+				warehouseNo: '',
+				isShowPrint: false,
+				printData: {},
+				deductWeight: '', //扣重比
+				saleLimit: ''
+			}
+		},
+		activated() {
+			this.selectWarehouse()
+		},
+		methods: {
+			printSmall() {
+				window.open('../../../static/inspection.html?type=1&dataList=' + JSON.stringify(this.printData))
+			},
+			printBig() {
+				window.open('../../../static/inspection.html?type=2&dataList=' + JSON.stringify(this.printData))
+			},
+			closePrint() {
+				this.isShowPrint = false
+				this.$router.push({
+					path: 'inspectionManagement'
+				})
+			},
+			find() {
+				this.getList()
+			},
+			inspectInfo(row, index) {
+				for (let i = 0; i < this.warehouseList.length; i++) {
+					if (this.WAREHOUSE[1].payname == this.warehouseList[i].value) {
+						this.cangid = this.warehouseList[i].id
+					}
+				}
+				//添加,编辑，查看
+				this.$router.push({
+					path: 'inspectInfo',
+					query: {
+						type: index,
+						cangid: this.cangid,
+						id: row.id,
+						warehouseName: this.warehouseName,
+						count: this.warehouseCount,
+						warehouseNo: this.warehouseNo
+					},
+				})
+			},
+			warehouseNameChange(e) {
+				// console.log(e)
+				for (let i = 0; i < this.warehouseList.length; i++) {
+					if (this.warehouseList[i].value == e) {
+						this.warehouseName = this.warehouseList[i].value
+						this.warehouseCount = this.warehouseList[i].count
+						this.warehouseNo = this.warehouseList[i].No
+						this.cangid = this.warehouseList[i].id
+						this.WAREHOUSE[1].payname = this.warehouseList[i].value
+					}
+				}
+				for (let i = 0; i < this.warehouseList1.length; i++) {
+					if (this.warehouseList1[i].warehouseName == e) {
+						sessionStorage.setItem('houseSelfCollect_house', JSON.stringify(this.warehouseList[i]))
+					}
+				}
+				this.getList()
+			},
+			del(row) {
+				//删除
+				this.$confirm('确定删除质检信息？', '提示', {
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning',
+					})
+					.then(() => {
+						getinspectDelete({
+								id: row.id,
+							})
+							.toPromise()
+							.then((response) => {
+								this.$notify.success({
+									title: '成功',
+									message: '删除成功',
+								})
+								this.getList()
+							})
+							.catch((response) => {
+								// EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+							})
+					})
+					.catch(() => {
+						return false
+					})
+			},
+			handleSizeChange(val) {
+				console.log(`每页 ${val} 条`)
+				this.pageSize = val
+				this.getList()
+			},
+			handleCurrentChange(val) {
+				this.currentPage = val
+				console.log(`当前页: ${val}`)
+				this.getList()
+			},
+			selectWarehouse() {
+				selectWarehouseSelf({
+						compId: sessionStorage.getItem('ws-pf_compId'),
+					})
+					.toPromise()
+					.then((response) => {
+						this.warehouseList1 = response
+						this.warehouseList = []
+						let _wareHouse = sessionStorage.getItem('houseSelfCollect_house')
+						_wareHouse = JSON.parse(_wareHouse)
+						for (let i = 0; i < response.length; i++) {
+							this.warehouseList.push({
+								value: response[i].warehouseName,
+								id: response[i].id,
+								count: response[i].count,
+								No: response[i].commonWarehouseNo
+							})
+							if (_wareHouse) {
+								this.cangid = _wareHouse.id
+								this.warehouseName = _wareHouse.warehouseName
+								this.warehouseNo = _wareHouse.commonWarehouseNo
+								this.warehouseCount = _wareHouse.count
+							} else {
+								if (this.cangid && this.cangid == response[i].id) {
+									this.warehouseName = response[i].warehouseName
+									this.warehouseCount = response[i].count
+									this.warehouseNo = response[i].commonWarehouseNo
+								}
+								if (this.warehouseList.length > 0 && !this.cangid) {
+									this.warehouseName = this.warehouseList[0].value
+									this.warehouseCount = this.warehouseList[0].count
+									this.warehouseNo = this.warehouseList[0].No
+									this.cangid = this.warehouseList[0].id
+									this.WAREHOUSE[1].payname = this.warehouseList[0].value
+								}
+							}
+						}
+						this.getList()
+					})
+			},
+			getList() {
+				getinspectList({
+						compId: sessionStorage.getItem('ws-pf_compId'),
+						currentPage: this.currentPage,
+						pageSize: this.pageSize,
+						searchKeyWord: (this.searchKeyWord).toUpperCase(),
+						warehouseName: this.warehouseName,
+						managementType: 1
+					})
+					.toPromise()
+					.then((response) => {
+						console.log(response)
+						this.inspect = response.records
+						this.deptBudgetTotal = response.total
+					})
+			},
+			print(row) {
+
+				getinspectLook({
+						id: row.id,
+					})
+					.toPromise()
+					.then((response) => {
+						this.isShowPrint = true
+						this.printData = response
+						// window.location.href="../../../static/inspection.html?dataList="+JSON.stringify(response)
+					})
+			},
+		},
+	}
 </script>
 <style lang="scss" scoped>
-/deep/.el-dialog__header {
-  text-align: center !important;
-  padding: 10px 0 !important;
-  height: auto !important;
-}
+	/deep/.el-dialog__header {
+		text-align: center !important;
+		padding: 10px 0 !important;
+		height: auto !important;
+	}
+
+	/deep/.el-dialog__title {
+		font-size: 24px !important;
+	}
+
+	.title {
+		font-size: 20px;
+		font-weight: 600;
+		margin: 20px 0 0 20px;
+	}
 
-/deep/.el-dialog__title {
-  font-size: 24px !important;
-}
+	.tit {
+		font-size: 16px;
+		font-weight: 600;
+		margin: 20px;
+	}
 
-.title {
-  font-size: 20px;
-  font-weight: 600;
-  margin: 20px 0 0 20px;
-}
+	.ws-info-table {
+		border: none;
+	}
 
-.tit {
-  font-size: 16px;
-  font-weight: 600;
-  margin: 20px;
-}
+	.ws-info-table .el-form-item {
+		width: 50%;
+		border: none;
+	}
 
-.ws-info-table {
-  border: none;
-}
+	/deep/.ws-info-table .el-form-item .el-form-item__label {
+		width: 30%;
+		text-align: center;
+		background: #ffffff;
+		color: #8890b1;
+	}
 
-.ws-info-table .el-form-item {
-  width: 50%;
-  border: none;
-}
+	/deep/.ws-info-table .el-form-item .el-form-item__content {
+		border: none;
+	}
 
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  width: 30%;
-  text-align: center;
-  background: #ffffff;
-  color: #8890b1;
-}
+	/deep/.el-table .el-table__header .cell,
+	.el-table .el-table__body .cell {
+		text-align: center;
+	}
 
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  border: none;
-}
+	/deep/.el-table--enable-row-transition .el-table__body td {
+		text-align: center;
+	}
 
-/deep/.el-table .el-table__header .cell,
-.el-table .el-table__body .cell {
-  text-align: center;
-}
+	/deep/.el-dialog__body {
+		padding: 20px !important;
+	}
 
-/deep/.el-table--enable-row-transition .el-table__body td {
-  text-align: center;
-}
-/deep/.el-dialog__body {
-  padding: 20px !important;
-}
-.water-left,.water-right{
-  width: 45%;
-  display: inline-block;
-}
+	.water-left,
+	.water-right {
+		width: 45%;
+		display: inline-block;
+	}
 </style>

src/views/houseSelfCollect/paymentManagement.vue

@@ -100,11 +100,11 @@
           <span v-else>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column class="table_td" prop="paymentNo" width="150" label="编号"></el-table-column>
+      <el-table-column class="table_td" prop="paymentNo" width="100" label="编号"></el-table-column>
       <el-table-column class="table_td" prop="customerName" label="客户"></el-table-column>
       <el-table-column class="table_td" prop="carNo" label="车牌号"></el-table-column>
-      <el-table-column class="table_td" prop="goodsName" label="货名"></el-table-column>
-      <el-table-column class="table_td" width="80" prop="type" label="类型"></el-table-column>
+      <el-table-column class="table_td" prop="goodsName" width="60" label="货名"></el-table-column>
+      <el-table-column class="table_td" prop="type" width="60" label="类型"></el-table-column>
       <el-table-column class="table_td" prop="tidalGrainPrice" width="140" label="净重单价（元/公斤）"></el-table-column>
       <el-table-column class="table_td" prop="unitDeduction" width="130" label="扣单价（元/公斤）"></el-table-column>
       <el-table-column class="table_td" prop="solidGrainPrice" width="140" label="纯重单价（元/公斤）"></el-table-column>
@@ -116,14 +116,14 @@
           <div @click="showPayImg(scope.row)">{{ scope.row.amountEdPayable }}</div>
         </template>
       </el-table-column>
-      <el-table-column class="table_td" prop="updateDate" label="更新时间" width="140"></el-table-column>
-      <el-table-column class="table_td" prop="status" label="状态">
+      <el-table-column class="table_td" prop="updateDate" label="更新时间" width="90"></el-table-column>
+      <el-table-column class="table_td" prop="status" width="100" label="状态">
         <template scope="scope">
           <span v-if="scope.row.approveStatus">{{ scope.row.approveStatus }}</span>
           <span v-else>{{ scope.row.status }}</span>
         </template>
       </el-table-column>
-      <el-table-column class="table_td" prop="collectionEdPayable" label="操作" width="350">
+      <el-table-column class="table_td" prop="collectionEdPayable" label="操作" width="200">
         <template scope="scope">
           <span v-hasPermission="`acquisitionManagement.acquisitionPay.add`">
             <el-button

src/views/houseSelfCollect/weighingManagement.vue

@@ -1,432 +1,406 @@
 <!--检斤管理-->
 <template>
-  <div>
-    <BaseHeaderLayout :leftSpan="16">
-      <template slot="left"> </template>
-      <template slot="right">
-        <ws-select
-          v-model="warehouseName"
-          placeholder=""
-          @change="warehouseNameChange"
-          :value="searchType"
-          style="margin: 0 10px"
-        >
-          <ws-option
-            v-for="item in warehouseList"
-            :key="item.value"
-            :label="item.value"
-            :value="item.value"
-            style="color: #8890b1"
-          />
-        </ws-select>
-        <div></div>
-        <ws-input
-          v-model="searchKeyWord"
-          placeholder="可按编号、客户名、车牌号查找"
-          clearable
-          maxlength="500"
-          type="input"
-        ></ws-input>
-        <ws-button class="find" type="primary" @click="find()"
-          ><img
-            width="16"
-            height="16"
-            style="
+	<div>
+		<BaseHeaderLayout :leftSpan="16">
+			<template slot="left"> </template>
+			<template slot="right">
+				<ws-select v-model="warehouseName" placeholder="" @change="warehouseNameChange" :value="searchType"
+					style="margin: 0 10px">
+					<ws-option v-for="item in warehouseList" :key="item.value" :label="item.value" :value="item.value"
+						style="color: #8890b1" />
+				</ws-select>
+				<div></div>
+				<ws-input v-model="searchKeyWord" placeholder="可按编号、客户名、车牌号查找" clearable maxlength="500" type="input">
+				</ws-input>
+				<ws-button class="find" type="primary" @click="find()"><img width="16" height="16" style="
               vertical-align: text-top;
               position: relative;
               top: 0px;
-            "
-            src="../../../public/img/sousuo.png"
-            alt=""
-        /></ws-button>
-      </template>
-    </BaseHeaderLayout>
-    <el-table
-      :data="weighingList"
-      style="width: 100%; margin-top: 20px"
-      ref="weighingList"
-      border
-      height="780"
-    >
-      <el-table-column type="index" label="序号" width="50">
-        <template scope="scope">
-          <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
-          <span v-else>{{ scope.$index + 1 }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="number" width="120" label="编号"></el-table-column>
-      <el-table-column prop="customer" label="客户"></el-table-column>
-      <el-table-column prop="carNumber" label="车牌号"></el-table-column>
-      <el-table-column prop="goodsName" label="货名"></el-table-column>
-      <el-table-column prop="type" label="类型"></el-table-column>
-      <el-table-column
-        prop="grossWeight"
-        label="毛重（公斤）"
-      ></el-table-column>
-      <el-table-column prop="tare" label="皮重（公斤）"></el-table-column>
-       <el-table-column prop="buckleMiscellaneous" label="扣杂（公斤）"></el-table-column>
-        <el-table-column prop="netWeight" label="净重（公斤）"></el-table-column>
-      <el-table-column prop="binNumber" label="仓位号"></el-table-column>
-      <el-table-column prop="storageNumber" label="囤位号"></el-table-column>
-      <el-table-column prop="secretaryWeigher" label="司称员">
-       <template slot-scope="scope">
-         <div v-if="scope.row.secretaryWeigher == scope.row.skinInspector">{{scope.row.skinInspector}}</div>
-         <div v-else>{{scope.row.secretaryWeigher}}<span v-if="scope.row.skinInspector">,{{scope.row.skinInspector}}</span></div>
-       </template> 
-      </el-table-column>
-      <el-table-column
-        prop="suqualityTestingDate"
-        label="称重时间"
-      >
-        <template slot-scope="scope">
-          <div
-            v-if="
+            " src="../../../public/img/sousuo.png" alt="" /></ws-button>
+			</template>
+		</BaseHeaderLayout>
+		<el-table :data="weighingList" style="width: 100%; margin-top: 20px" ref="weighingList" border height="780">
+			<el-table-column type="index" label="序号" width="50">
+				<template scope="scope">
+					<span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+					<span v-else>{{ scope.$index + 1 }}</span>
+				</template>
+			</el-table-column>
+			<el-table-column prop="number" width="150" label="编号"></el-table-column>
+			<el-table-column prop="customer" label="客户"></el-table-column>
+			<el-table-column prop="carNumber" label="车牌号"></el-table-column>
+			<el-table-column prop="goodsName" label="货名"></el-table-column>
+			<el-table-column prop="type" label="类型"></el-table-column>
+			<el-table-column prop="grossWeight" label="毛重（公斤）"></el-table-column>
+			<el-table-column prop="tare" label="皮重（公斤）"></el-table-column>
+			<el-table-column prop="buckleMiscellaneous" label="扣杂（公斤）"></el-table-column>
+			<el-table-column prop="netWeight" label="净重（公斤）"></el-table-column>
+			<el-table-column prop="binNumber" label="仓位号"></el-table-column>
+			<el-table-column prop="storageNumber" label="囤位号"></el-table-column>
+			<el-table-column prop="secretaryWeigher" label="司称员">
+				<template slot-scope="scope">
+					<div v-if="scope.row.secretaryWeigher == scope.row.skinInspector">{{scope.row.skinInspector}}</div>
+					<div v-else>{{scope.row.secretaryWeigher}}<span
+							v-if="scope.row.skinInspector">,{{scope.row.skinInspector}}</span></div>
+				</template>
+			</el-table-column>
+			<el-table-column prop="suqualityTestingDate" label="称重时间" width="90">
+				<template slot-scope="scope">
+					<div v-if="
               scope.row.status == '已称毛重'
-            "
-            > {{scope.row.grossDate}}</div
-          >
-         <div
-            v-if="
+            "> {{scope.row.grossDate}}</div>
+					<div v-if="
               scope.row.status == '已称皮重'
-            "
-            > {{scope.row.tareDate}}</div
-          >
-        </template></el-table-column>
-      <el-table-column prop="status" label="状态"></el-table-column>
-      <el-table-column width="300" prop="contractNo1" label="操作">
-        <template slot-scope="scope">
-          <el-button @click="weightCheck(scope.row, 1)" v-if=" scope.row.status == '已称毛重' || scope.row.status == '已质检' " v-hasPermission="`acquisitionManagement.acquisitionWeight.mao`" >毛重</el-button >
-          <!-- scope.row.paymentManagement.status == '待结算' && -->
-          <el-button :disabled = "scope.row.allow == 2" @click="weightCheck(scope.row, 2)"  v-if=" (scope.row.status == '已称毛重' || scope.row.status == '已称皮重') " v-hasPermission="`acquisitionManagement.acquisitionWeight.weight`">皮重</el-button>
-          <el-button @click="print(scope.row)" v-if="scope.row.status == '已称皮重' ||scope.row.status == '已称毛重'" v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button >
-        </template>
-      </el-table-column>
-    </el-table>
-    <div style="text-align: center">
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="currentPage"
-        :page-size="deptCircularPage.pageSize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="deptBudgetTotal"
-      >
-      </el-pagination>
-    </div>
-    <el-dialog
-      width="70%"
-      class="table-content"
-      center
-      :visible.sync="isShowPrint"
-      title="粮食检斤单"
-    >
-      <weightCheckPrint :tableData="dialogData"></weightCheckPrint>
-      <div style="text-align:center">
-      <el-button type="primary" @click="isShowPrint = false">关闭</el-button>
-      <el-button type="primary" @click="printSmall">打印小票</el-button>
-      <el-button type="primary" @click="printBig">打印单据</el-button>
-      </div>
-    </el-dialog>
-  </div>
+            "> {{scope.row.tareDate}}</div>
+				</template>
+			</el-table-column>
+			<el-table-column prop="status" label="状态"></el-table-column>
+			<el-table-column width="300" prop="contractNo1" label="操作">
+				<template slot-scope="scope">
+					<el-button @click="weightCheck(scope.row, 1)"
+						v-if=" scope.row.status == '已称毛重' || scope.row.status == '已质检' "
+						v-hasPermission="`acquisitionManagement.acquisitionWeight.mao`">毛重</el-button>
+					<!-- scope.row.paymentManagement.status == '待结算' && -->
+					<el-button :disabled="scope.row.allow == 2" @click="weightCheck(scope.row, 2)"
+						v-if=" (scope.row.status == '已称毛重' || scope.row.status == '已称皮重') "
+						v-hasPermission="`acquisitionManagement.acquisitionWeight.weight`">皮重</el-button>
+					<el-button @click="print(scope.row)" v-if="scope.row.status == '已称皮重' ||scope.row.status == '已称毛重'"
+						v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+		<div style="text-align: center">
+			<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
+				:current-page="currentPage" :page-size="deptCircularPage.pageSize"
+				layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+			</el-pagination>
+		</div>
+		<el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint" title="粮食检斤单">
+			<weightCheckPrint :tableData="dialogData"></weightCheckPrint>
+			<div style="text-align:center">
+				<el-button type="primary" @click="isShowPrint = false">关闭</el-button>
+				<el-button type="primary" @click="printSmall">打印小票</el-button>
+				<el-button type="primary" @click="printBig">打印单据</el-button>
+			</div>
+		</el-dialog>
+	</div>
 </template>
 <script>
-import {
-  getweighingList,
-  selectWarehouseSelf,
-  getPrint
-} from '@/model/houseSelfCollect/index'
-import weightCheckPrint from './component/weightCheckPrint.vue'
+	import {
+		getweighingList,
+		selectWarehouseSelf,
+		getPrint
+	} from '@/model/houseSelfCollect/index'
+	import weightCheckPrint from './component/weightCheckPrint.vue'
 
-export default {
-  components: {
-    weightCheckPrint
-  },
-  watch: {},
-  data() {
-    return {
-      //分页
-      currentPage: 1,
-      pageSize: 10,
-      deptCircularPage: {},
-      deptBudgetTotal: 0,
-      paymentForm: false,
-      paymentForm1: false,
-      weighingList: [],
-      searchKeyWord: '',
-      searchType: [],
-      warehouseName: '',
-      value1: '', //选择时间
-      warehouseList: [],
-      warehouseId: '',
-      cangid: '',
-      monitorUrl1: '',
-      monitorUrl2: '',
-      isShowPrint:false,//打印弹出
-      dialogData:{
-        qualityInspectionManagement:{},
-      },
-      purchasePriceList:[],
-      allowEdit:'0',
-      disabled:false
-    }
-  },
-  activated() {
-    this.selectWarehouse()
-   
-  },
-  methods: {
-     printSmall() {
-       window.open('../../../../static/weightCheck.html?type=1&tableData=' +JSON.stringify(this.dialogData))
-    },
-    printBig() {
-      window.open( '../../../../static/weightCheck.html?type=2&tableData=' +JSON.stringify(this.dialogData))
-    },
-    print(row) {
-       getPrint({
-      id:row.id
-      })
-        .toPromise()
-        .then((response) => {
-           this.dialogData = response
-           this.isShowPrint = true
-        })
-        .catch((response) => {
-          // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-        })
-    },
-    warehouseNameChange(e) {
-      // this.warehouseName = e
-      for (let i = 0; i < this.warehouseList.length; i++) {
-        if (this.warehouseList[i].value == e) {
-          this.warehouseId = this.warehouseList[i].warehouseId
-          this.cangid = this.warehouseList[i].warehouseId
-          this.allowEdit = this.warehouseList[i].allowEdit
-          this.WAREHOUSE[2].payname = this.warehouseList[i].value
-          this.common.name  =  this.warehouseList[i].value
-          this.monitorUrl1 =  this.warehouseList[i].monitorUrl1
-          this.monitorUrl2 =  this.warehouseList[i].monitorUrl2
-          sessionStorage.setItem('ck',e)
-        }
-      }
+	export default {
+		components: {
+			weightCheckPrint
+		},
+		watch: {},
+		data() {
+			return {
+				//分页
+				currentPage: 1,
+				pageSize: 10,
+				deptCircularPage: {},
+				deptBudgetTotal: 0,
+				paymentForm: false,
+				paymentForm1: false,
+				weighingList: [],
+				searchKeyWord: '',
+				searchType: [],
+				warehouseName: '',
+				value1: '', //选择时间
+				warehouseList: [],
+				warehouseId: '',
+				cangid: '',
+				monitorUrl1: '',
+				monitorUrl2: '',
+				isShowPrint: false, //打印弹出
+				dialogData: {
+					qualityInspectionManagement: {},
+				},
+				purchasePriceList: [],
+				allowEdit: '0',
+				disabled: false
+			}
+		},
+		activated() {
+			this.selectWarehouse()
 
-      this.getList()
-    },
-    weightCheck(row, num) {
-      this.$router.push({
-        path: 'weightCheck',
-        query: {
-          tpyeNo: num,
-          id: row.id,
-          number: row.number,
-          binNumber: row.binNumber,
-          customer: row.customer,
-          storageNumber: row.storageNumber,
-          carNumber: row.carNumber,
-          goodsName: row.goodsName,
-          grossWeight: row.grossWeight,
-          tare: row.tare,
-          netWeight: row.netWeight,
-          relationId: row.relationId,
-          warehouseId: this.warehouseId,
-          monitorUrl1: this.monitorUrl1,
-          monitorUrl2: this.monitorUrl2,
-          allowEdit:this.allowEdit,
-          cangid:this.cangid,
-          paramType:row.qualityInspectionManagement.paramType
-        },
-      })
-    },
-    find() {
-      this.getList()
-    },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`)
-      this.pageSize = val
-      this.getList()
-    },
-    handleCurrentChange(val) {
-      this.currentPage = val
-      console.log(`当前页: ${val}`)
-      this.getList()
-    },
-    selectWarehouse(){
-      let _wareHouse = sessionStorage.getItem('houseSelfCollect_house')
-      _wareHouse = JSON.parse(_wareHouse)
-      selectWarehouseSelf({
-        compId: sessionStorage.getItem('ws-pf_compId'),
-      })
-        .toPromise()
-        .then((response) => {
-          this.warehouseList = []
-          
-          for (let i = 0; i < response.length; i++) {
-            this.warehouseList.push({
-              value: response[i].warehouseName,
-              warehouseId: response[i].id,
-              allowEdit:response[i].allowEdit,
-              monitorUrl1:response[i].monitorUrl1,
-              monitorUrl2:response[i].monitorUrl2
-            })
-             if (_wareHouse) {
-            
-            this.cangid = _wareHouse.id
-            this.warehouseName = _wareHouse.warehouseName
-            this.common.name=_wareHouse.warehouseName
-            this.warehouseId=_wareHouse.id
-            this.warehouseNo =_wareHouse.commonWarehouseNo
-            this.monitorUrl1=_wareHouse.monitorUrl1
-            this.allowEdit = _wareHouse.allowEdit
-            this.monitorUrl2=_wareHouse.monitorUrl2
-          } else {
-            if (this.cangid&&this.cangid == response[i].id) {
-              this.warehouseName = response[i].warehouseName
-              this.allowEdit = response[i].allowEdit
-              this.common.name = response[i].warehouseName
-              this.warehouseId =  response[i].id
-              this.warehouseNo =  response[i].commonWarehouseNo
-              this.monitorUrl1 =  response[i].monitorUrl1
-              this.monitorUrl2 =  response[i].monitorUrl2
-            }
-         
-           if(this.warehouseList.length > 0 && !this.cangid){
-            this.warehouseName = this.warehouseList[0].value
-            this.allowEdit =this.warehouseList[0].allowEdit
-            this.cangid =  this.warehouseList[0].warehouseId
-            this.warehouseId =  this.warehouseList[0].warehouseId
-            this.WAREHOUSE[1].payname = this.warehouseList[0].value
-            this.common.name  =  this.warehouseList[0].value
-            this.monitorUrl1 =  this.warehouseList[0].monitorUrl1
-            this.monitorUrl2 =  this.warehouseList[0].monitorUrl2
-            } 
-          }
-          }
-           sessionStorage.setItem('ck',this.common.name)
-           console.log(this.warehouseList)
-         this.getList()
-        })
-    },
-    getList() {
-        getweighingList({
-        compId: sessionStorage.getItem('ws-pf_compId'),
-        currentPage: this.currentPage,
-        pageSize: this.pageSize,
-        searchKeyWord: this.searchKeyWord,
-        warehouseName: this.warehouseName,
-        managementType:1
-      })
-        .toPromise()
-        .then((response) => {
-          for(let i = 0 ; i < response.records.length ; i++){
-            if(response.records[i].paymentManagement){
-              if(response.records[i].paymentManagement.approveStatus || response.records[i].paymentManagement.status != '待结算'){
-                  response.records[i].allow = 2
-              }
-            }else{
-              response.records[i].allow = 1
-            }  
-          }
-          this.weighingList = response.records
-          this.common.commonWeighingList  = response.records
-          this.deptBudgetTotal = response.total
-        })
-        .catch((response) => {
-          // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-        })
-    },
-  },
-}
+		},
+		methods: {
+			printSmall() {
+				window.open('../../../../static/weightCheck.html?type=1&tableData=' + JSON.stringify(this.dialogData))
+			},
+			printBig() {
+				window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogData))
+			},
+			print(row) {
+				getPrint({
+						id: row.id
+					})
+					.toPromise()
+					.then((response) => {
+						this.dialogData = response
+						this.isShowPrint = true
+					})
+					.catch((response) => {
+						// EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+					})
+			},
+			warehouseNameChange(e) {
+				// this.warehouseName = e
+				for (let i = 0; i < this.warehouseList.length; i++) {
+					if (this.warehouseList[i].value == e) {
+						this.warehouseId = this.warehouseList[i].warehouseId
+						this.cangid = this.warehouseList[i].warehouseId
+						this.allowEdit = this.warehouseList[i].allowEdit
+						this.WAREHOUSE[2].payname = this.warehouseList[i].value
+						this.common.name = this.warehouseList[i].value
+						this.monitorUrl1 = this.warehouseList[i].monitorUrl1
+						this.monitorUrl2 = this.warehouseList[i].monitorUrl2
+						sessionStorage.setItem('ck', e)
+					}
+				}
+
+				this.getList()
+			},
+			weightCheck(row, num) {
+				this.$router.push({
+					path: 'weightCheck',
+					query: {
+						tpyeNo: num,
+						id: row.id,
+						number: row.number,
+						binNumber: row.binNumber,
+						customer: row.customer,
+						storageNumber: row.storageNumber,
+						carNumber: row.carNumber,
+						goodsName: row.goodsName,
+						grossWeight: row.grossWeight,
+						tare: row.tare,
+						netWeight: row.netWeight,
+						relationId: row.relationId,
+						warehouseId: this.warehouseId,
+						monitorUrl1: this.monitorUrl1,
+						monitorUrl2: this.monitorUrl2,
+						allowEdit: this.allowEdit,
+						cangid: this.cangid,
+						paramType: row.qualityInspectionManagement.paramType
+					},
+				})
+			},
+			find() {
+				this.getList()
+			},
+			handleSizeChange(val) {
+				console.log(`每页 ${val} 条`)
+				this.pageSize = val
+				this.getList()
+			},
+			handleCurrentChange(val) {
+				this.currentPage = val
+				console.log(`当前页: ${val}`)
+				this.getList()
+			},
+			selectWarehouse() {
+				let _wareHouse = sessionStorage.getItem('houseSelfCollect_house')
+				_wareHouse = JSON.parse(_wareHouse)
+				selectWarehouseSelf({
+						compId: sessionStorage.getItem('ws-pf_compId'),
+					})
+					.toPromise()
+					.then((response) => {
+						this.warehouseList = []
+
+						for (let i = 0; i < response.length; i++) {
+							this.warehouseList.push({
+								value: response[i].warehouseName,
+								warehouseId: response[i].id,
+								allowEdit: response[i].allowEdit,
+								monitorUrl1: response[i].monitorUrl1,
+								monitorUrl2: response[i].monitorUrl2
+							})
+							if (_wareHouse) {
+
+								this.cangid = _wareHouse.id
+								this.warehouseName = _wareHouse.warehouseName
+								this.common.name = _wareHouse.warehouseName
+								this.warehouseId = _wareHouse.id
+								this.warehouseNo = _wareHouse.commonWarehouseNo
+								this.monitorUrl1 = _wareHouse.monitorUrl1
+								this.allowEdit = _wareHouse.allowEdit
+								this.monitorUrl2 = _wareHouse.monitorUrl2
+							} else {
+								if (this.cangid && this.cangid == response[i].id) {
+									this.warehouseName = response[i].warehouseName
+									this.allowEdit = response[i].allowEdit
+									this.common.name = response[i].warehouseName
+									this.warehouseId = response[i].id
+									this.warehouseNo = response[i].commonWarehouseNo
+									this.monitorUrl1 = response[i].monitorUrl1
+									this.monitorUrl2 = response[i].monitorUrl2
+								}
+
+								if (this.warehouseList.length > 0 && !this.cangid) {
+									this.warehouseName = this.warehouseList[0].value
+									this.allowEdit = this.warehouseList[0].allowEdit
+									this.cangid = this.warehouseList[0].warehouseId
+									this.warehouseId = this.warehouseList[0].warehouseId
+									this.WAREHOUSE[1].payname = this.warehouseList[0].value
+									this.common.name = this.warehouseList[0].value
+									this.monitorUrl1 = this.warehouseList[0].monitorUrl1
+									this.monitorUrl2 = this.warehouseList[0].monitorUrl2
+								}
+							}
+						}
+						sessionStorage.setItem('ck', this.common.name)
+						console.log(this.warehouseList)
+						this.getList()
+					})
+			},
+			getList() {
+				getweighingList({
+						compId: sessionStorage.getItem('ws-pf_compId'),
+						currentPage: this.currentPage,
+						pageSize: this.pageSize,
+						searchKeyWord: this.searchKeyWord,
+						warehouseName: this.warehouseName,
+						managementType: 1
+					})
+					.toPromise()
+					.then((response) => {
+						for (let i = 0; i < response.records.length; i++) {
+							if (response.records[i].paymentManagement) {
+								if (response.records[i].paymentManagement.approveStatus || response.records[i]
+									.paymentManagement.status != '待结算') {
+									response.records[i].allow = 2
+								}
+							} else {
+								response.records[i].allow = 1
+							}
+						}
+						this.weighingList = response.records
+						this.common.commonWeighingList = response.records
+						this.deptBudgetTotal = response.total
+					})
+					.catch((response) => {
+						// EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+					})
+			},
+		},
+	}
 </script>
 <style lang="scss" scoped>
-.title {
-  font-size: 20px;
-  font-weight: 600;
-  margin: 20px;
-}
-.ws-info-table {
-  border: none;
-}
-.ws-info-table .el-form-item {
-  width: 50%;
-  border: none;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  width: 30%;
-  text-align: center;
-  background: #ffffff;
-  color: #8890b1;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  border: none;
-}
-/deep/.el-table .el-table__header .cell,
-.el-table .el-table__body .cell {
-  text-align: center;
-}
-/deep/.el-table--enable-row-transition .el-table__body td {
-  text-align: center;
-}
-.formItem {
-  width: 51% !important;
-}
-/deep/.el-dialog__title {
-  font-size: 24px !important;
-}
-/deep/.el-dialog__header {
-  text-align: center !important;
-  padding: 10px 0 !important;
-  height: auto !important;
-}
-.number {
-  text-align: right;
-  margin: 0 0 10px 0;
-}
-table,
-table tr th,
-table tr td {
-  border: 2px solid #333333;
-  padding: 5px 0;
-}
+	.title {
+		font-size: 20px;
+		font-weight: 600;
+		margin: 20px;
+	}
+
+	.ws-info-table {
+		border: none;
+	}
+
+	.ws-info-table .el-form-item {
+		width: 50%;
+		border: none;
+	}
+
+	/deep/.ws-info-table .el-form-item .el-form-item__label {
+		width: 30%;
+		text-align: center;
+		background: #ffffff;
+		color: #8890b1;
+	}
+
+	/deep/.ws-info-table .el-form-item .el-form-item__content {
+		border: none;
+	}
+
+	/deep/.el-table .el-table__header .cell,
+	.el-table .el-table__body .cell {
+		text-align: center;
+	}
+
+	/deep/.el-table--enable-row-transition .el-table__body td {
+		text-align: center;
+	}
+
+	.formItem {
+		width: 51% !important;
+	}
+
+	/deep/.el-dialog__title {
+		font-size: 24px !important;
+	}
+
+	/deep/.el-dialog__header {
+		text-align: center !important;
+		padding: 10px 0 !important;
+		height: auto !important;
+	}
+
+	.number {
+		text-align: right;
+		margin: 0 0 10px 0;
+	}
+
+	table,
+	table tr th,
+	table tr td {
+		border: 2px solid #333333;
+		padding: 5px 0;
+	}
+
+	table {
+		width: 100%;
+		min-height: 25px;
+		line-height: 25px;
+		text-align: center;
+		border-collapse: collapse;
+		border: 3px solid #333333;
+	}
+
+	.col-bgc {
+		background: #f6f7fb;
+	}
+
+	.bottom-row1 {
+		display: flex;
+		margin: 10px 0;
+	}
+
+	.bottom-row2 {
+		display: flex;
+		margin: 10px 0;
+
+		.left {
+			img {
+				width: 41px;
+				height: 41px;
+				margin-right: 118px;
+			}
+		}
+
+		.config {
+			margin-top: 20px;
+			margin-right: 240px;
+		}
 
-table {
-  width: 100%;
-  min-height: 25px;
-  line-height: 25px;
-  text-align: center;
-  border-collapse: collapse;
-  border: 3px solid #333333;
-}
-.col-bgc {
-  background: #f6f7fb;
-}
-.bottom-row1 {
-  display: flex;
-  margin: 10px 0;
-}
+		.autograph {
+			margin-top: 20px;
+		}
+	}
 
-.bottom-row2 {
-  display: flex;
-  margin: 10px 0;
+	.bottom-row3 {
+		margin: 10px 0;
+	}
 
-  .left {
-    img {
-      width: 41px;
-      height: 41px;
-      margin-right: 118px;
-    }
-  }
-  .config {
-    margin-top: 20px;
-    margin-right: 240px;
-  }
-  .autograph{
-    margin-top: 20px;
-  }
-}
-.bottom-row3 {
-  margin: 10px 0;
-}
-.bottom-row4 {
-  margin-top: 50px;
-  text-align: center;
-}
+	.bottom-row4 {
+		margin-top: 50px;
+		text-align: center;
+	}
 </style>

src/views/login/index.vue

@@ -146,11 +146,11 @@
             <el-form v-show="tabsOne" ref="loginForm" :model="loginForm" :rules="getFormRules" auto-complete="on"
               label-position="left">
               <el-form-item prop="companyName">
-                <el-input v-model="loginForm.companyName" :placeholder="$t('login.verification08')" />
-                <!-- <el-select v-model="value" filterable placeholder="请选择">
-                  <el-option v-for="item in compOptionList" :key="item.value" :label="item.label" :value="item.value">
+                <!-- <el-input v-model="loginForm.companyName" :placeholder="$t('login.verification08')" /> -->
+                <el-select v-model="loginForm.companyName" filterable placeholder="请选择" class="comp-select">
+                  <el-option v-for="item in compOptionList" :key="item.compName" :label="item.compName" :value="item.compName">
                   </el-option>
-                </el-select> -->
+                </el-select>
               </el-form-item>
               <el-form-item prop="username">
                 <el-input ref="username" v-model="loginForm.username" :placeholder="$t('login.select01')"
@@ -364,23 +364,8 @@
         }
       }
       return {
-        compOptionList: [{
-          value: '选项1',
-          label: '黄金糕'
-        }, {
-          value: '选项2',
-          label: '双皮奶'
-        }, {
-          value: '选项3',
-          label: '蚵仔煎'
-        }, {
-          value: '选项4',
-          label: '龙须面'
-        }, {
-          value: '选项5',
-          label: '北京烤鸭'
-        }],
-        value: '',
+        compOptionList: [],
+        compValue: '黑龙江中天昊元贸易有限公司',
         dialogService: false, //客服
         dialogAgreement: false, //服务协议
         phone: '',
@@ -577,8 +562,9 @@
       compList() {
         getcompList()
           .toPromise()
-          .then((res) => {debugger
+          .then((res) => {
             console.log('公司下拉列表数据',res)
+            this.compOptionList = res
             
           })
           .catch((err) => {})
@@ -1139,7 +1125,7 @@
             border-top: none;
             border-right: none;
             border-radius: 0;
-            border: 1px solid #e5e8ed;
+            border: 1px solid #e5e8ed!important;
             color: #000;
             padding: 0;
             padding: 5px 10px;
@@ -1443,4 +1429,8 @@
       line-height: 12px !important;
     }
   }
+  .comp-select{
+    width: 100%;
+        
+  }
 </style>

src/views/outboundManagement/collectionManagement.vue

@@ -157,6 +157,7 @@
       <el-table-column
         class="table_td"
         prop="collectionDate"
+        width="90"
         label="收款时间"
       ></el-table-column>
       <el-table-column

src/views/outboundManagement/weighingManagement.vue

@@ -39,7 +39,7 @@
 			<el-table-column prop="binNumber" label="仓位号"></el-table-column>
 			<el-table-column prop="storageNumber" label="囤位号"></el-table-column>
 			<el-table-column prop="secretaryWeigher" label="司称员"></el-table-column>
-			<el-table-column prop="grossDate" label="称重时间">
+			<el-table-column prop="grossDate"  width="140" label="称重时间">
 				<template slot-scope="scope">
 					{{scope.row.grossDate}}
 					<span v-if="scope.row.grossDate == null">

src/views/statisticalReport/autoSettlementList.vue

@@ -48,6 +48,13 @@
             @click="handleninvoice"
             >开发票</ws-button
           >
+          <ws-button
+            type="primary"
+            
+            @click="editRecord"
+            >记录</ws-button
+          >
+          <!-- v-hasPermission="`report.transportationReport.payment`" -->
         </el-col>
         <el-col
           style="text-align: right; line-height: 60px; padding-right: 10px"
@@ -386,6 +393,23 @@
         :total="deptBudgetTotal"
       ></el-pagination>
     </el-scrollbar>
+    <!-- 修改结算重量记录 -->
+    <el-dialog
+      width="40%"
+      title="结算重量修改记录"
+      :visible.sync="dialogFormVisible16"
+      :append-to-body="true"
+    >
+      <el-table :data="tranPriceApproveList">
+        <el-table-column prop="result" label="车牌号"> </el-table-column>
+        <el-table-column prop="tranPrice" label="单价（元）">
+        </el-table-column>
+        <el-table-column prop="beforeModification" label="修改前重量(吨)"> </el-table-column>
+        <el-table-column prop="afterModification" label="修改后重量(吨)"> </el-table-column>
+        <el-table-column prop="reviewer" label="修改人"> </el-table-column>
+        <el-table-column prop="createDate" label="修改日期" width="200px"> </el-table-column>
+      </el-table>
+    </el-dialog>
     <!-- 付款 -->
     <el-dialog
       width="25%"
@@ -611,6 +635,7 @@ export default {
       dialogFormVisible7: false,
       dialogFormVisible8: false,
       dialogFormVisible11: false,
+      dialogFormVisible16:false,
       dialogVisible: false,
 
       form: {
@@ -670,6 +695,7 @@ export default {
       deptCircularPage: {},
       warehouseList: [],
       orderList: {},
+      tranPriceApproveList:[],
       deptBudgetList: {},
       id: '',
 
@@ -1020,9 +1046,11 @@ export default {
         })
         return
       }
+      this.reviewer = sessionStorage.getItem('ws-pf_roleName') +sessionStorage.getItem('ws-pf_staffName')
       editauto({
         settlementWeight: Math.abs(this.settlementWeight),
         id: item.id,
+        reviewer:this.reviewer,
         flag: 0,
       })
         .toPromise()
@@ -1188,6 +1216,10 @@ export default {
         this.options = this.contractNoList
       }
     },
+    //查看修改结算重量记录
+    editRecord() {
+      this.dialogFormVisible16 = true
+    },
     handlepass() {
       var that = this
       if (this.modification.length == 0) {
@@ -1268,12 +1300,11 @@ export default {
             response.records[i].settlementWeightchange = false
             response.records[i].deductionAmountchange = false
             response.records[i].amountNotPayable=response.records[i].amountIngPayable-response.records[i].amountEdPayable
-            //     response.records[i].settlementPrice =
-            //       response.records[i].unitPrice -
-            //       Math.abs(response.records[i].basisPrice) -
-            //       Math.abs(response.records[i].unloadingCharge) -
-            //       Math.abs(response.records[i].invoiceFee) -
-            //       Math.abs(response.records[i].deductionAmount)
+            if(response.records[i].tranPriceApproveList){
+              for(var j=0;j<response.records[i].tranPriceApproveList.length;j++){
+                  this.tranPriceApproveList.push(response.records[i].tranPriceApproveList[j])
+              }
+            }
           }
           this.deptBudgetTotal = response.total
           this.warehouseList = response

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -90,7 +90,7 @@
 				</el-table-column>
 				<el-table-column class="table_td" prop="amountIngReceivable" label="应收金额(元)">
 					<template slot-scope="scope">
-						<span v-if="scope.row.returnFlag == null">{{scope.row.amountIngReceivable }}</span>
+						<span v-if="scope.row.returnFlag == null">{{scope.row.amountIngReceivable.toFixed(2) }}</span>
 					</template>
 				</el-table-column>
 			</el-table>

src/views/taskManagement/tranManagementTransport.vue

@@ -86,7 +86,7 @@
         </el-table-column>
         <el-table-column prop="taskNo" label="运输任务编号" width="140"></el-table-column>
         <el-table-column prop="contractNo" label="合同编号" width="160"></el-table-column>
-        <el-table-column prop=" weight" class="table_td" label="货物（吨数）">
+        <el-table-column prop=" weight" class="table_td" label="货物（吨数）" width="130"> 
           <template slot-scope="scope">{{ scope.row.goodsName }}({{ scope.row.weight }})</template>
         </el-table-column>
         <el-table-column prop="tranType" class="table_td" label="运输方式" width="120"></el-table-column>
@@ -105,7 +105,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column prop="status" label="状态">
+        <el-table-column prop="status" label="状态" width="100">
           <template slot-scope="scope">
             <el-popover
               placement="left"
@@ -148,7 +148,7 @@
             />
           </template>
         </el-table-column>
-        <el-table-column prop="seller" label="操作" width="300">
+        <el-table-column prop="seller" label="操作" width="160">
           <template slot-scope="scope">
             <div
               class="record"

src/views/taskManagement/tranManagementTransportAdd.vue

@@ -200,7 +200,6 @@
         <div class="driver">
           <span>运输阶段{{ item.key }} {{ item.processNo }}</span>
           <img
-            v-if="endflag == '0' "
             width="22"
             height="22"
             class="add"
@@ -216,19 +215,14 @@
             src="../../../public/img/del.png"
             alt
           />
-          <!-- <span
-            style="margin-left : 20px;font-size : 14px"
-            v-if="index == deptBudgetList.tranProcessInfoList.length - 1"
-          >最终阶段</span> -->
           <el-checkbox
-            @change="(val) => engflagchange(val, index)"
+            @change="(val) => {engflagchange(val, index)}"
             class="endflag"
             true-label="1"
             false-label="0"
-            v-if="index == deptBudgetList.tranProcessInfoList.length - 1"
             v-model="item.endFlag"
             :label="1"
-            >最终阶段</el-checkbox
+            >粮款结算阶段</el-checkbox
           >
         </div>
         <ws-info-table>
@@ -460,7 +454,6 @@ export default {
       heightData: '600px',
       zoom: 7,
       options: [],
-      endflag: false,
       selectedOptions: [],
       selectedOptions1: [],
       window: '',
@@ -602,23 +595,26 @@ export default {
     weightchange(e) {
       this.deptBudgetList.tranProcessInfoList[0].weight = e
     },
-    engflagchange(e) {
-      this.endflag = e
-      if (this.endflag) {
-        this.deptBudgetList.tranProcessInfoList[
-          this.deptBudgetList.tranProcessInfoList.length - 1
-        ].selectedOptions1 = this.selectedOptions1
-        this.deptBudgetList.tranProcessInfoList[
-          this.deptBudgetList.tranProcessInfoList.length - 1
-        ].receiveDetailedAddress = this.deptBudgetList.endDetailedAddress
-      } else {
-        this.deptBudgetList.tranProcessInfoList[
-          this.deptBudgetList.tranProcessInfoList.length - 1
-        ].selectedOptions1 = []
-        this.deptBudgetList.tranProcessInfoList[
-          this.deptBudgetList.tranProcessInfoList.length - 1
-        ].receiveDetailedAddress = ''
+    engflagchange(e, index) {
+      for(var i=0;i<this.deptBudgetList.tranProcessInfoList.length;i++){
+        this.deptBudgetList.tranProcessInfoList[i].endFlag='0'
       }
+      this.deptBudgetList.tranProcessInfoList[index].endFlag = e
+      // if (this.endflag) {
+      //   this.deptBudgetList.tranProcessInfoList[
+      //     this.deptBudgetList.tranProcessInfoList.length - 1
+      //   ].selectedOptions1 = this.selectedOptions1
+      //   this.deptBudgetList.tranProcessInfoList[
+      //     this.deptBudgetList.tranProcessInfoList.length - 1
+      //   ].receiveDetailedAddress = this.deptBudgetList.endDetailedAddress
+      // } else {
+      //   this.deptBudgetList.tranProcessInfoList[
+      //     this.deptBudgetList.tranProcessInfoList.length - 1
+      //   ].selectedOptions1 = []
+      //   this.deptBudgetList.tranProcessInfoList[
+      //     this.deptBudgetList.tranProcessInfoList.length - 1
+      //   ].receiveDetailedAddress = ''
+      // }
     },
     // 获取当前年月日
     getdate() {
@@ -1016,7 +1012,8 @@ export default {
           return
         }
       }
-      if (this.endflag) {
+      // debugger
+      // if (this.deptBudgetList.endFlag=='1') {
         this.$confirm(`运输任务提交成功后将派发到物流部门，是否确定提交？`, {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -1041,17 +1038,17 @@ export default {
                   CodeToText[this.selectedOptions[1]]
                 this.deptBudgetList.tranProcessInfoList[0].sendArea =
                   CodeToText[this.selectedOptions[2]]
-                if (this.endflag) {
-                  this.deptBudgetList.tranProcessInfoList[
-                    this.deptBudgetList.tranProcessInfoList.length - 1
-                  ].receivePrivate = CodeToText[this.selectedOptions1[0]]
-                  this.deptBudgetList.tranProcessInfoList[
-                    this.deptBudgetList.tranProcessInfoList.length - 1
-                  ].receiveCity = CodeToText[this.selectedOptions1[1]]
-                  this.deptBudgetList.tranProcessInfoList[
-                    this.deptBudgetList.tranProcessInfoList.length - 1
-                  ].receiveArea = CodeToText[this.selectedOptions1[2]]
-                }
+                // if (this.endflag) {
+                //   this.deptBudgetList.tranProcessInfoList[
+                //     this.deptBudgetList.tranProcessInfoList.length - 1
+                //   ].receivePrivate = CodeToText[this.selectedOptions1[0]]
+                //   this.deptBudgetList.tranProcessInfoList[
+                //     this.deptBudgetList.tranProcessInfoList.length - 1
+                //   ].receiveCity = CodeToText[this.selectedOptions1[1]]
+                //   this.deptBudgetList.tranProcessInfoList[
+                //     this.deptBudgetList.tranProcessInfoList.length - 1
+                //   ].receiveArea = CodeToText[this.selectedOptions1[2]]
+                // }
                 if (
                   this.deptBudgetList.taskType != '销售出库' ||
                   this.deptBudgetList.taskType != '贸易服务出库' ||
@@ -1115,108 +1112,108 @@ export default {
           .catch(() => {
             return false
           })
-      } else {
-        this.$confirm(`您还未选择最终阶段，是否确定提交？？`, {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-        })
-          .then(() => {
-            this.$refs.deptBudgetList.validate((valid) => {
-              if (valid) {
-                this.deptBudgetList.compId =
-                  sessionStorage.getItem('ws-pf_compId')
-                  console.log(this.checkList.toString())
-                this.deptBudgetList.tranType = this.checkList.toString()
-                this.deptBudgetList.startPrivate =
-                  CodeToText[this.selectedOptions[0]]
-                this.deptBudgetList.startCity =
-                  CodeToText[this.selectedOptions[1]]
-                this.deptBudgetList.startArea =
-                  CodeToText[this.selectedOptions[2]]
-                this.deptBudgetList.tranProcessInfoList[0].sendPrivate =
-                  CodeToText[this.selectedOptions[0]]
-                this.deptBudgetList.tranProcessInfoList[0].sendCity =
-                  CodeToText[this.selectedOptions[1]]
-                this.deptBudgetList.tranProcessInfoList[0].sendArea =
-                  CodeToText[this.selectedOptions[2]]
-                if (this.endflag) {
-                  this.deptBudgetList.tranProcessInfoList[
-                    this.deptBudgetList.tranProcessInfoList.length - 1
-                  ].receivePrivate = CodeToText[this.selectedOptions1[0]]
-                  this.deptBudgetList.tranProcessInfoList[
-                    this.deptBudgetList.tranProcessInfoList.length - 1
-                  ].receiveCity = CodeToText[this.selectedOptions1[1]]
-                  this.deptBudgetList.tranProcessInfoList[
-                    this.deptBudgetList.tranProcessInfoList.length - 1
-                  ].receiveArea = CodeToText[this.selectedOptions1[2]]
-                }
-                 if (
-                  this.deptBudgetList.taskType != '销售出库' ||
-                  this.deptBudgetList.taskType != '贸易服务出库' ||
-                  this.deptBudgetList.taskType != '暂存出库'
-                ){
-                  this.deptBudgetList.endPrivate = CodeToText[this.selectedOptions1[0]]
-                  this.deptBudgetList.endCity = CodeToText[this.selectedOptions1[1]]
-                  this.deptBudgetList.endArea = CodeToText[this.selectedOptions1[2]]
-                }
+      // } else {
+      //   this.$confirm(`您还未选择粮款结算阶段，是否确定提交？？`, {
+      //     confirmButtonText: '确定',
+      //     cancelButtonText: '取消',
+      //     type: 'warning',
+      //   })
+      //     .then(() => {
+      //       this.$refs.deptBudgetList.validate((valid) => {
+      //         if (valid) {
+      //           this.deptBudgetList.compId =
+      //             sessionStorage.getItem('ws-pf_compId')
+      //             console.log(this.checkList.toString())
+      //           this.deptBudgetList.tranType = this.checkList.toString()
+      //           this.deptBudgetList.startPrivate =
+      //             CodeToText[this.selectedOptions[0]]
+      //           this.deptBudgetList.startCity =
+      //             CodeToText[this.selectedOptions[1]]
+      //           this.deptBudgetList.startArea =
+      //             CodeToText[this.selectedOptions[2]]
+      //           this.deptBudgetList.tranProcessInfoList[0].sendPrivate =
+      //             CodeToText[this.selectedOptions[0]]
+      //           this.deptBudgetList.tranProcessInfoList[0].sendCity =
+      //             CodeToText[this.selectedOptions[1]]
+      //           this.deptBudgetList.tranProcessInfoList[0].sendArea =
+      //             CodeToText[this.selectedOptions[2]]
+      //           // if (this.endflag) {
+      //           //   this.deptBudgetList.tranProcessInfoList[
+      //           //     this.deptBudgetList.tranProcessInfoList.length - 1
+      //           //   ].receivePrivate = CodeToText[this.selectedOptions1[0]]
+      //           //   this.deptBudgetList.tranProcessInfoList[
+      //           //     this.deptBudgetList.tranProcessInfoList.length - 1
+      //           //   ].receiveCity = CodeToText[this.selectedOptions1[1]]
+      //           //   this.deptBudgetList.tranProcessInfoList[
+      //           //     this.deptBudgetList.tranProcessInfoList.length - 1
+      //           //   ].receiveArea = CodeToText[this.selectedOptions1[2]]
+      //           // }
+      //            if (
+      //             this.deptBudgetList.taskType != '销售出库' ||
+      //             this.deptBudgetList.taskType != '贸易服务出库' ||
+      //             this.deptBudgetList.taskType != '暂存出库'
+      //           ){
+      //             this.deptBudgetList.endPrivate = CodeToText[this.selectedOptions1[0]]
+      //             this.deptBudgetList.endCity = CodeToText[this.selectedOptions1[1]]
+      //             this.deptBudgetList.endArea = CodeToText[this.selectedOptions1[2]]
+      //           }
 
-                for (
-                  var i = 0;
-                  i < this.deptBudgetList.tranProcessInfoList.length;
-                  i++
-                ) {
-                  this.deptBudgetList.tranProcessInfoList[i].sort = i
-                }
+      //           for (
+      //             var i = 0;
+      //             i < this.deptBudgetList.tranProcessInfoList.length;
+      //             i++
+      //           ) {
+      //             this.deptBudgetList.tranProcessInfoList[i].sort = i
+      //           }
 
-                addtrantask(this.deptBudgetList)
-                  .toPromise()
-                  .then((response) => {
-                    this.$message.success('添加成功')
-                    this.deptBudgetList = {
-                      taskNo: '',
-                      totalStorage: 0,
-                      goodsName: '玉米',
-                      goodsNameKey: 1,
-                      warehouseType: '1',
-                      tranProcessInfoList: [
-                        {
-                          processNo: '',
-                          tranType: '汽运',
-                          deliveryDateStart: '',
-                          deliveryDateEnd: '',
-                          weight: '',
-                          selectedOptions: [],
-                          selectedOptions1: [],
-                          sendPrivate: '',
-                          sendCity: '',
-                          sendArea: '',
-                          receivePrivate: '',
-                          receiveCity: '',
-                          receiveArea: '',
-                          sendDetailedAddress: '',
-                          receiveDetailedAddress: '',
-                          sender: '',
-                          receiver: '',
-                          senderPhone: '',
-                          receiverPhone: '',
-                          contractNo: '',
-                          receiveWarehouse: '',
-                        },
-                      ],
-                    }
-                    this.$router.push({ path: 'tranManagementTransport' })
-                  })
-              } else {
-                EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-                return false
-              }
-            })
-          })
-          .catch(() => {
-            return false
-          })
-      }
+      //           addtrantask(this.deptBudgetList)
+      //             .toPromise()
+      //             .then((response) => {
+      //               this.$message.success('添加成功')
+      //               this.deptBudgetList = {
+      //                 taskNo: '',
+      //                 totalStorage: 0,
+      //                 goodsName: '玉米',
+      //                 goodsNameKey: 1,
+      //                 warehouseType: '1',
+      //                 tranProcessInfoList: [
+      //                   {
+      //                     processNo: '',
+      //                     tranType: '汽运',
+      //                     deliveryDateStart: '',
+      //                     deliveryDateEnd: '',
+      //                     weight: '',
+      //                     selectedOptions: [],
+      //                     selectedOptions1: [],
+      //                     sendPrivate: '',
+      //                     sendCity: '',
+      //                     sendArea: '',
+      //                     receivePrivate: '',
+      //                     receiveCity: '',
+      //                     receiveArea: '',
+      //                     sendDetailedAddress: '',
+      //                     receiveDetailedAddress: '',
+      //                     sender: '',
+      //                     receiver: '',
+      //                     senderPhone: '',
+      //                     receiverPhone: '',
+      //                     contractNo: '',
+      //                     receiveWarehouse: '',
+      //                   },
+      //                 ],
+      //               }
+      //               this.$router.push({ path: 'tranManagementTransport' })
+      //             })
+      //         } else {
+      //           EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+      //           return false
+      //         }
+      //       })
+      //     })
+      //     .catch(() => {
+      //       return false
+      //     })
+      // }
     },
     resetForm(deptBudgetList) {
       this.$refs[deptBudgetList].resetFields()

src/views/taskManagement/tranManagementTransportEdit.vue

@@ -200,7 +200,6 @@
             >运输阶段{{ index + 1 }} {{ item.processNo }}</span
           >
           <img
-            v-if="!endflag"
             width="22"
             height="22"
             class="add"
@@ -218,13 +217,13 @@
             alt=""
           />
           <el-checkbox
-          @change="(val) => engflagchange(val,index)"
+            @change="(val) => {engflagchange(val, index)}"
             class="endflag"
-            v-bind:checked="endflag"
-            v-if="index == deptBudgetList.tranProcessInfoList.length - 1"
+            true-label="1"
+            false-label="0"
             v-model="item.endFlag"
             :label="1"
-            >最终阶段</el-checkbox
+            >粮款结算阶段</el-checkbox
           >
         </div>
         <ws-info-table>
@@ -425,7 +424,6 @@ export default {
       checkList: [],
       deptBudgetList: {},
       radio: '1',
-      endflag: false,
       carModelList: [],
       carLengthList: [],
       warehouseType: '1',
@@ -572,32 +570,35 @@ export default {
       }
     },
     engflagchange(e,index) {
-      this.endflag = e
-      if (this.endflag) {
-        this.deptBudgetList.tranProcessInfoList[
-          this.deptBudgetList.tranProcessInfoList.length - 1
-        ].selectedOptions1 = this.selectedOptions1
-        this.deptBudgetList.tranProcessInfoList[
-          this.deptBudgetList.tranProcessInfoList.length - 1
-        ].receiveDetailedAddress = this.deptBudgetList.endDetailedAddress
-      } else {
-        this.deptBudgetList.tranProcessInfoList[
-          this.deptBudgetList.tranProcessInfoList.length - 1
-        ].selectedOptions1 = []
-        this.deptBudgetList.tranProcessInfoList[
-          this.deptBudgetList.tranProcessInfoList.length - 1
-        ].receiveDetailedAddress = ''
+       for(var i=0;i<this.deptBudgetList.tranProcessInfoList.length;i++){
+        this.deptBudgetList.tranProcessInfoList[i].endFlag='0'
       }
+      this.deptBudgetList.tranProcessInfoList[index].endFlag = e
+      // if (this.endflag) {
+      //   this.deptBudgetList.tranProcessInfoList[
+      //     this.deptBudgetList.tranProcessInfoList.length - 1
+      //   ].selectedOptions1 = this.selectedOptions1
+      //   this.deptBudgetList.tranProcessInfoList[
+      //     this.deptBudgetList.tranProcessInfoList.length - 1
+      //   ].receiveDetailedAddress = this.deptBudgetList.endDetailedAddress
+      // } else {
+      //   this.deptBudgetList.tranProcessInfoList[
+      //     this.deptBudgetList.tranProcessInfoList.length - 1
+      //   ].selectedOptions1 = []
+      //   this.deptBudgetList.tranProcessInfoList[
+      //     this.deptBudgetList.tranProcessInfoList.length - 1
+      //   ].receiveDetailedAddress = ''
+      // }
     },
     loaddata() {
       examinetran({ id: this.$route.query.id })
         .toPromise()
         .then((response) => {
-          for (var j = 0; j < response.tranProcessInfoList.length; j++) {
-            if (response.tranProcessInfoList[j].endFlag == 'true') {
-              this.endflag = true
-            }
-          }
+          // for (var j = 0; j < response.tranProcessInfoList.length; j++) {
+          //   if (response.tranProcessInfoList[j].endFlag == '1') {
+          //     this.endflag = '1'
+          //   }
+          // }
           this.deptBudgetList = response
           this.number = response.tranProcessInfoList.length + 1
           this.count = response.count + 1
@@ -630,7 +631,7 @@ export default {
             this.selectedOptions1 = tmp1
           }
           for (var i = 0; i < response.tranProcessInfoList.length; i++) {
-            console.log(response.tranProcessInfoList[i].endFlag)
+            // console.log(response.tranProcessInfoList[i].endFlag)
             if (
               response.tranProcessInfoList[i].sendPrivate != '' &&
               response.tranProcessInfoList[i].sendCity != '' &&
@@ -991,55 +992,55 @@ export default {
           return
         }
       }
-      if (this.endflag == false) {
-        this.$confirm('您还未选择最终阶段，是否确定提交？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-        })
-          .then(() => {
-            this.$refs.deptBudgetList.validate((valid) => {
-              if (valid) {
-                this.deptBudgetList.compId =
-                  sessionStorage.getItem('ws-pf_compId')
-                this.deptBudgetList.tranType = this.checkList.toString()
-                this.deptBudgetList.startPrivate =
-                  CodeToText[this.selectedOptions[0]]
-                this.deptBudgetList.startCity =
-                  CodeToText[this.selectedOptions[1]]
-                this.deptBudgetList.startArea =
-                  CodeToText[this.selectedOptions[2]]
-                this.deptBudgetList.tranProcessInfoList[0].sendPrivate =
-                  CodeToText[this.selectedOptions[0]]
-                this.deptBudgetList.tranProcessInfoList[0].sendCity =
-                  CodeToText[this.selectedOptions[1]]
-                this.deptBudgetList.tranProcessInfoList[0].sendArea =
-                  CodeToText[this.selectedOptions[2]]
-                for (
-                  var i = 0;
-                  i < this.deptBudgetList.tranProcessInfoList.length;
-                  i++
-                ) {
-                  this.deptBudgetList.tranProcessInfoList[i].sort = i
-                }
+      // if (this.endFlag == false) {
+      //   this.$confirm('您还未选择最终阶段，是否确定提交？', '提示', {
+      //     confirmButtonText: '确定',
+      //     cancelButtonText: '取消',
+      //     type: 'warning',
+      //   })
+      //     .then(() => {
+      //       this.$refs.deptBudgetList.validate((valid) => {
+      //         if (valid) {
+      //           this.deptBudgetList.compId =
+      //             sessionStorage.getItem('ws-pf_compId')
+      //           this.deptBudgetList.tranType = this.checkList.toString()
+      //           this.deptBudgetList.startPrivate =
+      //             CodeToText[this.selectedOptions[0]]
+      //           this.deptBudgetList.startCity =
+      //             CodeToText[this.selectedOptions[1]]
+      //           this.deptBudgetList.startArea =
+      //             CodeToText[this.selectedOptions[2]]
+      //           this.deptBudgetList.tranProcessInfoList[0].sendPrivate =
+      //             CodeToText[this.selectedOptions[0]]
+      //           this.deptBudgetList.tranProcessInfoList[0].sendCity =
+      //             CodeToText[this.selectedOptions[1]]
+      //           this.deptBudgetList.tranProcessInfoList[0].sendArea =
+      //             CodeToText[this.selectedOptions[2]]
+      //           for (
+      //             var i = 0;
+      //             i < this.deptBudgetList.tranProcessInfoList.length;
+      //             i++
+      //           ) {
+      //             this.deptBudgetList.tranProcessInfoList[i].sort = i
+      //           }
 
-                edittran(this.deptBudgetList)
-                  .toPromise()
-                  .then((response) => {
-                    this.$message.success('编辑成功')
-                    this.deptBudgetList = {}
-                    this.$router.push({ path: 'tranManagementTransport' })
-                  })
-              } else {
-                EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-                return false
-              }
-            })
-          })
-          .catch(() => {
-            return false
-          })
-      } else {
+      //           edittran(this.deptBudgetList)
+      //             .toPromise()
+      //             .then((response) => {
+      //               this.$message.success('编辑成功')
+      //               this.deptBudgetList = {}
+      //               this.$router.push({ path: 'tranManagementTransport' })
+      //             })
+      //         } else {
+      //           EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+      //           return false
+      //         }
+      //       })
+      //     })
+      //     .catch(() => {
+      //       return false
+      //     })
+      // } else {
         this.$confirm(
           '运输任务提交成功后将派发到物流部门，是否确定提交？',
           '提示',
@@ -1105,7 +1106,7 @@ export default {
             alert('失败2')
             return false
           })
-      }
+      // }
     },
     resetForm(deptBudgetList) {
       this.$refs[deptBudgetList].resetFields()

src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -39,8 +39,8 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="inOutTaskNo" label="任务编号"></el-table-column>
-        <el-table-column prop="contractNo" label="合同编号" width="80">
+        <el-table-column prop="inOutTaskNo" label="任务编号" width="160"></el-table-column>
+        <el-table-column prop="contractNo" label="合同编号" width="160">
           <!-- <template scope="scope">
             <div
               v-if="
@@ -66,7 +66,7 @@
         <el-table-column prop="weight" class="table_td" label="重量（吨）"></el-table-column>
         <el-table-column prop="predictDate" class="table_td" label="预计日期"></el-table-column>
         <el-table-column prop="publisher" class="table_td" label="发布者"></el-table-column>
-        <el-table-column prop="taskStatus" label="状态">
+        <el-table-column prop="taskStatus" label="状态" width="90">
           <template slot-scope="scope">
             <template>
               <span slot="reference">
@@ -82,7 +82,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="establishDate" class="table_td" label="创建时间"></el-table-column>
-        <el-table-column prop="seller" label="操作" width="300">
+        <el-table-column prop="seller" label="操作" width="180">
           <template slot-scope="scope">
             <span class="corles" @click="nocomplete(scope.row)" v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.View`

src/views/tranManagement/tranManagementFireFeedback.vue

@@ -7,13 +7,8 @@
       </el-col>
       <el-col :span="12" class="bg-right">
         <el-button class="bg-bottom" type="primary" size="small" @click="revert()">
-          <img
-            width="6"
-            height="10"
-            style="vertical-align: bottom; margin-right: 3px"
-            src="../../../public/img/lujing.png"
-            alt
-          />返回
+          <img width="6" height="10" style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png" alt />返回
         </el-button>
       </el-col>
     </el-row>
@@ -32,19 +27,10 @@
           }}{{ deptBudgetList.sendArea }}
         </ws-form-item>
         <!--发货人-->
-        <ws-form-item
-          label="发货人"
-          span="1"
-          prop="sender"
-          class="readonly"
-        >{{ deptBudgetList.sender }}</ws-form-item>
+        <ws-form-item label="发货人" span="1" prop="sender" class="readonly">{{ deptBudgetList.sender }}</ws-form-item>
         <!--发货人电话-->
-        <ws-form-item
-          label="发货人电话"
-          span="1"
-          prop="senderPhone"
-          class="readonly"
-        >{{ deptBudgetList.senderPhone }}</ws-form-item>
+        <ws-form-item label="发货人电话" span="1" prop="senderPhone" class="readonly">{{ deptBudgetList.senderPhone }}
+        </ws-form-item>
         <!--收货地址-->
         <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
           {{ deptBudgetList.receivePrivate }}{{ deptBudgetList.receiveCity
@@ -55,17 +41,10 @@
         <!--收货人电话-->
         <ws-form-item label="收货人电话" span="1" prop="receiverPhone">{{ deptBudgetList.receiverPhone }}</ws-form-item>
         <!--发货日期-->
-        <ws-form-item
-          label="发货日期"
-          span="1"
-          prop="deliveryDateStart"
-        >{{ deptBudgetList.deliveryDateStart }}</ws-form-item>
+        <ws-form-item label="发货日期" span="1" prop="deliveryDateStart">{{ deptBudgetList.deliveryDateStart }}
+        </ws-form-item>
         <!--最晚到货日期-->
-        <ws-form-item
-          label="最晚到货日期"
-          span="1"
-          prop="deliveryDateEnd"
-        >{{ deptBudgetList.deliveryDateEnd }}</ws-form-item>
+        <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">{{ deptBudgetList.deliveryDateEnd }}</ws-form-item>
         <!--合同编号-->
         <ws-form-item label="合同编号" span="1" prop="contractNo">{{ deptBudgetList.contractNo }}</ws-form-item>
         <!-- 运输方式 -->
@@ -84,13 +63,8 @@
           </ws-form-item>
           <!--发车日期-->
           <el-form-item label="发车日期:" span="1" prop="sendDateStart">
-            <ws-date-picker
-              v-model="deptBudgetList.sendDateStart"
-              type="date"
-              style="width: 150px"
-              placeholder="请选择日期"
-              value-format="yyyy-MM-dd"
-            />
+            <ws-date-picker v-model="deptBudgetList.sendDateStart" type="date" style="width: 150px" placeholder="请选择日期"
+              value-format="yyyy-MM-dd" />
           </el-form-item>
           <!--预计到站日期-->
           <ws-form-item label="预计到站日期:" span="1" prop="receiveDateEnd">
@@ -104,26 +78,21 @@
       </div>
       <div class="small-title" style="font-size: 16px">装车详情</div>
       <!-- 导入 -->
-      <div style="font-size: 16px; width: 100%;  text-align: right">
-        <el-upload
-          style="margin-left: 8px;"
-          class="upload-demo inline-block margin-right-10"
-          action
-          :on-change="handleChange"
-          :show-file-list="false"
+      <div style="font-size: 16px; width: 100%;  text-align: right;display:flex;justify-content:end;">
+        <el-link
+          href="https://taohaoliang.oss-cn-beijing.aliyuncs.com/%E6%B1%BD%E8%BF%90%E8%A3%85%E8%BD%A6%E5%8F%8D%E9%A6%88%E6%A8%A1%E6%9D%BF.xlsx"
+          style="margin-left: 8px;">
+          <el-button type="primary">模板下载</el-button>
+        </el-link>
+        <el-upload style="margin-left: 8px;" class="upload-demo inline-block margin-right-10" action
+          :on-change="handleChange" :show-file-list="false"
           accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-          :auto-upload="false"
-        >
+          :auto-upload="false">
           <el-button type="primary">导入</el-button>
         </el-upload>
       </div>
       <div class="liaison" v-if="file_is_show">
-        <div
-          style="width: 100%"
-          class="flex position"
-          v-for="(item, index) in freightspace"
-          :key="index"
-        >
+        <div style="width: 100%" class="flex position" v-for="(item, index) in freightspace" :key="index">
           <ws-info-table>
             <!--车厢号-->
             <div class="catNos">车厢号-{{ index + 1 }}</div>
@@ -132,88 +101,49 @@
             </ws-form-item>
             <!--装车净重-->
             <ws-form-item label="装车净重：" span="1" prop="loadNetWeight">
-              <ws-input
-                v-if="item.status == '已装车' || item.status == '已送达'"
-                :disabled="readonly"
-                v-model="item.loadNetWeight"
-                placeholder="请输入装车净重"
-                maxlength="20"
-                size="small"
-              />
-              <ws-input
-                v-else
-                v-model="item.loadNetWeight"
-                placeholder="请输入装车净重"
-                maxlength="20"
-                size="small"
-              />
+              <ws-input v-if="item.status == '已装车' || item.status == '已送达'" :disabled="readonly"
+                v-model="item.loadNetWeight" placeholder="请输入装车净重" maxlength="20" size="small" />
+              <ws-input v-else v-model="item.loadNetWeight" placeholder="请输入装车净重" maxlength="20" size="small" />
             </ws-form-item>
             <!--磅单-->
             <ws-form-item label="磅单：" span="1" prop="loadPoundImg">
               <template>
                 <!-- slot-scope="scope" -->
-                <el-upload
-                  action="https://www.zthymaoyi.com/upload/admin"
-                  :show-file-list="false"
-                  :on-success="
+                <el-upload action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false" :on-success="
                     (res) => {
                       uploadSuccessHandle1(res, index)
                     }
-                  "
-                  class="avatar-uploader"
-                  accept=".jpg, .jpeg, .png, .gif"
-                >
-                  <img
-                    width="18"
-                    height="20"
-                    style="vertical-align: text-top; position: relative"
-                    src="../../../public/img/fujian.png"
-                    alt
-                  />
+                  " class="avatar-uploader" accept=".jpg, .jpeg, .png, .gif">
+                  <img width="18" height="20" style="vertical-align: text-top; position: relative"
+                    src="../../../public/img/fujian.png" alt />
                 </el-upload>
-                <span v-show="item.imgCount > 0">{{item.imgCount}}</span>
-                <span v-show="item.imgCount == 0">未上传</span>
+                <span v-if="item.imgCount > 0">{{item.imgCount}}</span>
+                <span v-if="item.imgCount == 0">未上传</span>
               </template>
             </ws-form-item>
+            <!--预览-->
+            <div>
+              <el-button class="bg-bottom" type="primary" size="small" @click="preview(item)"  v-if="item.imgCount > 0 ">预览</el-button>
+            </div>
+            <!--箱号-->
             <!--装车日期-->
             <el-form-item label="装车日期:" span="1" prop="loadingDate">
-              <ws-date-picker
-                v-if="item.status == '已装车' || item.status == '已送达'"
-                :disabled="readonly"
-                v-model="item.loadingDate"
-                type="date"
-                style="width: 150px"
-                placeholder="请选择日期"
-                value-format="yyyy-MM-dd"
-              />
-              <ws-date-picker
-                v-else
-                v-model="item.loadingDate"
-                type="date"
-                style="width: 150px"
-                placeholder="请选择日期"
-                value-format="yyyy-MM-dd"
-              />
+              <ws-date-picker v-if="item.status == '已装车' || item.status == '已送达'" :disabled="readonly"
+                v-model="item.loadingDate" type="date" style="width: 150px" placeholder="请选择日期"
+                value-format="yyyy-MM-dd" />
+              <ws-date-picker v-else v-model="item.loadingDate" type="date" style="width: 150px" placeholder="请选择日期"
+                value-format="yyyy-MM-dd" />
             </el-form-item>
 
             <!-- 提交 -->
             <span class="servicein" v-show="item.status == '已装车' || item.status == '已送达'">已装车</span>
-            <span
-              style="text-align: right; padding: 10px"
-              class="center"
-              v-if="
+            <span style="text-align: right; padding: 10px" class="center" v-if="
                 item.status == '' ||
                 item.status == null ||
                 item.status == '未装车'
-              "
-            >
+              ">
               <div>
-                <el-button
-                  class="bg-bottom"
-                  type="primary"
-                  size="small"
-                  @click="submit(index)"
-                >提交</el-button>
+                <el-button class="bg-bottom" type="primary" size="small" @click="submit(index)">提交</el-button>
               </div>
             </span>
             <!-- <div
@@ -232,15 +162,8 @@
             >
               {{ item.signStatus }}
             </div>-->
-            <span
-              v-show="item.temporaryDriverFlag != 0"
-              width="22"
-              height="22"
-              class="del"
-              @click="del(index)"
-              src="../../../public/img/del.png"
-              alt
-            >×</span>
+            <span v-show="item.temporaryDriverFlag != 0" width="22" height="22" class="del" @click="del(index)"
+              src="../../../public/img/del.png" alt>×</span>
           </ws-info-table>
         </div>
       </div>
@@ -266,75 +189,84 @@
   </div>
 </template>
 <script>
-import { regionData } from 'element-china-area-data'
-import { seeCat, feedback, state } from '@/model/transport/index'
-import WsUpload from '@/components/WsUpload'
-import mapDrag from '@/components/mapdrag/mapdrag'
-export default {
-  name: 'viewSpareMoney',
-  components: {
-    WsUpload,
-    mapDrag
-  },
-  watch: {
-    vesselId(val) {
-      this.getVesselData()
+  import {
+    regionData
+  } from 'element-china-area-data'
+  import {
+    seeCat,
+    feedback,
+    state
+  } from '@/model/transport/index'
+  import WsUpload from '@/components/WsUpload'
+  import mapDrag from '@/components/mapdrag/mapdrag'
+  export default {
+    name: 'viewSpareMoney',
+    components: {
+      WsUpload,
+      mapDrag
     },
-    isShow(val) {
-      this.showType = val
-    },
-       freightspace(newVal) {
+    watch: {
+      vesselId(val) {
+        this.getVesselData()
+      },
+      isShow(val) {
+        this.showType = val
+      },
+      freightspace(newVal) {
         this.file_is_show = false
         if (true) {
-            this.$nextTick(()=>{ // $nextTick 是在 DOM 更新循环结束之后执行延迟回调
-                this.file_is_show = true
-            })
+          this.$nextTick(() => { // $nextTick 是在 DOM 更新循环结束之后执行延迟回调
+            this.file_is_show = true
+          })
         }
-    }
-  },
-  data() {
-    return {
-      index:0,
-      file_is_show:true,
-      deptBudgetList: {
-        totalStorage: 0
-      },
-      options_: regionData,
-      heightData: '600px',
-      zoom: 7,
-      selectedOptions: [],
-      center: [116.244694, 39.517344],
-      window: '',
-      radio: 1,
-      personCharge: [],
-      district: null,
-      driverList: [],
-      readonly: true,
-      listDate: { country: '中国', level: 'country', city: '' },
-      citylist: [],
-      compId: sessionStorage.getItem('ws-pf_compId'),
-      rules: {
-        warehouseName: [
-          {
-            required: true,
-            message: '请输入仓库名称',
-            trigger: 'blur'
-          },
-          {
-            min: 2,
-            max: 20,
-            message: '仓库名长度不符合要求，请输入2-20字符之内',
-            trigger: 'blur'
-          }
-        ]
-      },
-      tranType: 2,
-      size: 10,
-      value1: '',
-      unitList: [],
+      }
+    },
+    data() {
+      return {
+        excelFreightspace: [],
+        index: 0,
+        file_is_show: true,
+        deptBudgetList: {
+          totalStorage: 0
+        },
+        options_: regionData,
+        heightData: '600px',
+        zoom: 7,
+        selectedOptions: [],
+        center: [116.244694, 39.517344],
+        window: '',
+        radio: 1,
+        personCharge: [],
+        district: null,
+        driverList: [],
+        readonly: true,
+        listDate: {
+          country: '中国',
+          level: 'country',
+          city: ''
+        },
+        citylist: [],
+        compId: sessionStorage.getItem('ws-pf_compId'),
+        rules: {
+          warehouseName: [{
+              required: true,
+              message: '请输入仓库名称',
+              trigger: 'blur'
+            },
+            {
+              min: 2,
+              max: 20,
+              message: '仓库名长度不符合要求，请输入2-20字符之内',
+              trigger: 'blur'
+            }
+          ]
+        },
+        tranType: 2,
+        size: 10,
+        value1: '',
+        unitList: [],
 
-      freightspace1: [
-        {
+        freightspace1: [{
           accountTypeFlag: '1',
           payeeName: '',
           payeeNumberCard: '',
@@ -342,841 +274,939 @@ export default {
           bankDeposit: '',
           addressUrlArray: [],
           bankCard: ''
-        }
-      ],
-      freightspace: [
-        {
-          boxNo: '',
-          loadNetWeight: '',
-          loadPoundImg: '',
-          loadingDate: '',
-          imgCount:0
-        }
-        // {loadPoundImg:{}},
-      ],
-      name: '',
-      staffList: [],
-      options: [],
-      carModel: [],
-      fileTemp: {},
-      tranCarInfoList: {
-        loadPoundImg: ''
-      },
-      //  tranCarList: {
-      //   driver: '',
-      //   driverPhone:'',
-      //   sendDateStart:'',
-      //   receiveDateEnd:'',
-      //   carModel:'',
-      // },
-      //上传
-      accessoryTFs: false,
-      fileList: [],
-      appendixIdsAdd: '',
-    }
-  },
-  activated() {
-    this.deptBudgetList.id = this.$route.query.id
-    this.getList()
-  },
-  computed: {
-    totalStorage: function() {
-      var maxStorage = 0
-      for (var i = 0; i < this.freightspace.length; i++) {
-        maxStorage += Number(this.freightspace[i].maxStorage)
+        }],
+        freightspace: [{
+            boxNo: '',
+            loadNetWeight: '',
+            loadPoundImg: '',
+            loadingDate: '',
+            imgCount: 0
+          }
+          // {loadPoundImg:{}},
+        ],
+        name: '',
+        staffList: [],
+        options: [],
+        carModel: [],
+        fileTemp: {},
+        tranCarInfoList: {
+          loadPoundImg: ''
+        },
+        //  tranCarList: {
+        //   driver: '',
+        //   driverPhone:'',
+        //   sendDateStart:'',
+        //   receiveDateEnd:'',
+        //   carModel:'',
+        // },
+        //上传
+        accessoryTFs: false,
+        fileList: [],
+        appendixIdsAdd: '',
       }
-      return maxStorage
     },
-    total: function() {
-      if (this.deptBudgetList.tranCarInfoList != null) {
+    activated() {
+      this.deptBudgetList.id = this.$route.query.id
+      this.getList()
+    },
+    computed: {
+      totalStorage: function() {
         var maxStorage = 0
-        for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
-          maxStorage += Number(
-            this.deptBudgetList.tranCarInfoList[i].loadNetWeight
-          )
+        for (var i = 0; i < this.freightspace.length; i++) {
+          maxStorage += Number(this.freightspace[i].maxStorage)
         }
         return maxStorage
-      } else {
-        return 0
-      }
-    }
-  },
-  methods: {
-    handleChange(file, fileList) {
-      this.fileTemp = file.raw
-      let fileName = file.raw.name
-      let fileType = fileName.substring(fileName.lastIndexOf('.') + 1)
-      // 判断上传文件格式
-      if (this.fileTemp) {
-        if (fileType == 'xlsx' || fileType == 'xls') {
-          this.importf(this.fileTemp)
+      },
+      total: function() {
+        if (this.deptBudgetList.tranCarInfoList != null) {
+          var maxStorage = 0
+          for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
+            maxStorage += Number(
+              this.deptBudgetList.tranCarInfoList[i].loadNetWeight
+            )
+          }
+          return maxStorage
         } else {
-          this.$message({
-            type: 'warning',
-            message: '附件格式错误，请删除后重新上传！'
-          })
+          return 0
         }
-      } else {
-        this.$message({
-          type: 'warning',
-          message: '请上传附件！'
-        })
       }
     },
-    importf(obj) {
-      this.dialogVisible = true
-      let _this = this
-      let inputDOM = this.$refs.inputer // 通过DOM取文件数据
-      this.file = event.currentTarget.files[0]
-      var rABS = false //是否将文件读取为二进制字符串
-      var f = this.file
-      var reader = new FileReader()
-      //if (!FileReader.prototype.readAsBinaryString) {
-      FileReader.prototype.readAsBinaryString = function(f) {
-        var binary = ''
-        var rABS = false //是否将文件读取为二进制字符串
-        var pt = this
-        var wb //读取完成的数据
-        var outdata
-        var reader = new FileReader()
-        reader.onload = function(e) {
-          var bytes = new Uint8Array(reader.result)
-          var length = bytes.byteLength
-          for (var i = 0; i < length; i++) {
-            binary += String.fromCharCode(bytes[i])
-          }
-          var XLSX = require('xlsx')
-          if (rABS) {
-            wb = XLSX.read(btoa(fixdata(binary)), {
-              //手动转化
-              type: 'base64'
-            })
+    methods: {
+      handleChange(file, fileList) {
+        this.fileTemp = file.raw
+        let fileName = file.raw.name
+        let fileType = fileName.substring(fileName.lastIndexOf('.') + 1)
+        // 判断上传文件格式
+        if (this.fileTemp) {
+          if (fileType == 'xlsx' || fileType == 'xls') {
+            this.importf(this.fileTemp)
           } else {
-            wb = XLSX.read(binary, {
-              type: 'binary'
+            this.$message({
+              type: 'warning',
+              message: '附件格式错误，请删除后重新上传！'
             })
           }
-          // outdata就是你想要的东西 excel导入的数据
-          outdata = XLSX.utils.sheet_to_json(wb.Sheets[wb.SheetNames[0]])
-          // excel 数据再处理
-          let arr = []
-          outdata.map(v => {
-            // let jsonString = JSON.stringify(v).replace(/\*/g, '').replace(/\s/ig,'');
-            let jsonString = JSON.stringify(v)
-              .replace(/\//g, '')
-              .replace(/\s/gi, '')
-            console.log(jsonString)
-            v = JSON.parse(jsonString)
-            let obj = {}
-            //xxx代表列名
-            obj.boxNo = v.车厢号
-            obj.loadNetWeight = v.装车净重
-            obj.loadingDate = toString(v.装车日期)
-            obj.status = v.状态
-            obj.unloadPoundImg = v.磅单
-            console.log(obj)
-            _this.freightspace.push(obj)
+        } else {
+          this.$message({
+            type: 'warning',
+            message: '请上传附件！'
           })
-          // _this.freightspace.concat(arr)
-          console.log(arr, _this.freightspace)
         }
-        reader.readAsArrayBuffer(f)
-      }
-      if (rABS) {
-        reader.readAsArrayBuffer(f)
-      } else {
-        reader.readAsBinaryString(f)
-      }
-      console.log(reader)
-    },
-    marker: function(item) {
-      this.deptBudgetList.warehousePositioning =
-        item.lnglat.lat + ',' + item.lnglat.lng
-    },
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    handleClose() {
-      this.dialogViewSpareMoney = false
-    },
-    add() {
-      this.freightspace.push({
-        driver: '',
-        driverPhone: '',
-        carNo: '',
-        loadNetWeight: ''
-      })
-    },
-    del(index) {
-      if (this.freightspace.length > 1) {
-        this.freightspace.splice(index, 1)
-      }
-    },
-    revert() {
-      this.$router.push({ path: 'tranManagementTransporHairRespond' })
-    },
-    //完货
-    finished() {
-      this.$confirm(`完货操作后，装车信息不可修改，是否确定完货？`, {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          this.$refs.deptBudgetList.validate(valid => {
-            if (valid) {
-              var tranProcessInfo = {}
-              tranProcessInfo.id = this.deptBudgetList.id
-              state(tranProcessInfo)
-                .toPromise()
-                .then(response => {
-                  this.$message.success('完货成功')
-                  this.deptBudgetList = {}
-                  this.freightspace = {}
-                  this.selectedOptions = ''
-                  this.$router.push({
-                    path: 'tranManagementTransporHairRespond'
-                  })
-                })
+      },
+      importf(obj) {
+        this.excelFreightspace = []
+        this.dialogVisible = true
+        let _this = this
+        let inputDOM = this.$refs.inputer // 通过DOM取文件数据
+        this.file = event.currentTarget.files[0]
+        var rABS = false //是否将文件读取为二进制字符串
+        var f = this.file
+        var reader = new FileReader()
+        //if (!FileReader.prototype.readAsBinaryString) {
+        FileReader.prototype.readAsBinaryString = function(f) {
+          var binary = ''
+          var rABS = false //是否将文件读取为二进制字符串
+          var pt = this
+          var wb //读取完成的数据
+          var outdata
+          var reader = new FileReader()
+          reader.onload = function(e) {
+            var bytes = new Uint8Array(reader.result)
+            var length = bytes.byteLength
+            for (var i = 0; i < length; i++) {
+              binary += String.fromCharCode(bytes[i])
+            }
+            var XLSX = require('xlsx')
+            if (rABS) {
+              wb = XLSX.read(btoa(fixdata(binary)), {
+                //手动转化
+                type: 'base64'
+              })
             } else {
-              return false
+              wb = XLSX.read(binary, {
+                type: 'binary'
+              })
             }
-          })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    validateFunc() {
-      this.$refs.deptBudgetList.validate(valid => {
-        if (valid) {
-          // this.deptBudgetList.totalStorage = this.totalStorage
-          this.tranCarInfoList = this.freightspace
-          this.tranCarInfoList.driver = this.deptBudgetList.driver
-          this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
-          this.tranCarInfoList.tranCarNo = this.deptBudgetList.tranCarNo
-          this.tranCarInfoList.carNo = this.deptBudgetList.carNo
-          this.tranCarInfoList[0].sendDateStart = this.deptBudgetList.sendDateStart
-          this.tranCarInfoList.loadNetWeight = this.deptBudgetList.loadNetWeight
-          this.tranCarInfoList.tranType = this.tranType
-          this.tranCarInfoList.loadPoundImg = this.deptBudgetList.loadPoundImg
-          // this.tranCarInfoList.boxNo = this.arr.toString()
-          for (var i = 0; i < this.tranCarInfoList.length; i++) {
-            this.tranCarInfoList[i].id = this.freightspace[i].id
-            if (this.tranCarInfoList[i].temporaryDriverFlag != 0) {
-              this.tranCarInfoList[i].temporaryDriverFlag = 1
-              this.tranCarInfoList[i].tranType = this.tranType
+            // outdata就是你想要的东西 excel导入的数据
+            outdata = XLSX.utils.sheet_to_json(wb.Sheets[wb.SheetNames[0]])
+            // excel 数据再处理
+            let arr = []
+            outdata.map(v => {
+              // let jsonString = JSON.stringify(v).replace(/\*/g, '').replace(/\s/ig,'');
+              let jsonString = JSON.stringify(v)
+                .replace(/\//g, '')
+                .replace(/\s/gi, '')
+              console.log(jsonString)
+              v = JSON.parse(jsonString)
+              let obj = {}
+              //xxx代表列名
+              obj.boxNo = v.车厢号
+              obj.loadNetWeight = v.装车净重
+              obj.loadingDate = v.装车日期
+              obj.status = v.状态
+              obj.loadPoundImg = v.磅单
+              console.log(obj)
+              _this.excelFreightspace.push(obj)
+            })
+            let _ispushData = true
+            console.log(arr, _this.freightspace)
+            for (let i = 0; i < _this.excelFreightspace.length; i++) {
+              _ispushData = true
+              for (let k = 0; k < _this.freightspace.length; k++) {
+                if (_this.excelFreightspace[i].boxNo == _this.freightspace[k].boxNo) {
+                  _this.freightspace[k] = _this.excelFreightspace[i]
+                  if (_this.excelFreightspace[i].loadPoundImg.split(',').length > 0){
+                      _this.freightspace[k].imgCount = _this.excelFreightspace[i].loadPoundImg.split(',').length
+                  }
+                  _ispushData = false
+                }
+              }
+              if (_ispushData) {
+                if (_this.excelFreightspace[i].loadPoundImg.split(',').length > 0) {
+                  _this.excelFreightspace[i].imgCount = _this.excelFreightspace[i].loadPoundImg.split(',').length
+                }
+                _this.freightspace.push(_this.excelFreightspace[i])
+
+                _ispushData = true
+              }
             }
           }
-          var tranProcessInfo = {}
-          tranProcessInfo.id = this.deptBudgetList.id
-          tranProcessInfo.infoId = this.deptBudgetList.infoId
-          tranProcessInfo.processNo = this.deptBudgetList.processNo
-          tranProcessInfo.tranPrice = this.deptBudgetList.tranPrice
-          tranProcessInfo.tranCarInfoList = this.tranCarInfoList
-          // dispatchCat({tranCarInfo:{tranCarInfoList:[this.tranCarInfoList],id:this.deptBudgetList.id}
-          feedback(tranProcessInfo)
-            .toPromise()
-            .then(response => {
-              this.$message.success('提交成功')
-              this.deptBudgetList = {}
-              this.freightspace = {}
-              this.selectedOptions = ''
-              this.$router.push({
-                path: 'tranManagementTransporHairRespond'
-              })
-            })
+          reader.readAsArrayBuffer(f)
+        }
+        if (rABS) {
+          reader.readAsArrayBuffer(f)
         } else {
-          // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-          return false
+          reader.readAsBinaryString(f)
         }
-      })
-    },
-    submit(index) {
-      // for (var i = 0; i < this.freightspace.length; i++) {
-          // if (!this.freightspace[i].driver) {
-          //   this.$message({
-          //     message: '司机姓名不能为空！',
-          //     type: 'warning'
-          //   })
-          //   return
-          // }
-          // if (!this.freightspace[i].driverPhone) {
-          //   this.$message({
-          //     message: '司机电话不能为空！',
-          //     type: 'warning'
-          //   })
-          //   return
-          // }
-          // if (!this.freightspace[i].carNo) {
-          //   this.$message({
-          //     message: '车牌号不能为空！',
-          //     type: 'warning'
-          //   })
-          //   return
-          // }
-          if (!this.freightspace[index].loadNetWeight) {
-            this.$message({
-              message: '装车净重不能为空！',
-              type: 'warning'
-            })
-            return
-          }
-          if (
-            this.freightspace[index].loadNetWeight < 0 ||
-            this.freightspace[index].loadNetWeight > 10000
-          ) {
-            this.$message({
-              message: '装车净重输入错误！',
-              type: 'warning'
-            })
-            return
-          }
-          if (!this.freightspace[index].loadingDate) {
-            this.$message({
-              message: '装车日期不能为空！',
-              type: 'warning'
-            })
-            return
-          }
-        
-      // }
-      if (sessionStorage.getItem('sh-msg')) {
-        this.validateFunc()
-      } else {
-        this.$alert(
-          '<div><strong>提交成功后提醒司机及时签订运输合同，确定提交装车信息？</strong><div style="display:flex;align-items: center;"><input id="noMsg" type="checkbox" onclick="window.noMessege(1)"><span style="margin-left:10px">不在提示</span><div></div>',
-          '',
-          {
-            dangerouslyUseHTMLString: true,
-            distinguishCancelAndClose: true,
-            showCancelButton: true,
+        console.log(reader)
+      },
+      marker: function(item) {
+        this.deptBudgetList.warehousePositioning =
+          item.lnglat.lat + ',' + item.lnglat.lng
+      },
+      // 关闭 dialog时 处理文件url 初始化upload组件
+      handleClose() {
+        this.dialogViewSpareMoney = false
+      },
+      add() {
+        this.freightspace.push({
+          driver: '',
+          driverPhone: '',
+          carNo: '',
+          loadNetWeight: ''
+        })
+      },
+      del(index) {
+        if (this.freightspace.length > 1) {
+          this.freightspace.splice(index, 1)
+        }
+      },
+      revert() {
+        this.$router.push({
+          path: 'tranManagementTransporHairRespond'
+        })
+      },
+      //完货
+      finished() {
+        this.$confirm(`完货操作后，装车信息不可修改，是否确定完货？`, {
             confirmButtonText: '确定',
-            cancelButtonText: '取消'
-          }
-        )
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
           .then(() => {
-            this.validateFunc()
+            this.$refs.deptBudgetList.validate(valid => {
+              if (valid) {
+                var tranProcessInfo = {}
+                tranProcessInfo.id = this.deptBudgetList.id
+                state(tranProcessInfo)
+                  .toPromise()
+                  .then(response => {
+                    this.$message.success('完货成功')
+                    this.deptBudgetList = {}
+                    this.freightspace = {}
+                    this.selectedOptions = ''
+                    this.$router.push({
+                      path: 'tranManagementTransporHairRespond'
+                    })
+                  })
+              } else {
+                return false
+              }
+            })
           })
           .catch(() => {
             return false
           })
-      }
-    },
-    getList() {
-      seeCat({ id: this.deptBudgetList.id })
-        .toPromise()
-        .then(response => {
-          this.deptBudgetList = response
-          //  this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
-          if(response.tranCarInfoList[0].driver){
-            this.deptBudgetList.driver = response.tranCarInfoList[0].driver
-          }
-          this.deptBudgetList.driverPhone =
-            response.tranCarInfoList[0].driverPhone
-          this.$set(this.deptBudgetList,'sendDateStart',response.tranCarInfoList[0].sendDateStart)
-          this.deptBudgetList.receiveDateEnd =
-            response.tranCarInfoList[0].receiveDateEnd
-          this.deptBudgetList.carModel = response.tranCarInfoList[0].carModel
-          this.freightspace = response.tranCarInfoList
-          for (var i = 0; i < this.freightspace.length; i++) {
-            if (!this.freightspace[i].loadNetWeight) {
-              this.freightspace[i].loadNetWeight = 0
-            }
-            if(this.freightspace[i].loadPoundImg){
-               this.freightspace[i].imgCount = this.freightspace[i].loadPoundImg.split(",").length
-            }else{
-               this.freightspace[i].loadPoundImg = ""
-               this.freightspace[i].imgCount = 0
+      },
+      validateFunc() {
+        this.$refs.deptBudgetList.validate(valid => {
+          if (valid) {
+            // this.deptBudgetList.totalStorage = this.totalStorage
+            this.tranCarInfoList = this.freightspace
+            this.tranCarInfoList.driver = this.deptBudgetList.driver
+            this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
+            this.tranCarInfoList.tranCarNo = this.deptBudgetList.tranCarNo
+            this.tranCarInfoList.carNo = this.deptBudgetList.carNo
+            this.tranCarInfoList[0].sendDateStart = this.deptBudgetList.sendDateStart
+            this.tranCarInfoList.loadNetWeight = this.deptBudgetList.loadNetWeight
+            this.tranCarInfoList.tranType = this.tranType
+            this.tranCarInfoList.loadPoundImg = this.deptBudgetList.loadPoundImg
+            // this.tranCarInfoList.boxNo = this.arr.toString()
+            for (var i = 0; i < this.tranCarInfoList.length; i++) {
+              this.tranCarInfoList[i].id = this.freightspace[i].id
+              if (this.tranCarInfoList[i].temporaryDriverFlag != 0) {
+                this.tranCarInfoList[i].temporaryDriverFlag = 1
+                this.tranCarInfoList[i].tranType = this.tranType
+              }
             }
+            var tranProcessInfo = {}
+            tranProcessInfo.id = this.deptBudgetList.id
+            tranProcessInfo.infoId = this.deptBudgetList.infoId
+            tranProcessInfo.processNo = this.deptBudgetList.processNo
+            tranProcessInfo.tranPrice = this.deptBudgetList.tranPrice
+            tranProcessInfo.tranCarInfoList = this.tranCarInfoList
+            // dispatchCat({tranCarInfo:{tranCarInfoList:[this.tranCarInfoList],id:this.deptBudgetList.id}
+            feedback(tranProcessInfo)
+              .toPromise()
+              .then(response => {
+                this.$message.success('提交成功')
+                this.deptBudgetList = {}
+                this.freightspace = {}
+                this.selectedOptions = ''
+                this.$router.push({
+                  path: 'tranManagementTransporHairRespond'
+                })
+              })
+          } else {
+            // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+            return false
           }
         })
-    },
-    uploadSuccessHandle1(e, index) {
-      this.index = index
-      let that = this;
-      setTimeout(function(){ 
-      that.freightspace[that.index].imgCount++
-      console.log(that.freightspace[that.index].imgCount)
-      that.freightspace[that.index].loadPoundImg += e.url+","
-      console.log( that.freightspace[that.index].loadPoundImg)
-      console.log( that.freightspace,"成功后")},1000)
+      },
+      submit(index) {
+        // for (var i = 0; i < this.freightspace.length; i++) {
+        // if (!this.freightspace[i].driver) {
+        //   this.$message({
+        //     message: '司机姓名不能为空！',
+        //     type: 'warning'
+        //   })
+        //   return
+        // }
+        // if (!this.freightspace[i].driverPhone) {
+        //   this.$message({
+        //     message: '司机电话不能为空！',
+        //     type: 'warning'
+        //   })
+        //   return
+        // }
+        // if (!this.freightspace[i].carNo) {
+        //   this.$message({
+        //     message: '车牌号不能为空！',
+        //     type: 'warning'
+        //   })
+        //   return
+        // }
+        if (!this.freightspace[index].loadNetWeight) {
+          this.$message({
+            message: '装车净重不能为空！',
+            type: 'warning'
+          })
+          return
+        }
+        if (
+          this.freightspace[index].loadNetWeight < 0 ||
+          this.freightspace[index].loadNetWeight > 10000
+        ) {
+          this.$message({
+            message: '装车净重输入错误！',
+            type: 'warning'
+          })
+          return
+        }
+        if (!this.freightspace[index].loadingDate) {
+          this.$message({
+            message: '装车日期不能为空！',
+            type: 'warning'
+          })
+          return
+        }
+
+        // }
+        if (sessionStorage.getItem('sh-msg')) {
+          this.validateFunc()
+        } else {
+          this.$alert(
+              '<div><strong>提交成功后提醒司机及时签订运输合同，确定提交装车信息？</strong><div style="display:flex;align-items: center;"><input id="noMsg" type="checkbox" onclick="window.noMessege(1)"><span style="margin-left:10px">不在提示</span><div></div>',
+              '', {
+                dangerouslyUseHTMLString: true,
+                distinguishCancelAndClose: true,
+                showCancelButton: true,
+                confirmButtonText: '确定',
+                cancelButtonText: '取消'
+              }
+            )
+            .then(() => {
+              this.validateFunc()
+            })
+            .catch(() => {
+              return false
+            })
+        }
+      },
+      getList() {
+        seeCat({
+            id: this.deptBudgetList.id
+          })
+          .toPromise()
+          .then(response => {
+            this.deptBudgetList = response
+            //  this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
+            if (response.tranCarInfoList[0].driver) {
+              this.deptBudgetList.driver = response.tranCarInfoList[0].driver
+            }
+            this.deptBudgetList.driverPhone =
+              response.tranCarInfoList[0].driverPhone
+            this.$set(this.deptBudgetList, 'sendDateStart', response.tranCarInfoList[0].sendDateStart)
+            this.deptBudgetList.receiveDateEnd =
+              response.tranCarInfoList[0].receiveDateEnd
+            this.deptBudgetList.carModel = response.tranCarInfoList[0].carModel
+            this.freightspace = response.tranCarInfoList
+            for (var i = 0; i < this.freightspace.length; i++) {
+              if (!this.freightspace[i].loadNetWeight) {
+                this.freightspace[i].loadNetWeight = 0
+              }
+              if (this.freightspace[i].loadPoundImg) {
+                this.freightspace[i].imgCount = this.freightspace[i].loadPoundImg.split(",").length
+              } else {
+                this.freightspace[i].loadPoundImg = ""
+                this.freightspace[i].imgCount = 0
+              }
+            }
+          })
+      },
+      uploadSuccessHandle1(e, index) {
+        this.index = index
+        let that = this;
+        that.$forceUpdate();
+        that.freightspace[that.index].imgCount++
+        console.log(that.freightspace[that.index].imgCount)
+        that.freightspace[that.index].loadPoundImg += e.url + ","
+        console.log(that.freightspace[that.index].loadPoundImg)
 
+      }
     }
   }
-}
 </script>
 
 <style lang="scss" scoped>
-/deep/.totalStorage .el-input__inner {
-  color: #afb5cb;
-  background: #f5f7fa;
-}
-.small-title {
-  position: relative;
-  padding: 10px;
-  font-weight: 600;
-}
-.small-title::before {
-  position: absolute;
-  content: '';
-  display: block;
-  background: #5473e8;
-  width: 4px;
-  height: 14px;
-  left: 0px;
-  top: 13px;
-}
-.position {
-  position: relative;
-}
-
-.del {
-  position: absolute;
-  right: -38px;
-  top: 14px;
-  cursor: pointer;
-  right: 0;
-  display: inline-block;
-  font-size: 26px;
-  width: 26px;
-  height: 10px;
-  line-height: 0px;
-}
-
-.amap-page-container {
-  width: 300px;
-  height: 300px;
-}
-.el-form {
-  padding: 0 10%;
-}
-/deep/.ws-info-table .el-form-item {
-  border-right: 1px solid transparent;
-  border-bottom: 1px solid transparent;
-}
-.readonly {
-  position: relative;
-}
-.readonly:after {
-  content: '*';
-  color: #ff2727;
-  position: absolute;
-  right: 8px;
-  z-index: 10;
-  top: 21%;
-  font-size: 20px;
-}
-.title {
-  position: relative;
-}
-.title::before {
-  content: '';
-  display: inline-block;
-  width: 5px;
-  height: 30px;
-  background: #5473e8;
-  position: absolute;
-  left: 0;
-}
-.el-button--primary {
-  background-color: #5878e8;
-  border-color: #5878e8;
-}
-.el-col {
-  background: #f6f7fc;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  padding: 0 25px;
-  border-left: 1px solid transparent;
-  background: #fff;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  width: 100px;
-  text-align: center;
-  background: #fff;
-  // border: 1px solid #cdd2dc;
-}
-.button-container {
-  display: flex;
-  flex-wrap: nowrap;
-  justify-content: space-between;
-  align-items: center;
-  background-color: #fff;
-  width: 100%;
-  height: 50px;
-  padding: 0 10px;
-  & > div {
-    margin-left: 10px;
+  /deep/.totalStorage .el-input__inner {
+    color: #afb5cb;
+    background: #f5f7fa;
+  }
+
+  .small-title {
+    position: relative;
+    padding: 10px;
+    font-weight: 600;
+  }
+
+  .small-title::before {
+    position: absolute;
+    content: '';
+    display: block;
+    background: #5473e8;
+    width: 4px;
+    height: 14px;
+    left: 0px;
+    top: 13px;
+  }
+
+  .position {
+    position: relative;
+  }
+
+  .del {
+    position: absolute;
+    right: -38px;
+    top: 14px;
+    cursor: pointer;
+    right: 0;
+    display: inline-block;
+    font-size: 26px;
+    width: 26px;
+    height: 10px;
+    line-height: 0px;
+  }
+
+  .amap-page-container {
+    width: 300px;
+    height: 300px;
+  }
+
+  .el-form {
+    padding: 0 10%;
+  }
+
+  /deep/.ws-info-table .el-form-item {
+    border-right: 1px solid transparent;
+    border-bottom: 1px solid transparent;
+  }
+
+  .readonly {
+    position: relative;
+  }
+
+  .readonly:after {
+    content: '*';
+    color: #ff2727;
+    position: absolute;
+    right: 8px;
+    z-index: 10;
+    top: 21%;
+    font-size: 20px;
+  }
+
+  .title {
+    position: relative;
+  }
+
+  .title::before {
+    content: '';
+    display: inline-block;
+    width: 5px;
+    height: 30px;
+    background: #5473e8;
+    position: absolute;
+    left: 0;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+  }
+
+  .el-col {
+    background: #f6f7fc;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__content {
+    padding: 0 25px;
+    border-left: 1px solid transparent;
+    background: #fff;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__label {
+    width: 100px;
+    text-align: center;
+    background: #fff;
+    // border: 1px solid #cdd2dc;
+  }
+
+  .button-container {
     display: flex;
     flex-wrap: nowrap;
-    flex-direction: row;
-    & > span {
-      line-height: 50px;
-    }
-  }
+    justify-content: space-between;
+    align-items: center;
+    background-color: #fff;
+    width: 100%;
+    height: 50px;
+    padding: 0 10px;
 
-  /deep/.auditFlow-box {
-    position: unset;
-    margin-left: 10px;
-    &/deep/.auditFlow-icon {
-      width: auto;
-      padding-right: 30px;
+    &>div {
+      margin-left: 10px;
+      display: flex;
+      flex-wrap: nowrap;
+      flex-direction: row;
+
+      &>span {
+        line-height: 50px;
+      }
     }
-    &/deep/.auditFlow-main {
-      position: absolute;
+
+    /deep/.auditFlow-box {
+      position: unset;
+      margin-left: 10px;
+
+      &/deep/.auditFlow-icon {
+        width: auto;
+        padding-right: 30px;
+      }
+
+      &/deep/.auditFlow-main {
+        position: absolute;
+      }
     }
   }
-}
-.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;
+
+  .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;
-}
-.bg-left {
-  padding-left: 30px;
-}
-.bg-right {
-  padding-right: 10px;
-  text-align: right;
-}
-.bg-bottom {
-  margin: 15px 0px;
-}
-.wenzi {
-  width: 900px;
-  margin: 0 auto;
-}
-.wenzi h3 {
-  display: inline-block;
-  left: 10px;
-}
-.wenzi p {
-  display: inline-block;
-}
-.center {
-  width: 900px;
-  margin: -70px auto;
-  margin-right: 92px;
-}
-.wanhuo {
-  width: 900px;
-  margin: 0 auto;
-}
-.el-form-item {
-  width: 50%;
-}
-.el-form-item__label {
-  text-align: center;
-}
-.ce {
-  width: 900px;
-  margin: 0 auto;
-}
-/*.crt-main .textarea /deep/ .el-form-item__label {*/
-/*  height: 82px;*/
-/*}*/
-// 控制select为只读的时候显示样式
-
-.hide-sel {
-  .el-input__inner {
-    border: 0px;
+
+  .collapse-bottom {
+    margin-bottom: 20px;
   }
-  .el-icon-arrow-up {
-    display: none;
+
+  .input-main .textarea .el-textarea__inner {
+    width: 100%;
+    z-index: 1;
   }
-  .el-textarea__inner {
-    background-color: #fff !important;
-    border: 0;
+
+  .bg-left {
+    padding-left: 30px;
+  }
+
+  .bg-right {
+    padding-right: 10px;
+    text-align: right;
+  }
+
+  .bg-bottom {
+    margin: 15px 0px;
+  }
+
+  .wenzi {
+    width: 900px;
+    margin: 0 auto;
+  }
+
+  .wenzi h3 {
+    display: inline-block;
+    left: 10px;
+  }
+
+  .wenzi p {
+    display: inline-block;
   }
-  .el-date-editor {
-    i {
+
+  .center {
+    width: 900px;
+    margin: -70px auto;
+    margin-right: 92px;
+  }
+
+  .wanhuo {
+    width: 900px;
+    margin: 0 auto;
+  }
+
+  .el-form-item {
+    width: 50%;
+  }
+
+  .el-form-item__label {
+    text-align: center;
+  }
+
+  .ce {
+    width: 900px;
+    margin: 0 auto;
+  }
+
+  /*.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;
+    //   }
+    // }
   }
-  // .is-disabled {
-  //   .el-input__inner:hover {
-  //     background-color: #fff !important;
-  //     border: 0;
+
+  // 控制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;
   //   }
-  //   color: #606266;
   //   .el-input__inner {
-  //     background-color: #fff !important;
-  //     border: 0;
-  //     color: #606266;
-  //   }
-  //   .el-textarea__inner {
-  //     background-color: #fff !important;
-  //     border: 0;
-  //     color: #606266;
+  //     background-color: #fff;
+  //     border-color: #fff !important;
+  //     color: #000 !important;
+  //     font-size: 14px;
+  //     cursor: text;
+  //     padding: 0 !important;
   //   }
   // }
-}
+  .winseaview-view {
+    padding: 0 0 20px;
+  }
 
-// 控制select为只读的时候显示样式
-/deep/.ws-class-table-col {
-  height: auto;
-  padding: 0px 2px;
-  /deep/.el-input__inner {
-    padding: 0px 2px;
+  .container {
+    overflow: scroll;
+    height: 93vh;
+  }
+
+  .ws-info-table .el-form-item {
+    width: 33.3333%;
+  }
+
+  .readonly:after {
+    display: none;
+  }
+
+  .el-textarea__inner {
+    display: none;
+  }
+
+  .el-form {
+    margin-top: 50px;
+  }
+
+  .readonly {
+    width: 16%;
+  }
+
+  //去边框
+  /deep/.el-form-item {
+    border-right: 0px;
+    border-bottom: 0px;
+  }
+
+  /deep/.ws-info-table {
+    border-left: 0px;
+    border-top: 0px;
+  }
+
+  .ws-info-table .el-form-item .el-form-item__content {
+    border: none;
+  }
+
+  /deep/.ws-info-table .el-form-item {
+    border: none;
+    height: 50px;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__content {
+    background: #f5f7fa;
+    border-radius: 4px;
+    border: 1px solid #d8dce6;
+    font-family: PingFangSC-Regular, PingFang SC;
+    margin-bottom: 5px;
+    background-color: #fff;
+    font-size: 14px;
+    font-weight: 400;
+    color: #8890b1;
+    line-height: 16px;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__label {
+    background-color: #fff;
+    font-size: 13px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #8890b1;
+    line-height: 16px;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__content {
+    background: #f5f7fa;
+    border-radius: 4px;
+    border: 1px solid #d8dce6;
+  }
+
+  /deep/.flex .ws-info-table .el-form-item .el-form-item__content {
+    border: 0px;
+  }
+
+  .catNos {
+    width: 5%;
+    height: 30px;
+    margin-top: 10px;
+    margin-left: 20px;
+    margin-right: -5px;
+    font-size: 14px;
+  }
+
+  .catNosCor {
+    color: #5473e8;
+  }
+
+  .add {
+    width: 130px;
+    height: 34px;
+    background: #f6f7fb;
+    border-radius: 17px;
+    color: #5473e8;
+    font-size: 14px;
+    border: none;
+  }
+
+  .add img {
+    display: inline-block;
+    margin-top: 3px;
+    margin-left: -30px;
+  }
+
+  .add .spans {
+    display: table-caption;
+    width: 56px;
+    height: 20px;
+    line-height: 18px;
+  }
+
+  .signStatus {
+    height: 25px;
+    border-radius: 3px;
+    border: 1px solid #5473e8;
+    padding: 0 3px;
+    color: #ffffff;
+    background: #c4cada;
+    line-height: 24px;
+    margin-left: 18px;
+  }
+
+  .signStatus1 {
+    height: 25px;
+    background: #e6ebff;
+    border-radius: 3px;
+    border: 1px solid #5473e8;
+    padding: 0 3px;
+    margin-left: 18px;
+    color: #5473e8;
+    line-height: 24px;
+  }
+
+  .line {
+    height: 26px;
+    margin-top: 6px;
+    left: 2px;
+  }
+
+  //装车详情
+  /deep/.liaison .ws-info-table .el-form-item {
+    width: 20%;
+  }
+
+  /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
+    width: 50%;
+    background: #f6f7fc;
+  }
+
+  /deep/.liaison .flex {
+    display: contents;
+  }
+
+  /deep/.liaison .ws-info-table {
+    background: #f6f7fc;
+    border-radius: 4px;
+    border: 1px solid #d8dce6;
+    margin-top: 20px;
+  }
+
+  /deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
+    padding: 0px;
+  }
+
+  //联络员及车次
+  /deep/.lianluoyuan .ws-info-table .el-form-item {
+    width: 20%;
+  }
+
+  /deep/.lianluoyuan .ws-info-table .el-form-item .el-form-item__label {
+    width: 43%;
+    background: #f6f7fc;
+    padding-right: 0px;
+    margin-top: 5px;
+  }
+
+  /deep/.lianluoyuan .flex {
+    display: contents;
+  }
+
+  /deep/.lianluoyuan .ws-info-table {
+    background: #f6f7fc;
+    border-radius: 4px;
+    border: 1px solid #d8dce6;
+    margin-top: 20px;
+  }
+
+  /deep/.lianluoyuan .ws-info-table .el-form-item .el-form-item__content {
+    padding: 0px;
+    margin-top: 5px;
+  }
+
+  //装车状态
+  .noservicein,
+  .servicein {
+    display: inline-block;
+    border-radius: 4px;
+    border: 1px solid #d8dce6;
+    padding: 2px;
+    font-size: 12px;
+    background: #e5f1f7;
+    color: #50cad4;
+    height: 23px;
+    margin-top: 11px;
+    margin-left: 53px;
+  }
+
+  .noservicein {
+    background: #c4cada;
+    color: #ffffff;
+    display: inline-block;
+    border-radius: 4px;
+    border: 1px solid #d8dce6;
+    padding: 2px;
+    font-size: 12px;
+    background: #e5f1f7;
+    color: #50cad4;
+    height: 23px;
+    margin-top: 11px;
+    margin-left: 53px;
+  }
+
+  .servicedin {
+    display: inline-block;
+    border-radius: 4px;
+    border: 1px solid #d8dce6;
+    padding: 2px;
+    font-size: 12px;
+    background: #e5f1f7;
+    color: #50cad4;
+    height: 23px;
+    margin-top: 11px;
+    margin-left: 53px;
+  }
+
+  /deep/.el-input--suffix .el-input__inner {
+    padding-right: 0px !important;
+  }
+
+  //送达/未送达
+  .noservice,
+  .service {
+    display: inline-block;
+    border-radius: 4px;
+    border: 1px solid #d8dce6;
+    padding: 2px;
+    font-size: 12px;
+  }
+
+  .noservice {
+    background: #c4cada;
+    color: #ffffff;
+  }
+
+  .service {
+    background: #e5f1f7;
+    color: #50cad4;
   }
-}
-// /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;
-//   }
-// }
-.winseaview-view {
-  padding: 0 0 20px;
-}
-.container {
-  overflow: scroll;
-  height: 93vh;
-}
-.ws-info-table .el-form-item {
-  width: 33.3333%;
-}
-.readonly:after {
-  display: none;
-}
-.el-textarea__inner {
-  display: none;
-}
-.el-form {
-  margin-top: 50px;
-}
-.readonly {
-  width: 16%;
-}
-
-//去边框
-/deep/.el-form-item {
-  border-right: 0px;
-  border-bottom: 0px;
-}
-/deep/.ws-info-table {
-  border-left: 0px;
-  border-top: 0px;
-}
-.ws-info-table .el-form-item .el-form-item__content {
-  border: none;
-}
-/deep/.ws-info-table .el-form-item {
-  border: none;
-  height: 50px;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  background: #f5f7fa;
-  border-radius: 4px;
-  border: 1px solid #d8dce6;
-  font-family: PingFangSC-Regular, PingFang SC;
-  margin-bottom: 5px;
-  background-color: #fff;
-  font-size: 14px;
-  font-weight: 400;
-  color: #8890b1;
-  line-height: 16px;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  background-color: #fff;
-  font-size: 13px;
-  font-family: PingFangSC-Regular, PingFang SC;
-  font-weight: 400;
-  color: #8890b1;
-  line-height: 16px;
-}
-
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  background: #f5f7fa;
-  border-radius: 4px;
-  border: 1px solid #d8dce6;
-}
-/deep/.flex .ws-info-table .el-form-item .el-form-item__content {
-  border: 0px;
-}
-.catNos {
-  width: 5%;
-  height: 30px;
-  margin-top: 10px;
-  margin-left: 20px;
-  margin-right: -5px;
-  font-size: 14px;
-}
-.catNosCor {
-  color: #5473e8;
-}
-.add {
-  width: 130px;
-  height: 34px;
-  background: #f6f7fb;
-  border-radius: 17px;
-  color: #5473e8;
-  font-size: 14px;
-  border: none;
-}
-.add img {
-  display: inline-block;
-  margin-top: 3px;
-  margin-left: -30px;
-}
-.add .spans {
-  display: table-caption;
-  width: 56px;
-  height: 20px;
-  line-height: 18px;
-}
-.signStatus {
-  height: 25px;
-  border-radius: 3px;
-  border: 1px solid #5473e8;
-  padding: 0 3px;
-  color: #ffffff;
-  background: #c4cada;
-  line-height: 24px;
-  margin-left: 18px;
-}
-.signStatus1 {
-  height: 25px;
-  background: #e6ebff;
-  border-radius: 3px;
-  border: 1px solid #5473e8;
-  padding: 0 3px;
-  margin-left: 18px;
-  color: #5473e8;
-  line-height: 24px;
-}
-.line {
-  height: 26px;
-  margin-top: 6px;
-  left: 2px;
-}
-//装车详情
-/deep/.liaison .ws-info-table .el-form-item {
-  width: 20%;
-}
-/deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
-  width: 50%;
-  background: #f6f7fc;
-}
-/deep/.liaison .flex {
-  display: contents;
-}
-/deep/.liaison .ws-info-table {
-  background: #f6f7fc;
-  border-radius: 4px;
-  border: 1px solid #d8dce6;
-  margin-top: 20px;
-}
-/deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
-  padding: 0px;
-}
-
-//联络员及车次
-/deep/.lianluoyuan .ws-info-table .el-form-item {
-  width: 20%;
-}
-/deep/.lianluoyuan .ws-info-table .el-form-item .el-form-item__label {
-  width: 43%;
-  background: #f6f7fc;
-  padding-right: 0px;
-  margin-top: 5px;
-}
-/deep/.lianluoyuan .flex {
-  display: contents;
-}
-/deep/.lianluoyuan .ws-info-table {
-  background: #f6f7fc;
-  border-radius: 4px;
-  border: 1px solid #d8dce6;
-  margin-top: 20px;
-}
-/deep/.lianluoyuan .ws-info-table .el-form-item .el-form-item__content {
-  padding: 0px;
-  margin-top: 5px;
-}
-//装车状态
-.noservicein,
-.servicein {
-  display: inline-block;
-  border-radius: 4px;
-  border: 1px solid #d8dce6;
-  padding: 2px;
-  font-size: 12px;
-  background: #e5f1f7;
-  color: #50cad4;
-  height: 23px;
-  margin-top: 11px;
-  margin-left: 53px;
-}
-.noservicein {
-  background: #c4cada;
-  color: #ffffff;
-  display: inline-block;
-  border-radius: 4px;
-  border: 1px solid #d8dce6;
-  padding: 2px;
-  font-size: 12px;
-  background: #e5f1f7;
-  color: #50cad4;
-  height: 23px;
-  margin-top: 11px;
-  margin-left: 53px;
-}
-.servicedin {
-  display: inline-block;
-  border-radius: 4px;
-  border: 1px solid #d8dce6;
-  padding: 2px;
-  font-size: 12px;
-  background: #e5f1f7;
-  color: #50cad4;
-  height: 23px;
-  margin-top: 11px;
-  margin-left: 53px;
-}
-/deep/.el-input--suffix .el-input__inner {
-  padding-right: 0px !important;
-}
-//送达/未送达
-.noservice,
-.service {
-  display: inline-block;
-  border-radius: 4px;
-  border: 1px solid #d8dce6;
-  padding: 2px;
-  font-size: 12px;
-}
-.noservice {
-  background: #c4cada;
-  color: #ffffff;
-}
-.service {
-  background: #e5f1f7;
-  color: #50cad4;
-}
-</style>
+</style>

src/views/tranManagement/tranManagementReceivingFeedback.vue

@@ -92,7 +92,7 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column class="table_td" prop="processNo" label="运输任务编号">
+        <el-table-column class="table_td" prop="processNo" label="运输任务编号" width="140">
         </el-table-column>
         <el-table-column prop="tranType" label="运输方式"> </el-table-column>
         <el-table-column class="table_td" prop="goodsName" label="货名">
@@ -170,7 +170,7 @@
         </el-table-column>
         <el-table-column class="table_td" label="接单时间" prop="createDate" width="90">
         </el-table-column>
-        <el-table-column prop="seller" label="操作" width="200">
+        <el-table-column prop="seller" label="操作" width="160">
           <template slot-scope="scope">
             <template v-if="scope.row.receivingStatus != '已完货'">
               <div class="record" @click="trainSee(scope.row)">查看</div>

src/views/tranManagement/tranManagementShippingFeedback.vue

@@ -7,13 +7,8 @@
       </el-col>
       <el-col :span="12" class="bg-right">
         <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">
-          <img
-            width="6"
-            height="10"
-            style="vertical-align: bottom; margin-right: 3px"
-            src="../../../public/img/lujing.png"
-            alt
-          />返回
+          <img width="6" height="10" style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png" alt />返回
         </el-button>
       </el-col>
     </el-row>
@@ -32,19 +27,10 @@
           }}{{ deptBudgetList.sendArea }}
         </ws-form-item>
         <!--发货人-->
-        <ws-form-item
-          label="发货人"
-          span="1"
-          prop="sender"
-          class="readonly"
-        >{{ deptBudgetList.sender }}</ws-form-item>
+        <ws-form-item label="发货人" span="1" prop="sender" class="readonly">{{ deptBudgetList.sender }}</ws-form-item>
         <!--发货人电话-->
-        <ws-form-item
-          label="发货人电话"
-          span="1"
-          prop="senderPhone"
-          class="readonly"
-        >{{ deptBudgetList.senderPhone }}</ws-form-item>
+        <ws-form-item label="发货人电话" span="1" prop="senderPhone" class="readonly">{{ deptBudgetList.senderPhone }}
+        </ws-form-item>
         <!--收货地址-->
         <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
           {{ deptBudgetList.receivePrivate }}{{ deptBudgetList.receiveCity
@@ -55,17 +41,10 @@
         <!--收货人电话-->
         <ws-form-item label="收货人电话" span="1" prop="receiverPhone">{{ deptBudgetList.receiverPhone }}</ws-form-item>
         <!--发货日期-->
-        <ws-form-item
-          label="发货日期"
-          span="1"
-          prop="deliveryDateStart"
-        >{{ deptBudgetList.deliveryDateStart }}</ws-form-item>
+        <ws-form-item label="发货日期" span="1" prop="deliveryDateStart">{{ deptBudgetList.deliveryDateStart }}
+        </ws-form-item>
         <!--最晚到货日期-->
-        <ws-form-item
-          label="最晚到货日期"
-          span="1"
-          prop="deliveryDateEnd"
-        >{{ deptBudgetList.deliveryDateEnd }}</ws-form-item>
+        <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">{{ deptBudgetList.deliveryDateEnd }}</ws-form-item>
         <!--合同编号-->
         <ws-form-item label="合同编号" span="1" prop="contractNo">{{ deptBudgetList.contractNo }}</ws-form-item>
         <!-- 运输方式 -->
@@ -79,19 +58,11 @@
         <ws-form-item label="电话" span="1" prop="driverPhone">{{ deptBudgetList.driverPhone }}</ws-form-item>
         <!--发船日期-->
         <ws-form-item label="发船日期" span="1" prop="sendDateStart">
-          <ws-date-picker
-            v-model="deptBudgetList.sendDateStart"
-            type="date"
-            placeholder="请选择发船日期"
-            value-format="yyyy-MM-dd"
-          />
+          <ws-date-picker v-model="deptBudgetList.sendDateStart" type="date" placeholder="请选择发船日期"
+            value-format="yyyy-MM-dd" />
         </ws-form-item>
         <!-- 预计到港日期 -->
-        <ws-form-item
-          label="预计到港日期"
-          span="1"
-          prop="receiveDateEnd"
-        >{{ deptBudgetList.receiveDateEnd }}</ws-form-item>
+        <ws-form-item label="预计到港日期" span="1" prop="receiveDateEnd">{{ deptBudgetList.receiveDateEnd }}</ws-form-item>
         <!-- 船名 -->
         <ws-form-item label="船名" span="1" prop="shipName">{{ deptBudgetList.shipName }}</ws-form-item>
         <!-- 航次 -->
@@ -99,35 +70,26 @@
         <!-- 类型 -->
         <ws-form-item label="类型" span="1" prop="shipType">{{ deptBudgetList.shipType }}</ws-form-item>
         <!-- 数量 -->
-        <ws-form-item
-          label="数量"
-          span="1"
-          prop="boxNumber"
-          v-if="deptBudgetList.shipType == '集装箱'"
-        >{{ deptBudgetList.boxNumber }}</ws-form-item>
+        <ws-form-item label="数量" span="1" prop="boxNumber" v-if="deptBudgetList.shipType == '集装箱'">
+          {{ deptBudgetList.boxNumber }}</ws-form-item>
       </ws-info-table>
       <div class="small-title" style="font-size: 16px; width: 50%; float: left">装船详情</div>
       <!-- 导入 -->
-      <div style="font-size: 16px; width: 50%; float: left; text-align: right">
-        <el-upload
-          style="margin-left: 8px;"
-          class="upload-demo inline-block margin-right-10"
-          action
-          :on-change="handleChange"
-          :show-file-list="false"
+      <div style="font-size: 16px; width: 50%; float: left; text-align: right;display:flex;justify-content:end;">
+        <el-link
+          href="https://taohaoliang.oss-cn-beijing.aliyuncs.com/%E6%B1%BD%E8%BF%90%E8%A3%85%E8%BD%A6%E5%8F%8D%E9%A6%88%E6%A8%A1%E6%9D%BF.xlsx"
+          style="margin-left: 8px;">
+          <el-button type="primary">模板下载</el-button>
+        </el-link>
+        <el-upload style="margin-left: 8px;" class="upload-demo inline-block margin-right-10" action
+          :on-change="handleChange" :show-file-list="false"
           accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-          :auto-upload="false"
-        >
+          :auto-upload="false">
           <el-button type="primary">导入</el-button>
         </el-upload>
       </div>
       <div class="liaison" v-if="this.deptBudgetList.tranCarInfoList.length>0">
-        <div
-          style="width: 100%"
-          class="flex position"
-          v-for="(item, index) in this.freightspace"
-          :key="index"
-        >
+        <div style="width: 100%" class="flex position" v-for="(item, index) in freightspace" :key="index">
           <ws-info-table>
             <div class="catNos" v-if="item.shipType == '集装箱'">
               集装箱-{{ index + 1 }}
@@ -151,83 +113,38 @@
             </div>
             <!--箱号-->
             <el-form-item label="箱号" prop="caseNo" v-if="item.shipType == '集装箱'">
-              <el-input
-                v-if="item.status == '已装车' || item.status == '已送达'"
-                :disabled="readonly"
-                v-model="item.caseNo"
-                placeholder="请输入箱号"
-              ></el-input>
+              <el-input v-if="item.status == '已装车' || item.status == '已送达'" :disabled="readonly" v-model="item.caseNo"
+                placeholder="请输入箱号"></el-input>
               <el-input v-else v-model="item.caseNo" placeholder="请输入箱号"></el-input>
             </el-form-item>
             <!--封号-->
             <el-form-item label="封号" prop="titleNo" v-if="item.shipType == '集装箱'">
-              <el-input
-                v-if="item.status == '已装车' || item.status == '已送达'"
-                :disabled="readonly"
-                v-model="item.titleNo"
-                placeholder="请输入封号"
-              ></el-input>
+              <el-input v-if="item.status == '已装车' || item.status == '已送达'" :disabled="readonly" v-model="item.titleNo"
+                placeholder="请输入封号"></el-input>
               <el-input v-else v-model="item.titleNo" placeholder="请输入封号"></el-input>
             </el-form-item>
             <!-- 仓位号 -->
-            <ws-form-item
-              span="1"
-              prop="binNumber"
-              v-if="item.shipType == '散船'"
-            >{{ item.binNumber }}</ws-form-item>
+            <ws-form-item span="1" prop="binNumber" v-if="item.shipType == '散船'">{{ item.binNumber }}</ws-form-item>
             <!-- 计划重量 -->
-            <ws-form-item
-              label="计划重量(吨)"
-              span="1"
-              prop="positionWeight"
-              v-if="item.shipType == '散船'"
-            >{{ item.positionWeight }}</ws-form-item>
+            <ws-form-item label="计划重量(吨)" span="1" prop="positionWeight" v-if="item.shipType == '散船'">
+              {{ item.positionWeight }}</ws-form-item>
             <!--装船净重-->
             <ws-form-item label="装船净重：" span="1" prop="loadNetWeight">
-              <ws-input
-                v-if="item.status == '已装车' || item.status == '已送达'"
-                :disabled="readonly"
-                v-model="item.loadNetWeight"
-                placeholder="请输入装船净重"
-                maxlength="20"
-                size="small"
-              />
-              <ws-input
-                v-else
-                v-model="item.loadNetWeight"
-                placeholder="请输入装船净重"
-                maxlength="20"
-                size="small"
-              />
+              <ws-input v-if="item.status == '已装车' || item.status == '已送达'" :disabled="readonly"
+                v-model="item.loadNetWeight" placeholder="请输入装船净重" maxlength="20" size="small" />
+              <ws-input v-else v-model="item.loadNetWeight" placeholder="请输入装船净重" maxlength="20" size="small" />
             </ws-form-item>
             <!--装船日期-->
             <el-form-item label="装船日期:" span="1" prop="loadingDate" label-width="100px">
-              <ws-date-picker
-                v-if="item.status == '已装车' || item.status == '已送达'"
-                :disabled="readonly"
-                v-model="item.loadingDate"
-                type="date"
-                style="width: 150px"
-                placeholder="请选择日期"
-                value-format="yyyy-MM-dd"
-              />
-              <ws-date-picker
-                v-else
-                v-model="item.loadingDate"
-                type="date"
-                style="width: 150px"
-                placeholder="请选择日期"
-                value-format="yyyy-MM-dd"
-              />
+              <ws-date-picker v-if="item.status == '已装车' || item.status == '已送达'" :disabled="readonly"
+                v-model="item.loadingDate" type="date" style="width: 150px" placeholder="请选择日期"
+                value-format="yyyy-MM-dd" />
+              <ws-date-picker v-else v-model="item.loadingDate" type="date" style="width: 150px" placeholder="请选择日期"
+                value-format="yyyy-MM-dd" />
             </el-form-item>
             <div style=" padding: 10px" class="center1">
-              <el-button
-                v-show="item.status == '未装车'"
-                class="bg-bottom"
-                type="primary"
-                size="small"
-                @click="submit(deptBudgetList)"
-              >提交</el-button>
+              <el-button v-show="item.status == '未装车'" class="bg-bottom" type="primary" size="small"
+                @click="submit(deptBudgetList)">提交</el-button>
             </div>
             <div v-show=" item.signStatus == '未签合同'" class="signStatus">{{ item.signStatus }}</div>
             <div v-show=" item.signStatus == '已签合同'" class="signStatus1">{{ item.signStatus }}</div>
@@ -235,33 +152,22 @@
         </div>
       </div>
       <div v-if="this.deptBudgetList.tranCarInfoList.length>0" class="yd-bottom">
-       
-        <ws-form-item label="运单：" span="1" prop="loadPoundImg" class="yd-bottom-left" v-if="freightspace[0].status == '已装车'">
+
+        <ws-form-item label="运单：" span="1" prop="loadPoundImg" class="yd-bottom-left"
+          v-if="freightspace[0].status == '已装车'">
           <!-- slot-scope="scope" -->
           <template>
-            <el-upload
-              action="https://www.zthymaoyi.com/upload/admin"
-              :show-file-list="false"
-              :on-success=" (res) => { uploadSuccessHandle1(res)}"
-              class="avatar-uploader"
-              accept=".jpg, .jpeg, .png, .gif"
-              multiple
-            >
-              <img
-                width="18"
-                height="20"
-                style="vertical-align: text-top; position: relative"
-                src="../../../public/img/fujian.png"
-                alt
-              />
+            <el-upload action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false"
+              :on-success=" (res) => { uploadSuccessHandle1(res)}" class="avatar-uploader"
+              accept=".jpg, .jpeg, .png, .gif" multiple>
+              <img width="18" height="20" style="vertical-align: text-top; position: relative"
+                src="../../../public/img/fujian.png" alt />
             </el-upload>
             <div class="tupian">
               <span
-                v-if="deptBudgetList.tranCarInfoList.length>0&&deptBudgetList.tranCarInfoList[0].loadPoundImg != null "
-              >{{pictureTotal}}</span>
+                v-if="deptBudgetList.tranCarInfoList.length>0&&deptBudgetList.tranCarInfoList[0].loadPoundImg != null ">{{pictureTotal}}</span>
               <span
-                v-if="deptBudgetList.tranCarInfoList.length>0&&deptBudgetList.tranCarInfoList[0].loadPoundImg == null "
-              >未上传</span>
+                v-if="deptBudgetList.tranCarInfoList.length>0&&deptBudgetList.tranCarInfoList[0].loadPoundImg == null ">未上传</span>
             </div>
           </template>
         </ws-form-item>
@@ -270,14 +176,12 @@
           合计(吨)：{{ total }}/{{ deptBudgetList.weight }}
           <!--阶段状态-->
           <span class="noservice" v-show="deptBudgetList.feedbackStatus == '执行中'">未完货</span>
-          <span
-            class="service"
-            v-show="deptBudgetList.feedbackStatus == '已完货'"
-          >{{ deptBudgetList.feedbackStatus }}</span>
+          <span class="service"
+            v-show="deptBudgetList.feedbackStatus == '已完货'">{{ deptBudgetList.feedbackStatus }}</span>
         </div>
       </div>
       <div v-if="this.deptBudgetList.tranCarInfoList.length==0">
-          暂无船次
+        暂无船次
       </div>
       <!--运单-->
       <!-- <div
@@ -296,971 +200,1074 @@
   </div>
 </template>
 <script>
-import { regionData } from 'element-china-area-data'
-import Pagination from '@/components/Pagination'
-import {
-  seeCat,
-  packList,
-  feedback,
-  state,
-  importApplFileUrl
-} from '@/model/transport/index'
-import { getstaff } from '@/model/warehouse/index'
-import WsUpload from '@/components/WsUpload'
-import mapDrag from '@/components/mapdrag/mapdrag'
-export default {
-  name: 'viewSpareMoney',
-  components: {
-    WsUpload,
-    mapDrag
-  },
-  watch: {
-    vesselId(val) {
-      this.getVesselData()
+  import {
+    regionData
+  } from 'element-china-area-data'
+  import Pagination from '@/components/Pagination'
+  import {
+    seeCat,
+    packList,
+    feedback,
+    state,
+    importApplFileUrl
+  } from '@/model/transport/index'
+  import {
+    getstaff
+  } from '@/model/warehouse/index'
+  import WsUpload from '@/components/WsUpload'
+  import mapDrag from '@/components/mapdrag/mapdrag'
+  export default {
+    name: 'viewSpareMoney',
+    components: {
+      WsUpload,
+      mapDrag
     },
-    isShow(val) {
-      this.showType = val
-    }
-  },
-  data() {
-    return {
-      pictureTotal:0,
-      deptBudgetList: {
-        totalStorage: 0,
-        sendDateStart: ''
+    watch: {
+      vesselId(val) {
+        this.getVesselData()
       },
-      tranCarInfoList: {
-        loadPoundImg: ''
-      },
-      options_: regionData,
-      heightData: '600px',
-      zoom: 7,
-      selectedOptions: [],
-      center: [116.244694, 39.517344],
-      window: '',
-      radio: 1,
-      personCharge: [],
-      district: null,
-      driverList: [],
-      readonly: true,
-      listDate: { country: '中国', level: 'country', city: '' },
-      citylist: [],
-      compId: sessionStorage.getItem('ws-pf_compId'),
-      rules: {
-        warehouseName: [
-          {
-            required: true,
-            message: '请输入仓库名称',
-            trigger: 'blur'
-          },
-          {
-            min: 2,
-            max: 20,
-            message: '仓库名长度不符合要求，请输入2-20字符之内',
-            trigger: 'blur'
+      isShow(val) {
+        this.showType = val
+      }
+    },
+    data() {
+      return {
+        excelFreightspace: [],
+        pictureTotal: 0,
+        deptBudgetList: {
+          totalStorage: 0,
+          sendDateStart: ''
+        },
+        tranCarInfoList: {
+          loadPoundImg: ''
+        },
+        options_: regionData,
+        heightData: '600px',
+        zoom: 7,
+        selectedOptions: [],
+        center: [116.244694, 39.517344],
+        window: '',
+        radio: 1,
+        personCharge: [],
+        district: null,
+        driverList: [],
+        readonly: true,
+        listDate: {
+          country: '中国',
+          level: 'country',
+          city: ''
+        },
+        citylist: [],
+        compId: sessionStorage.getItem('ws-pf_compId'),
+        rules: {
+          warehouseName: [{
+              required: true,
+              message: '请输入仓库名称',
+              trigger: 'blur'
+            },
+            {
+              min: 2,
+              max: 20,
+              message: '仓库名长度不符合要求，请输入2-20字符之内',
+              trigger: 'blur'
+            }
+          ]
+        },
+        tranType: 1,
+        size: 10,
+        value1: '',
+        unitList: [],
+        fileTemp: '',
+        freightspace: [{
+            caseNo: '',
+            titleNo: '',
+            binNumber: '',
+            positionWeight: '',
+            loadNetWeight: '',
+            loadingDate: ''
           }
-        ]
-      },
-      tranType: 1,
-      size: 10,
-      value1: '',
-      unitList: [],
-      fileTemp: '',
-      freightspace: [
-        {
-          caseNo: '',
-          titleNo: '',
-          binNumber: '',
-          positionWeight: '',
-          loadNetWeight: '',
-          loadingDate: ''
-        }
-        // {loadPoundImg:{}},
-      ],
-      name: '',
-      staffList: [],
-      options: [],
-      carModel: [],
-      tranCarInfoList: {
-        loadPoundImg: ''
-      },
-      //上传
-      accessoryTFs: false,
-      fileList: [],
-      appendixIdsAdd: '',
-    }
-  },
-  activated() {
-    this.deptBudgetList.id = this.$route.query.id
-    this.getList()
-  },
-  computed: {
-    totalStorage: function() {
-      var maxStorage = 0
-      for (var i = 0; i < this.freightspace.length; i++) {
-        maxStorage += Number(this.freightspace[i].maxStorage)
+          // {loadPoundImg:{}},
+        ],
+        name: '',
+        staffList: [],
+        options: [],
+        carModel: [],
+        tranCarInfoList: {
+          loadPoundImg: ''
+        },
+        //上传
+        accessoryTFs: false,
+        fileList: [],
+        appendixIdsAdd: '',
       }
-      return maxStorage
     },
-    total: function() {
-      if (this.deptBudgetList.tranCarInfoList != null) {
+    activated() {
+      this.deptBudgetList.id = this.$route.query.id
+      this.getList()
+    },
+    computed: {
+      totalStorage: function() {
         var maxStorage = 0
-        for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
-          maxStorage += Number(
-            this.deptBudgetList.tranCarInfoList[i].loadNetWeight
-          )
+        for (var i = 0; i < this.freightspace.length; i++) {
+          maxStorage += Number(this.freightspace[i].maxStorage)
         }
         return maxStorage
-      } else {
-        return 0
-      }
-    }
-  },
-  methods: {
-    dataFilter(val) {
-      this.deptBudgetList.personCharge = val
-      if (val) {
-        this.options = this.staffList.filter(item => {
-          if (
-            !!~item.staffName.indexOf(val) ||
-            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
-          ) {
-            return true
+      },
+      total: function() {
+        if (this.deptBudgetList.tranCarInfoList != null) {
+          var maxStorage = 0
+          for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
+            maxStorage += Number(
+              this.deptBudgetList.tranCarInfoList[i].loadNetWeight
+            )
           }
-        })
-      } else {
-        this.options = this.staffList
-      }
-    },
-    selectstaff(e) {
-      for (var i = 0; i < this.staffList.length; i++) {
-        if (this.staffList[i].staffName == e) {
-          this.deptBudgetList.driverPhone = this.staffList[i].staffMobilePhone
-          this.freightspace[i].driverPhone = this.staffList[i].staffMobilePhone
-          this.deptBudgetList.personChargeKey = this.staffList[i].staffId
+          return maxStorage
+        } else {
+          return 0
         }
       }
     },
-    marker: function(item) {
-      this.deptBudgetList.warehousePositioning =
-        item.lnglat.lat + ',' + item.lnglat.lng
-    },
-    selectedAddress(e) {
-      this.deptBudgetList.warehousePositioning =
-        e.center.lat + ',' + e.center.lng
-    },
-    confirmPositioncity() {
-      this.listDate.level = 'city'
-      this.listDate.country = this.name
-    },
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    handleClose() {
-      this.dialogViewSpareMoney = false
-    },
-    //下拉司机姓名改变事件
-    selectdriver() {},
-    handleChange(value) {
-      this.selectedOptions = value
-    },
-    returnsales() {
-      this.deptBudgetList = {}
-      this.freightspace = {}
-      this.selectedOptions = ''
-      this.deptBudgetList.tranCarInfoList = []
-      this.$router.push({ path: 'tranManagementTransporHairRespond' })
-    },
-    // 上传附件
-    uploadSuccess(data, files, url) {
-      console.log(data, files, url)
-    },
-    handleClose() {
-      this.accessoryTFs = false
-    },
-    handleChange(file, fileList) {
-      this.fileTemp = file.raw
-      let fileName = file.raw.name
-      let fileType = fileName.substring(fileName.lastIndexOf('.') + 1)
-      // 判断上传文件格式
-      if (this.fileTemp) {
-        if (fileType == 'xlsx' || fileType == 'xls') {
-          this.importf(this.fileTemp)
+    methods: {
+      dataFilter(val) {
+        this.deptBudgetList.personCharge = val
+        if (val) {
+          this.options = this.staffList.filter(item => {
+            if (
+              !!~item.staffName.indexOf(val) ||
+              !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
+            ) {
+              return true
+            }
+          })
+        } else {
+          this.options = this.staffList
+        }
+      },
+      selectstaff(e) {
+        for (var i = 0; i < this.staffList.length; i++) {
+          if (this.staffList[i].staffName == e) {
+            this.deptBudgetList.driverPhone = this.staffList[i].staffMobilePhone
+            this.freightspace[i].driverPhone = this.staffList[i].staffMobilePhone
+            this.deptBudgetList.personChargeKey = this.staffList[i].staffId
+          }
+        }
+      },
+      marker: function(item) {
+        this.deptBudgetList.warehousePositioning =
+          item.lnglat.lat + ',' + item.lnglat.lng
+      },
+      selectedAddress(e) {
+        this.deptBudgetList.warehousePositioning =
+          e.center.lat + ',' + e.center.lng
+      },
+      confirmPositioncity() {
+        this.listDate.level = 'city'
+        this.listDate.country = this.name
+      },
+      // 关闭 dialog时 处理文件url 初始化upload组件
+      handleClose() {
+        this.dialogViewSpareMoney = false
+      },
+      //下拉司机姓名改变事件
+      selectdriver() {},
+      handleChange(value) {
+        this.selectedOptions = value
+      },
+      returnsales() {
+        this.deptBudgetList = {}
+        this.freightspace = {}
+        this.selectedOptions = ''
+        this.deptBudgetList.tranCarInfoList = []
+        this.$router.push({
+          path: 'tranManagementTransporHairRespond'
+        })
+      },
+      // 上传附件
+      uploadSuccess(data, files, url) {
+        console.log(data, files, url)
+      },
+      handleClose() {
+        this.accessoryTFs = false
+      },
+      handleChange(file, fileList) {
+        this.fileTemp = file.raw
+        let fileName = file.raw.name
+        let fileType = fileName.substring(fileName.lastIndexOf('.') + 1)
+        // 判断上传文件格式
+        if (this.fileTemp) {
+          if (fileType == 'xlsx' || fileType == 'xls') {
+            this.importf(this.fileTemp)
+          } else {
+            this.$message({
+              type: 'warning',
+              message: '附件格式错误，请删除后重新上传！'
+            })
+          }
         } else {
           this.$message({
             type: 'warning',
-            message: '附件格式错误，请删除后重新上传！'
+            message: '请上传附件！'
           })
         }
-      } else {
-        this.$message({
-          type: 'warning',
-          message: '请上传附件！'
-        })
-      }
-    },
-    importf(obj) {
-      this.dialogVisible = true
-      let _this = this
-      let inputDOM = this.$refs.inputer // 通过DOM取文件数据
-      this.file = event.currentTarget.files[0]
-      var rABS = false //是否将文件读取为二进制字符串
-      var f = this.file
-      var reader = new FileReader()
-      //if (!FileReader.prototype.readAsBinaryString) {
-      FileReader.prototype.readAsBinaryString = function(f) {
-        var binary = ''
+      },
+      importf(obj) {
+        this.dialogVisible = true
+        let _this = this
+        let inputDOM = this.$refs.inputer // 通过DOM取文件数据
+        this.file = event.currentTarget.files[0]
         var rABS = false //是否将文件读取为二进制字符串
-        var pt = this
-        var wb //读取完成的数据
-        var outdata
+        var f = this.file
         var reader = new FileReader()
-        reader.onload = function(e) {
-          var bytes = new Uint8Array(reader.result)
-          var length = bytes.byteLength
-          for (var i = 0; i < length; i++) {
-            binary += String.fromCharCode(bytes[i])
-          }
-          var XLSX = require('xlsx')
-          if (rABS) {
-            wb = XLSX.read(btoa(fixdata(binary)), {
-              //手动转化
-              type: 'base64'
-            })
-          } else {
-            wb = XLSX.read(binary, {
-              type: 'binary'
+        //if (!FileReader.prototype.readAsBinaryString) {
+        FileReader.prototype.readAsBinaryString = function(f) {
+          var binary = ''
+          var rABS = false //是否将文件读取为二进制字符串
+          var pt = this
+          var wb //读取完成的数据
+          var outdata
+          var reader = new FileReader()
+          reader.onload = function(e) {
+            var bytes = new Uint8Array(reader.result)
+            var length = bytes.byteLength
+            for (var i = 0; i < length; i++) {
+              binary += String.fromCharCode(bytes[i])
+            }
+            var XLSX = require('xlsx')
+            if (rABS) {
+              wb = XLSX.read(btoa(fixdata(binary)), {
+                //手动转化
+                type: 'base64'
+              })
+            } else {
+              wb = XLSX.read(binary, {
+                type: 'binary'
+              })
+            }
+            // outdata就是你想要的东西 excel导入的数据
+            outdata = XLSX.utils.sheet_to_json(wb.Sheets[wb.SheetNames[0]])
+            // excel 数据再处理
+            let arr = []
+            outdata.map(v => {
+              // let jsonString = JSON.stringify(v).replace(/\*/g, '').replace(/\s/ig,'');
+              let jsonString = JSON.stringify(v)
+                .replace(/\//g, '')
+                .replace(/\s/gi, '')
+              console.log(jsonString)
+              v = JSON.parse(jsonString)
+              let obj = {}
+              //xxx代表列名
+              obj.caseNo = v.箱号
+              obj.titleNo = v.封号
+              obj.binNumber = v.仓位号
+              obj.positionWeight = v.散船重量
+              obj.loadNetWeight = v.装船净重
+              obj.loadingDate = v.装船日期
+              obj.status = v.状态
+              obj.shipType = v.类型
+              console.log(obj)
+              _this.excelFreightspace.push(obj)
             })
+            let _ispushData = true
+            console.log(arr, _this.freightspace)
+            for (let i = 0; i < _this.excelFreightspace.length; i++) {
+              _ispushData = true
+              for (let k = 0; k < _this.freightspace.length; k++) {
+                if (_this.excelFreightspace[i].binNumber == _this.freightspace[k].binNumber) {
+                  _this.freightspace[k] = _this.excelFreightspace[i]
+                  _ispushData = false
+                }
+              }
+              if (_ispushData) {
+                _this.freightspace.push(_this.excelFreightspace[i])
+
+                _ispushData = true
+              }
+            }
+            _this.$forceUpdate();
           }
-          // outdata就是你想要的东西 excel导入的数据
-          outdata = XLSX.utils.sheet_to_json(wb.Sheets[wb.SheetNames[0]])
-          // excel 数据再处理
-          let arr = []
-          outdata.map(v => {
-            // let jsonString = JSON.stringify(v).replace(/\*/g, '').replace(/\s/ig,'');
-            let jsonString = JSON.stringify(v)
-              .replace(/\//g, '')
-              .replace(/\s/gi, '')
-            console.log(jsonString)
-            v = JSON.parse(jsonString)
-            let obj = {}
-            //xxx代表列名
-            obj.caseNo = v.箱号
-            obj.titleNo = v.封号
-            obj.binNumber = v.仓位号
-            obj.positionWeight = v.散船重量
-            obj.loadNetWeight = v.装船净重
-            obj.loadingDate = toString(v.装船日期)
-            obj.status = v.状态
-            obj.shipType = v.类型
-            console.log(obj)
-            _this.freightspace.push(obj)
-          })
-          // _this.freightspace.concat(arr)
-          console.log(arr, _this.freightspace)
+          reader.readAsArrayBuffer(f)
+        }
+        if (rABS) {
+          reader.readAsArrayBuffer(f)
+        } else {
+          reader.readAsBinaryString(f)
+        }
+        console.log(reader)
+      },
+      uploadSectionFile(param) {
+        var fileName = param.file.name.split('.')
+        var fileSuffix = fileName[fileName.length - 1]
+        if (
+          !(
+            fileSuffix.toLowerCase() == 'xlsx' ||
+            fileSuffix.toLowerCase() == 'xls'
+          )
+        ) {
+          EventBus.$emit('error', this.$t('upload.message08'))
+          loading.close()
+          return
         }
-        reader.readAsArrayBuffer(f)
-      }
-      if (rABS) {
-        reader.readAsArrayBuffer(f)
-      } else {
-        reader.readAsBinaryString(f)
-      }
-      console.log(reader)
-    },
-    uploadSectionFile(param) {
-      var fileName = param.file.name.split('.')
-      var fileSuffix = fileName[fileName.length - 1]
-      if (
-        !(
-          fileSuffix.toLowerCase() == 'xlsx' ||
-          fileSuffix.toLowerCase() == 'xls'
-        )
-      ) {
-        EventBus.$emit('error', this.$t('upload.message08'))
-        loading.close()
-        return
-      }
 
-      var data = new FormData()
-      data.append('file', param.file)
-      data.append('compId', sessionStorage.getItem('ws-pf_compId'))
-      data.append('userId', sessionStorage.getItem('ws-pf_userId'))
+        var data = new FormData()
+        data.append('file', param.file)
+        data.append('compId', sessionStorage.getItem('ws-pf_compId'))
+        data.append('userId', sessionStorage.getItem('ws-pf_userId'))
 
-      importApplFileUrl(data)
-        .toPromise()
-        .then(success => {
-          console.log(success)
-        })
-    },
+        importApplFileUrl(data)
+          .toPromise()
+          .then(success => {
+            console.log(success)
+          })
+      },
 
-    //完货
-    finished() {
-      this.$confirm(`完货操作后，装船信息不可修改，是否确定完货？`, {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          this.$refs.deptBudgetList.validate(valid => {
-            if (valid) {
-              var tranProcessInfo = {}
-              tranProcessInfo.id = this.deptBudgetList.id
-              state(tranProcessInfo)
-                .toPromise()
-                .then(response => {
-                  this.$message.success('完货成功')
-                  this.deptBudgetList = {}
-                  this.freightspace = {}
-                  this.selectedOptions = ''
-                  this.$router.push({
-                    path: 'tranManagementTransporHairRespond'
-                  })
-                })
-            } else {
-              return false
-            }
+      //完货
+      finished() {
+        this.$confirm(`完货操作后，装船信息不可修改，是否确定完货？`, {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
           })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    submit() {
-      // if (!this.freightspace[i].sendDateStart) {
-      //   this.$message({
-      //     message: '发船日期不能为空！',
-      //     type: 'warning',
-      //   })
-      //   return
-      // }
-      // if (!this.freightspace[i].caseNo) {
-      //   this.$message({
-      //     message: '箱号不能为空！',
-      //     type: 'warning',
-      //   })
-      //   return
-      // }
-      // if (
-      //   this.freightspace[i].caseNo.length > 15 ||
-      //   this.freightspace[i].caseNo.length < 1
-      // ) {
-      //   this.$message({
-      //     message: '箱号输入错误！',
-      //     type: 'warning',
-      //   })
-      //   return
-      // }
-      // if (!this.freightspace[i].titleNo) {
-      //   this.$message({
-      //     message: '封号不能为空！',
-      //     type: 'warning',
-      //   })
-      //   return
-      // }
-      // if (
-      //   this.freightspace[i].titleNo.length > 15 ||
-      //   this.freightspace[i].titleNo.length < 1
-      // ) {
-      //   this.$message({
-      //     message: '封号输入错误！',
-      //     type: 'warning',
-      //   })
-      //   return
-      // }
-      // if (!this.freightspace[i].loadNetWeight) {
-      //   this.$message({
-      //     message: '装船净重不能为空！',
-      //     type: 'warning',
-      //   })
-      //   return
-      // }
-      // if (
-      //   (this.freightspace[i].loadNetWeight &&
-      //     String(this.freightspace[i].loadNetWeight).indexOf('.') != -1 &&
-      //     String(this.freightspace[i].loadNetWeight).length -
-      //       (String(this.freightspace[i].loadNetWeight).indexOf('.') + 1) >
-      //       2) ||
-      //   this.freightspace[i].loadNetWeight > 10000 ||
-      //   this.freightspace[i].loadNetWeight < 0
-      // ) {
-      //   this.$message({
-      //     message: '装船净重输入错误',
-      //     type: 'warning',
-      //   })
-      //   return
-      // }
-      // if (!this.freightspace[i].loadingDate) {
-      //   this.$message({
-      //     message: '装船日期不能为空！',
-      //     type: 'warning',
-      //   })
-      //   return
-      // }
-      this.$confirm(`提交成功后装船信息不可修改，是否确定提交？`, {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          this.$refs.deptBudgetList.validate(valid => {
-            if (valid) {
-              this.tranCarInfoList = this.freightspace
-              this.tranCarInfoList[0].sendDateStart = this.deptBudgetList.sendDateStart
-              for (var i = 0; i < this.tranCarInfoList.length; i++) {
-                this.tranCarInfoList[i].id = this.freightspace[i].id
+          .then(() => {
+            this.$refs.deptBudgetList.validate(valid => {
+              if (valid) {
+                var tranProcessInfo = {}
+                tranProcessInfo.id = this.deptBudgetList.id
+                state(tranProcessInfo)
+                  .toPromise()
+                  .then(response => {
+                    this.$message.success('完货成功')
+                    this.deptBudgetList = {}
+                    this.freightspace = {}
+                    this.selectedOptions = ''
+                    this.$router.push({
+                      path: 'tranManagementTransporHairRespond'
+                    })
+                  })
+              } else {
+                return false
               }
-              var tranProcessInfo = {}
-              tranProcessInfo.id = this.deptBudgetList.id
-              tranProcessInfo.infoId = this.deptBudgetList.infoId
-              tranProcessInfo.processNo = this.deptBudgetList.processNo
-              tranProcessInfo.tranCarInfoList = this.tranCarInfoList
-              feedback(tranProcessInfo)
-                .toPromise()
-                .then(response => {
-                  this.$message.success('提交成功')
-                  this.deptBudgetList = {}
-                  this.freightspace = {}
-                  this.selectedOptions = ''
-                  this.$router.push({
-                    path: 'tranManagementTransporHairRespond'
+            })
+          })
+          .catch(() => {
+            return false
+          })
+      },
+      submit() {
+        // if (!this.freightspace[i].sendDateStart) {
+        //   this.$message({
+        //     message: '发船日期不能为空！',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if (!this.freightspace[i].caseNo) {
+        //   this.$message({
+        //     message: '箱号不能为空！',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if (
+        //   this.freightspace[i].caseNo.length > 15 ||
+        //   this.freightspace[i].caseNo.length < 1
+        // ) {
+        //   this.$message({
+        //     message: '箱号输入错误！',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if (!this.freightspace[i].titleNo) {
+        //   this.$message({
+        //     message: '封号不能为空！',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if (
+        //   this.freightspace[i].titleNo.length > 15 ||
+        //   this.freightspace[i].titleNo.length < 1
+        // ) {
+        //   this.$message({
+        //     message: '封号输入错误！',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if (!this.freightspace[i].loadNetWeight) {
+        //   this.$message({
+        //     message: '装船净重不能为空！',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if (
+        //   (this.freightspace[i].loadNetWeight &&
+        //     String(this.freightspace[i].loadNetWeight).indexOf('.') != -1 &&
+        //     String(this.freightspace[i].loadNetWeight).length -
+        //       (String(this.freightspace[i].loadNetWeight).indexOf('.') + 1) >
+        //       2) ||
+        //   this.freightspace[i].loadNetWeight > 10000 ||
+        //   this.freightspace[i].loadNetWeight < 0
+        // ) {
+        //   this.$message({
+        //     message: '装船净重输入错误',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        // if (!this.freightspace[i].loadingDate) {
+        //   this.$message({
+        //     message: '装船日期不能为空！',
+        //     type: 'warning',
+        //   })
+        //   return
+        // }
+        this.$confirm(`提交成功后装船信息不可修改，是否确定提交？`, {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
+          .then(() => {
+            this.$refs.deptBudgetList.validate(valid => {
+              if (valid) {
+                this.tranCarInfoList = this.freightspace
+                this.tranCarInfoList[0].sendDateStart = this.deptBudgetList.sendDateStart
+                for (var i = 0; i < this.tranCarInfoList.length; i++) {
+                  this.tranCarInfoList[i].id = this.freightspace[i].id
+                }
+                var tranProcessInfo = {}
+                tranProcessInfo.id = this.deptBudgetList.id
+                tranProcessInfo.infoId = this.deptBudgetList.infoId
+                tranProcessInfo.processNo = this.deptBudgetList.processNo
+                tranProcessInfo.tranCarInfoList = this.tranCarInfoList
+                feedback(tranProcessInfo)
+                  .toPromise()
+                  .then(response => {
+                    this.$message.success('提交成功')
+                    this.deptBudgetList = {}
+                    this.freightspace = {}
+                    this.selectedOptions = ''
+                    this.$router.push({
+                      path: 'tranManagementTransporHairRespond'
+                    })
                   })
-                })
-            } else {
-              // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-              return false
-            }
+              } else {
+                // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+                return false
+              }
+            })
           })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    resetForm(deptBudgetList) {
-      this.$refs[deptBudgetList].resetFields()
-    },
-    getList() {
-      seeCat({ id: this.deptBudgetList.id })
-        .toPromise()
-        .then(response => {
-          this.deptBudgetList = response
-          if (response.tranCarInfoList.length > 0) {
-            this.deptBudgetList.driver = response.tranCarInfoList[0].driver
-            this.deptBudgetList.driverPhone =
-              response.tranCarInfoList[0].driverPhone
-            this.$set(
-              this.deptBudgetList,
-              'sendDateStart',
-              response.tranCarInfoList[0].sendDateStart
-            )
-            this.deptBudgetList.receiveDateEnd =
-              response.tranCarInfoList[0].receiveDateEnd
-            this.deptBudgetList.shipName = response.tranCarInfoList[0].shipName
-            this.deptBudgetList.shipNo = response.tranCarInfoList[0].shipNo
-            this.deptBudgetList.shipType = response.tranCarInfoList[0].shipType
-            this.deptBudgetList.boxNumber = response.tranCarInfoList[0].boxNumber
-            //上传附件计数
-            if(this.deptBudgetList.tranCarInfoList[0].loadPoundImg){
-              this.pictureTotal =  this.deptBudgetList.tranCarInfoList[0].loadPoundImg.split(",").length
+          .catch(() => {
+            return false
+          })
+      },
+      resetForm(deptBudgetList) {
+        this.$refs[deptBudgetList].resetFields()
+      },
+      getList() {
+        seeCat({
+            id: this.deptBudgetList.id
+          })
+          .toPromise()
+          .then(response => {
+            this.deptBudgetList = response
+            if (response.tranCarInfoList.length > 0) {
+              this.deptBudgetList.driver = response.tranCarInfoList[0].driver
+              this.deptBudgetList.driverPhone =
+                response.tranCarInfoList[0].driverPhone
+              this.$set(
+                this.deptBudgetList,
+                'sendDateStart',
+                response.tranCarInfoList[0].sendDateStart
+              )
+              this.deptBudgetList.receiveDateEnd =
+                response.tranCarInfoList[0].receiveDateEnd
+              this.deptBudgetList.shipName = response.tranCarInfoList[0].shipName
+              this.deptBudgetList.shipNo = response.tranCarInfoList[0].shipNo
+              this.deptBudgetList.shipType = response.tranCarInfoList[0].shipType
+              this.deptBudgetList.boxNumber = response.tranCarInfoList[0].boxNumber
+              //上传附件计数
+              if (this.deptBudgetList.tranCarInfoList[0].loadPoundImg) {
+                this.pictureTotal = this.deptBudgetList.tranCarInfoList[0].loadPoundImg.split(",").length
+              }
+              this.freightspace = response.tranCarInfoList
             }
-            this.freightspace = response.tranCarInfoList
-          }
 
-          for (var i = 0; i < this.freightspace.length; i++) {
-            if (!this.freightspace[i].loadNetWeight) {
-              this.freightspace[i].loadNetWeight = 0
+            for (var i = 0; i < this.freightspace.length; i++) {
+              if (!this.freightspace[i].loadNetWeight) {
+                this.freightspace[i].loadNetWeight = 0
+              }
             }
-          }
-        })
-      //司机姓名下拉
-      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
-        .toPromise()
-        .then(response => {
-          this.options = response
-          this.staffList = response
-        }),
-        //车型
-        packList({ constId: 'TRAN5' })
+          })
+        //司机姓名下拉
+        getstaff({
+            compId: sessionStorage.getItem('ws-pf_compId')
+          })
+          .toPromise()
+          .then(response => {
+            this.options = response
+            this.staffList = response
+          }),
+          //车型
+          packList({
+            constId: 'TRAN5'
+          })
           .toPromise()
           .then(response => {
             this.carModel = response
           })
-    },
-    handleExamine() {},
-    approve() {},
-    // returnsales() {
-    //   this.$router.push({ path: 'purchaseContract' })
-    // },
-    selectChapterTwo(e) {
-      for (var i = 0; i < this.ChapterTwoList.length; i++) {
-        if (this.ChapterTwoList[i].constValue == e) {
-          this.deptBudgetList.gradeKey = this.ChapterTwoList[i].constKey
+      },
+      handleExamine() {},
+      approve() {},
+      // returnsales() {
+      //   this.$router.push({ path: 'purchaseContract' })
+      // },
+      selectChapterTwo(e) {
+        for (var i = 0; i < this.ChapterTwoList.length; i++) {
+          if (this.ChapterTwoList[i].constValue == e) {
+            this.deptBudgetList.gradeKey = this.ChapterTwoList[i].constKey
+          }
         }
-      }
-    },
-    selectunitList(e) {
-      for (var i = 0; i < this.unitList.length; i++) {
-        if (this.unitList[i].constValue == e) {
-          this.deptBudgetList.acceptanceMethodKey = this.unitList[i].constKey
+      },
+      selectunitList(e) {
+        for (var i = 0; i < this.unitList.length; i++) {
+          if (this.unitList[i].constValue == e) {
+            this.deptBudgetList.acceptanceMethodKey = this.unitList[i].constKey
+          }
         }
-      }
-    },
-    selectgrade(e) {
-      for (var i = 0; i < this.gradeList.length; i++) {
-        if (this.gradeList[i].constValue == e) {
-          this.deptBudgetList.gradeKey = this.gradeList[i].constKey
+      },
+      selectgrade(e) {
+        for (var i = 0; i < this.gradeList.length; i++) {
+          if (this.gradeList[i].constValue == e) {
+            this.deptBudgetList.gradeKey = this.gradeList[i].constKey
+          }
         }
-      }
-    },
-    selectgoodsName(e) {
-      for (var i = 0; i < this.goodnameList.length; i++) {
-        if (this.goodnameList[i].constValue == e) {
-          this.deptBudgetList.goodsNameKey = this.goodnameList[i].constKey
+      },
+      selectgoodsName(e) {
+        for (var i = 0; i < this.goodnameList.length; i++) {
+          if (this.goodnameList[i].constValue == e) {
+            this.deptBudgetList.goodsNameKey = this.goodnameList[i].constKey
+          }
         }
-      }
-    },
-    selectpackingMethod(e) {
-      for (var i = 0; i < this.packtypeList.length; i++) {
-        if (this.packtypeList[i].constValue == e) {
-          this.deptBudgetList.packingMethodKey = this.packtypeList[i].constKey
+      },
+      selectpackingMethod(e) {
+        for (var i = 0; i < this.packtypeList.length; i++) {
+          if (this.packtypeList[i].constValue == e) {
+            this.deptBudgetList.packingMethodKey = this.packtypeList[i].constKey
+          }
+        }
+      },
+      uploadSuccessHandle1(e) {
+        this.pictureTotal++;
+        if (this.deptBudgetList.tranCarInfoList[0].loadPoundImg) {
+          this.deptBudgetList.tranCarInfoList[0].loadPoundImg += ',' + e.url
+        } else {
+          this.deptBudgetList.tranCarInfoList[0].loadPoundImg = e.url
         }
-      }
-    },
-    uploadSuccessHandle1(e) {
-      this.pictureTotal++; 
-      if (this.deptBudgetList.tranCarInfoList[0].loadPoundImg) {
-        this.deptBudgetList.tranCarInfoList[0].loadPoundImg += ',' + e.url
-      } else {
-        this.deptBudgetList.tranCarInfoList[0].loadPoundImg = e.url
-      }
 
-      console.log(this.deptBudgetList.tranCarInfoList,"duixiang1")
-       feedback(this.deptBudgetList)
-                .toPromise()
-                .then(response => {
-                })
+        console.log(this.deptBudgetList.tranCarInfoList, "duixiang1")
+        feedback(this.deptBudgetList)
+          .toPromise()
+          .then(response => {})
+      }
     }
   }
-}
 </script>
 
 <style lang="scss" scoped>
-/deep/.totalStorage .el-input__inner {
-  color: #afb5cb;
-  background: #f5f7fa;
-}
-.small-title {
-  position: relative;
-  padding: 10px;
-  font-weight: 600;
-}
-.small-title::before {
-  position: absolute;
-  content: '';
-  display: block;
-  background: #5473e8;
-  width: 4px;
-  height: 14px;
-  left: 0px;
-  top: 13px;
-}
-.position {
-  position: relative;
-}
-
-.del {
-  position: absolute;
-  right: -38px;
-  top: 14px;
-  cursor: pointer;
-  right: 0;
-  display: inline-block;
-  font-size: 26px;
-  width: 26px;
-  height: 10px;
-  line-height: 0px;
-}
-
-.amap-page-container {
-  width: 300px;
-  height: 300px;
-}
-.el-form {
-  padding: 0 10%;
-}
-/deep/.ws-info-table .el-form-item {
-  border-right: 1px solid transparent;
-  border-bottom: 1px solid transparent;
-}
-.readonly {
-  position: relative;
-}
-.readonly:after {
-  content: '*';
-  color: #ff2727;
-  position: absolute;
-  right: 8px;
-  z-index: 10;
-  top: 21%;
-  font-size: 20px;
-}
-.title {
-  position: relative;
-}
-.title::before {
-  content: '';
-  display: inline-block;
-  width: 5px;
-  height: 30px;
-  background: #5473e8;
-  position: absolute;
-  left: 0;
-}
-.el-button--primary {
-  background-color: #5878e8;
-  border-color: #5878e8;
-}
-.el-col {
-  background: #f6f7fc;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  padding: 0 25px;
-  border-left: 1px solid transparent;
-  background: #fff;
-  display: flex;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  width: 100px;
-  text-align: center;
-  background: #fff;
-  // border: 1px solid #cdd2dc;
-}
-.button-container {
-  display: flex;
-  flex-wrap: nowrap;
-  justify-content: space-between;
-  align-items: center;
-  background-color: #fff;
-  width: 100%;
-  height: 50px;
-  padding: 0 10px;
-  & > div {
-    margin-left: 10px;
+  /deep/.totalStorage .el-input__inner {
+    color: #afb5cb;
+    background: #f5f7fa;
+  }
+
+  .small-title {
+    position: relative;
+    padding: 10px;
+    font-weight: 600;
+  }
+
+  .small-title::before {
+    position: absolute;
+    content: '';
+    display: block;
+    background: #5473e8;
+    width: 4px;
+    height: 14px;
+    left: 0px;
+    top: 13px;
+  }
+
+  .position {
+    position: relative;
+  }
+
+  .del {
+    position: absolute;
+    right: -38px;
+    top: 14px;
+    cursor: pointer;
+    right: 0;
+    display: inline-block;
+    font-size: 26px;
+    width: 26px;
+    height: 10px;
+    line-height: 0px;
+  }
+
+  .amap-page-container {
+    width: 300px;
+    height: 300px;
+  }
+
+  .el-form {
+    padding: 0 10%;
+  }
+
+  /deep/.ws-info-table .el-form-item {
+    border-right: 1px solid transparent;
+    border-bottom: 1px solid transparent;
+  }
+
+  .readonly {
+    position: relative;
+  }
+
+  .readonly:after {
+    content: '*';
+    color: #ff2727;
+    position: absolute;
+    right: 8px;
+    z-index: 10;
+    top: 21%;
+    font-size: 20px;
+  }
+
+  .title {
+    position: relative;
+  }
+
+  .title::before {
+    content: '';
+    display: inline-block;
+    width: 5px;
+    height: 30px;
+    background: #5473e8;
+    position: absolute;
+    left: 0;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+  }
+
+  .el-col {
+    background: #f6f7fc;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__content {
+    padding: 0 25px;
+    border-left: 1px solid transparent;
+    background: #fff;
     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/.ws-info-table .el-form-item .el-form-item__label {
+    width: 100px;
+    text-align: center;
+    background: #fff;
+    // border: 1px solid #cdd2dc;
+  }
+
+  .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-main {
-      position: absolute;
+
+    /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;
+
+  .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;
-}
-.bg-left {
-  padding-left: 30px;
-}
-.bg-right {
-  padding-right: 10px;
-  text-align: right;
-}
-.bg-bottom {
-  margin: 15px 0px;
-}
-.wenzi {
-  width: 900px;
-  margin: 0 auto;
-}
-.wenzi h3 {
-  display: inline-block;
-  left: 10px;
-}
-.wenzi p {
-  display: inline-block;
-}
-.center {
-  width: 900px;
-  margin: 0 auto;
-}
-.center1 {
-  width: 100px;
-  margin: 0 auto;
-  margin-top: -2%;
-}
-.el-form-item {
-  width: 50%;
-}
-.el-form-item__label {
-  text-align: center;
-}
-.ce {
-  width: 900px;
-  margin: 0 auto;
-}
-/*.crt-main .textarea /deep/ .el-form-item__label {*/
-/*  height: 82px;*/
-/*}*/
-// 控制select为只读的时候显示样式
-
-.hide-sel {
-  .el-input__inner {
-    border: 0px;
+
+  .collapse-bottom {
+    margin-bottom: 20px;
   }
-  .el-icon-arrow-up {
-    display: none;
+
+  .input-main .textarea .el-textarea__inner {
+    width: 100%;
+    z-index: 1;
   }
-  .el-textarea__inner {
-    background-color: #fff !important;
-    border: 0;
+
+  .bg-left {
+    padding-left: 30px;
+  }
+
+  .bg-right {
+    padding-right: 10px;
+    text-align: right;
+  }
+
+  .bg-bottom {
+    margin: 15px 0px;
+  }
+
+  .wenzi {
+    width: 900px;
+    margin: 0 auto;
+  }
+
+  .wenzi h3 {
+    display: inline-block;
+    left: 10px;
+  }
+
+  .wenzi p {
+    display: inline-block;
+  }
+
+  .center {
+    width: 900px;
+    margin: 0 auto;
+  }
+
+  .center1 {
+    width: 100px;
+    margin: 0 auto;
+    margin-top: -2%;
+  }
+
+  .el-form-item {
+    width: 50%;
   }
-  .el-date-editor {
-    i {
+
+  .el-form-item__label {
+    text-align: center;
+  }
+
+  .ce {
+    width: 900px;
+    margin: 0 auto;
+  }
+
+  /*.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;
+    }
   }
-  // .is-disabled {
-  //   .el-input__inner:hover {
-  //     background-color: #fff !important;
-  //     border: 0;
+
+  // /deep/.is-disabled {
+  //   .el-input__prefix,
+  //   .el-input__suffix {
+  //     display: none;
   //   }
-  //   color: #606266;
   //   .el-input__inner {
-  //     background-color: #fff !important;
-  //     border: 0;
-  //     color: #606266;
-  //   }
-  //   .el-textarea__inner {
-  //     background-color: #fff !important;
-  //     border: 0;
-  //     color: #606266;
+  //     background-color: #fff;
+  //     border-color: #fff !important;
+  //     color: #000 !important;
+  //     font-size: 14px;
+  //     cursor: text;
+  //     padding: 0 !important;
   //   }
   // }
-}
+  .winseaview-view {
+    padding: 0 0 20px;
+  }
 
-// 控制select为只读的时候显示样式
-/deep/.ws-class-table-col {
-  height: auto;
-  padding: 0px 2px;
-  /deep/.el-input__inner {
-    padding: 0px 2px;
+  .container {
+    overflow: scroll;
+    height: 93vh;
+  }
+
+  .ws-info-table .el-form-item {
+    width: 33.3333%;
+  }
+
+  .readonly:after {
+    display: none;
+  }
+
+  .el-textarea__inner {
+    display: none;
+  }
+
+  .el-form {
+    margin-top: 50px;
+  }
+
+  .readonly {
+    width: 16%;
+  }
+
+  //去边框
+  /deep/.el-form-item {
+    border-right: 0px;
+    border-bottom: 0px;
+  }
+
+  /deep/.ws-info-table {
+    border-left: 0px;
+    border-top: 0px;
+  }
+
+  .ws-info-table .el-form-item .el-form-item__content {
+    border: none;
+  }
+
+  /deep/.ws-info-table .el-form-item {
+    border: none;
+    height: 50px;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__content {
+    background: #f5f7fa;
+    border-radius: 4px;
+    border: 1px solid #d8dce6;
+    font-family: PingFangSC-Regular, PingFang SC;
+    margin-bottom: 5px;
+    background-color: #fff;
+    font-size: 14px;
+    font-weight: 400;
+    color: #8890b1;
+    line-height: 16px;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__label {
+    background-color: #fff;
+    font-size: 13px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #8890b1;
+    line-height: 16px;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__content {
+    background: #f5f7fa;
+    border-radius: 4px;
+    border: 1px solid #d8dce6;
+  }
+
+  /deep/.flex .ws-info-table .el-form-item .el-form-item__content {
+    border: 0px;
+  }
+
+  //联络员及车次
+  /deep/.liaison .ws-info-table .el-form-item {
+    width: 19%;
+  }
+
+  /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
+    width: 37%;
+    background: #f6f7fc;
+  }
+
+  /deep/.liaison .ws-info-table {
+    width: 100%;
+    background: #f6f7fc;
+    border-radius: 4px;
+    border: 1px solid #d8dce6;
+    margin-top: 20px;
+  }
+
+  .catNos {
+    width: 100%;
+    height: 30px;
+    margin-top: 10px;
+    margin-left: 20px;
+    font-size: 14px;
+  }
+
+  .catNosCor {
+    color: #5473e8;
+  }
+
+  .add {
+    width: 130px;
+    height: 34px;
+    background: #f6f7fb;
+    border-radius: 17px;
+    color: #5473e8;
+    font-size: 14px;
+    border: none;
+  }
+
+  .add img {
+    display: inline-block;
+    margin-top: 3px;
+    margin-left: -30px;
+  }
+
+  .add .spans {
+    display: table-caption;
+    width: 56px;
+    height: 20px;
+    line-height: 18px;
+  }
+
+  .signStatus {
+    height: 25px;
+    border-radius: 3px;
+    border: 1px solid #5473e8;
+    padding: 0 3px;
+    color: #ffffff;
+    background: #c4cada;
+    line-height: 24px;
+    margin-left: 18px;
+  }
+
+  .signStatus1 {
+    height: 25px;
+    background: #e6ebff;
+    border-radius: 3px;
+    border: 1px solid #5473e8;
+    padding: 0 3px;
+    margin-left: 18px;
+    color: #5473e8;
+    line-height: 24px;
+  }
+
+  .line {
+    height: 26px;
+    margin-top: 6px;
+    left: 2px;
+  }
+
+  /deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
+    padding: 0px;
+  }
+
+  .noservice {
+    background: #c4cada;
+    color: #ffffff;
+    padding: 5px 7px;
+    border-radius: 4px;
+  }
+
+  .service {
+    background: #e5f1f7;
+    color: #50cad4;
+  }
+
+  .tupian {
+    // margin-left: 14%;
+    // margin-top: -7%;
+  }
+
+  /deep/.el-input--suffix .el-input__inner {
+    padding-right: 0px;
+  }
+
+  .liaison {
+    margin-bottom: 20px;
+  }
+
+  .yd-bottom {
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .yd-bottom-left {
+    display: flex;
+  }
+
+  .avatar-uploader {
+    margin-right: 10px;
+  }
+
+  /deep/.yd-bottom-left .el-form-item__content {
+    display: flex;
   }
-}
-// /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;
-//   }
-// }
-.winseaview-view {
-  padding: 0 0 20px;
-}
-.container {
-  overflow: scroll;
-  height: 93vh;
-}
-.ws-info-table .el-form-item {
-  width: 33.3333%;
-}
-.readonly:after {
-  display: none;
-}
-.el-textarea__inner {
-  display: none;
-}
-.el-form {
-  margin-top: 50px;
-}
-.readonly {
-  width: 16%;
-}
-
-//去边框
-/deep/.el-form-item {
-  border-right: 0px;
-  border-bottom: 0px;
-}
-/deep/.ws-info-table {
-  border-left: 0px;
-  border-top: 0px;
-}
-.ws-info-table .el-form-item .el-form-item__content {
-  border: none;
-}
-/deep/.ws-info-table .el-form-item {
-  border: none;
-  height: 50px;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  background: #f5f7fa;
-  border-radius: 4px;
-  border: 1px solid #d8dce6;
-  font-family: PingFangSC-Regular, PingFang SC;
-  margin-bottom: 5px;
-  background-color: #fff;
-  font-size: 14px;
-  font-weight: 400;
-  color: #8890b1;
-  line-height: 16px;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  background-color: #fff;
-  font-size: 13px;
-  font-family: PingFangSC-Regular, PingFang SC;
-  font-weight: 400;
-  color: #8890b1;
-  line-height: 16px;
-}
-
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  background: #f5f7fa;
-  border-radius: 4px;
-  border: 1px solid #d8dce6;
-}
-/deep/.flex .ws-info-table .el-form-item .el-form-item__content {
-  border: 0px;
-}
-//联络员及车次
-/deep/.liaison .ws-info-table .el-form-item {
-  width: 19%;
-}
-/deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
-  width: 37%;
-  background: #f6f7fc;
-}
-/deep/.liaison .ws-info-table {
-  width: 100%;
-  background: #f6f7fc;
-  border-radius: 4px;
-  border: 1px solid #d8dce6;
-  margin-top: 20px;
-}
-.catNos {
-  width: 100%;
-  height: 30px;
-  margin-top: 10px;
-  margin-left: 20px;
-  font-size: 14px;
-}
-.catNosCor {
-  color: #5473e8;
-}
-.add {
-  width: 130px;
-  height: 34px;
-  background: #f6f7fb;
-  border-radius: 17px;
-  color: #5473e8;
-  font-size: 14px;
-  border: none;
-}
-.add img {
-  display: inline-block;
-  margin-top: 3px;
-  margin-left: -30px;
-}
-.add .spans {
-  display: table-caption;
-  width: 56px;
-  height: 20px;
-  line-height: 18px;
-}
-.signStatus {
-  height: 25px;
-  border-radius: 3px;
-  border: 1px solid #5473e8;
-  padding: 0 3px;
-  color: #ffffff;
-  background: #c4cada;
-  line-height: 24px;
-  margin-left: 18px;
-}
-.signStatus1 {
-  height: 25px;
-  background: #e6ebff;
-  border-radius: 3px;
-  border: 1px solid #5473e8;
-  padding: 0 3px;
-  margin-left: 18px;
-  color: #5473e8;
-  line-height: 24px;
-}
-.line {
-  height: 26px;
-  margin-top: 6px;
-  left: 2px;
-}
-/deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
-  padding: 0px;
-}
-.noservice {
-  background: #c4cada;
-  color: #ffffff;
-  padding: 5px 7px;
-  border-radius: 4px;
-}
-.service {
-  background: #e5f1f7;
-  color: #50cad4;
-}
-.tupian {
-  // margin-left: 14%;
-  // margin-top: -7%;
-}
-/deep/.el-input--suffix .el-input__inner {
-  padding-right: 0px;
-}
-.liaison {
-  margin-bottom: 20px;
-}
-.yd-bottom {
-  display: flex;
-  justify-content: space-between;
-}
-.yd-bottom-left {
-  display: flex;
-}
-.avatar-uploader {
-  margin-right: 10px;
-}
-/deep/.yd-bottom-left .el-form-item__content {
-  display: flex;
-}
-</style>
+</style>

src/views/tranManagement/tranManagementTransporFeedback.vue

@@ -7,13 +7,8 @@
       </el-col>
       <el-col :span="12" class="bg-right">
         <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()">
-          <img
-            width="6"
-            height="10"
-            style="vertical-align: bottom; margin-right: 3px"
-            src="../../../public/img/lujing.png"
-            alt
-          />返回
+          <img width="6" height="10" style="vertical-align: bottom; margin-right: 3px"
+            src="../../../public/img/lujing.png" alt />返回
         </el-button>
       </el-col>
     </el-row>
@@ -32,19 +27,10 @@
           }}{{ deptBudgetList.sendArea }}
         </ws-form-item>
         <!--发货人-->
-        <ws-form-item
-          label="发货人"
-          span="1"
-          prop="sender"
-          class="readonly"
-        >{{ deptBudgetList.sender }}</ws-form-item>
+        <ws-form-item label="发货人" span="1" prop="sender" class="readonly">{{ deptBudgetList.sender }}</ws-form-item>
         <!--发货人电话-->
-        <ws-form-item
-          label="发货人电话"
-          span="1"
-          prop="senderPhone"
-          class="readonly"
-        >{{ deptBudgetList.senderPhone }}</ws-form-item>
+        <ws-form-item label="发货人电话" span="1" prop="senderPhone" class="readonly">{{ deptBudgetList.senderPhone }}
+        </ws-form-item>
         <!--收货地址-->
         <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
           {{ deptBudgetList.receivePrivate }}{{ deptBudgetList.receiveCity
@@ -55,17 +41,10 @@
         <!--收货人电话-->
         <ws-form-item label="收货人电话" span="1" prop="receiverPhone">{{ deptBudgetList.receiverPhone }}</ws-form-item>
         <!--发货日期-->
-        <ws-form-item
-          label="发货日期"
-          span="1"
-          prop="deliveryDateStart"
-        >{{ deptBudgetList.deliveryDateStart }}</ws-form-item>
+        <ws-form-item label="发货日期" span="1" prop="deliveryDateStart">{{ deptBudgetList.deliveryDateStart }}
+        </ws-form-item>
         <!--最晚到货日期-->
-        <ws-form-item
-          label="最晚到货日期"
-          span="1"
-          prop="deliveryDateEnd"
-        >{{ deptBudgetList.deliveryDateEnd }}</ws-form-item>
+        <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">{{ deptBudgetList.deliveryDateEnd }}</ws-form-item>
         <!--合同编号-->
         <ws-form-item label="合同编号" span="1" prop="contractNo">{{ deptBudgetList.contractNo }}</ws-form-item>
         <!-- 运输方式 -->
@@ -73,8 +52,8 @@
       </ws-info-table>
       <div class="small-title" style="font-size: 16px; width: 50%;float: left;">装车详情</div>
       <!-- 导入 -->
-      <div style="font-size: 16px; width: 50%;float: left;text-align: right;">
-      <!-- <el-upload style="margin-left: 8px;"
+      <div style="font-size: 16px; width: 50%;float: left;text-align: right;display:flex;justify-content:end;">
+        <!-- <el-upload style="margin-left: 8px;"
           class=""
           action="https://www.zthymaoyi.com/upload/admin"
           :show-file-list="false"
@@ -87,23 +66,20 @@
           >
           <el-button  type="primary">导入</el-button>
         </el-upload> -->
-        <el-upload style="margin-left: 8px;"
-          class="upload-demo inline-block margin-right-10"
-          action=""
-          :on-change="handleChange"
-          :show-file-list="false"
+        <el-link
+          href="https://taohaoliang.oss-cn-beijing.aliyuncs.com/%E6%B1%BD%E8%BF%90%E8%A3%85%E8%BD%A6%E5%8F%8D%E9%A6%88%E6%A8%A1%E6%9D%BF.xlsx"
+          style="margin-left: 8px;">
+          <el-button type="primary">模板下载</el-button>
+        </el-link>
+        <el-upload style="margin-left: 8px;" class="upload-demo inline-block margin-right-10" action=""
+          :on-change="handleChange" :show-file-list="false"
           accept=".csv, application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
           :auto-upload="false">
-          <el-button  type="primary">导入</el-button>
+          <el-button type="primary">导入</el-button>
         </el-upload>
-    </div>
+      </div>
       <div class="liaison">
-        <div
-          style="width: 100%"
-          class="flex position"
-          v-for="(item, index) in freightspace"
-          :key="index"
-        >
+        <div style="width: 100%" class="flex position" v-for="(item, index) in freightspace" :key="index">
           <ws-info-table>
             <div class="catNos" v-show="item.temporaryDriverFlag == 0">
               司机-{{ index + 1 }}
@@ -123,10 +99,7 @@
                 }}
               </span>
             </div>
-            <div
-              class="catNos catNosCor"
-              v-show="item.temporaryDriverFlag != 0"
-            >司机-{{ index + 1 }}(临)</div>
+            <div class="catNos catNosCor" v-show="item.temporaryDriverFlag != 0">司机-{{ index + 1 }}(临)</div>
             <!--司机-->
             <ws-form-item label="姓名：" span="1" prop="driver" v-show="item.temporaryDriverFlag == 0">
               <span v-show="item.temporaryDriverFlag == 0">{{ item.driver }}</span>
@@ -134,114 +107,59 @@
             <!--司机-->
 
             <ws-form-item label="姓名：" span="1" prop="driver" v-show="item.temporaryDriverFlag != 0">
-              <el-select
-                v-show="item.temporaryDriverFlag != 0"
-                v-model="item.driver"
-                placeholder="请选择司机"
-                filterable
-                :filter-method="dataFilter"
-                @change="selectstaff"
-              >
-                <el-option
-                  v-for="item in options"
-                  :key="item.value"
-                  :label="item.staffName"
-                  :value="item.staffName"
-                />
+              <el-select v-show="item.temporaryDriverFlag != 0" v-model="item.driver" placeholder="请选择司机" filterable
+                :filter-method="dataFilter" @change="selectstaff">
+                <el-option v-for="item in options" :key="item.value" :label="item.staffName" :value="item.staffName" />
               </el-select>
             </ws-form-item>
             <!--电话-->
             <ws-form-item label="司机电话：" span="1" prop="driverPhone">
-              <ws-input
-                v-show="item.temporaryDriverFlag != 0"
-                v-model="item.driverPhone"
-                placeholder="请输入司机电话"
-                maxlength="20"
-                size="small"
-              />
+              <ws-input v-show="item.temporaryDriverFlag != 0" v-model="item.driverPhone" placeholder="请输入司机电话"
+                maxlength="20" size="small" />
               <span v-show="item.temporaryDriverFlag == 0">{{ item.driverPhone }}</span>
             </ws-form-item>
             <!--车牌号-->
             <ws-form-item label="车牌号：" span="1" prop="carNo">
-              <ws-input
-                v-show="item.temporaryDriverFlag != 0"
-                v-model="item.carNo"
-                placeholder="请输入车牌号"
-                maxlength="20"
-                size="small"
-              />
+              <ws-input v-show="item.temporaryDriverFlag != 0" v-model="item.carNo" placeholder="请输入车牌号" maxlength="20"
+                size="small" />
               <span v-show="item.temporaryDriverFlag == 0">{{ item.carNo }}</span>
             </ws-form-item>
             <!--装车净重-->
             <ws-form-item label="装车净重：" span="1" prop="loadNetWeight">
-              <ws-input
-                v-if="item.status == '已装车'||item.status == '已送达'"
-                :disabled="readonly"
-                v-model="item.loadNetWeight"
-                placeholder="请输入装车净重"
-                maxlength="20"
-                size="small"
-                style="width:80px"
-              />
-              <ws-input
-                v-else
-                v-model="item.loadNetWeight"
-                placeholder="请输入装车净重"
-                maxlength="20"
-                style="width:80px"
-                size="small"
-              />
+              <ws-input v-if="item.status == '已装车'||item.status == '已送达'" :disabled="readonly"
+                v-model="item.loadNetWeight" placeholder="请输入装车净重" maxlength="20" size="small" style="width:80px" />
+              <ws-input v-else v-model="item.loadNetWeight" placeholder="请输入装车净重" maxlength="20" style="width:80px"
+                size="small" />
             </ws-form-item>
             <!--装车日期-->
             <ws-form-item label="装车日期:" span="1" prop="sendDateStart">
-              <ws-date-picker
-                v-if="item.status == '已装车'||item.status == '已送达'"
-                :disabled="readonly"
-                v-model="item.sendDateStart"
-                type="date"
-                class="picker"
-                placeholder="请选择日期"
-                value-format="yyyy-MM-dd"
-              />
-              <ws-date-picker
-                v-else
-                v-model="item.sendDateStart"
-                type="date"
-                class="picker"
-                placeholder="请选择日期"
-                value-format="yyyy-MM-dd"
-              />
+              <ws-date-picker v-if="item.status == '已装车'||item.status == '已送达'" :disabled="readonly"
+                v-model="item.sendDateStart" type="date" class="picker" placeholder="请选择日期" value-format="yyyy-MM-dd" />
+              <ws-date-picker v-else v-model="item.sendDateStart" type="date" class="picker" placeholder="请选择日期"
+                value-format="yyyy-MM-dd" />
             </ws-form-item>
             <!--磅单-->
             <ws-form-item label="磅单：" span="1" prop="loadPoundImg">
               <!-- slot-scope="scope" -->
               <template>
-                <el-upload
-                  action="https://www.zthymaoyi.com/upload/admin"
-                  :show-file-list="false"
-                  :on-success=" (res) => { uploadSuccessHandle1(res,index)}"
-                  class="avatar-uploader"
-                  accept=".jpg, .jpeg, .png, .gif"
-                >
-                  <img
-                    width="18"
-                    height="20"
-                    style="
+                <el-upload action="https://www.zthymaoyi.com/upload/admin" :show-file-list="false"
+                  :on-success=" (res) => { uploadSuccessHandle1(res,index)}" class="avatar-uploader"
+                  accept=".jpg, .jpeg, .png, .gif">
+                  <img width="18" height="20" style="
                       vertical-align: text-top;
                       position: relative;
-                    "
-                    src="../../../public/img/fujian.png"
-                    alt
-                  />
+                    " src="../../../public/img/fujian.png" alt />
                 </el-upload>
                 <span v-if="item.loadPoundImg != null ">1</span>
-                <span
-                  v-if="
+                <span v-if="
                     item.loadPoundImg == null
-                  "
-                >未上传</span>
+                  ">未上传</span>
               </template>
             </ws-form-item>
+            <!--预览-->
+            <div>
+              <el-button class="bg-bottom" type="primary" size="small" @click="preview(item)"  v-if="item.loadPoundImg != null ">预览</el-button>
+            </div>
             <!--箱号-->
             <ws-form-item label="箱号:" span="1" prop="caseNo">
               <span>{{ item.caseNo }}</span>
@@ -250,23 +168,12 @@
             <ws-form-item label="封号:" span="1" prop="titleNo">
               <span>{{ item.titleNo }}</span>
             </ws-form-item>
-            <div
-              v-show="item.temporaryDriverFlag == 0 && item.signStatus == '未签合同'"
-              class="signStatus"
-            >{{ item.signStatus }}</div>
-            <div
-              v-show="item.temporaryDriverFlag == 0 && item.signStatus == '已签合同'"
-              class="signStatus1"
-            >{{ item.signStatus }}</div>
-            <span
-              v-show="item.temporaryDriverFlag != 0"
-              width="22"
-              height="22"
-              class="del"
-              @click="del(index)"
-              src="../../../public/img/del.png"
-              alt
-            >×</span>
+            <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '未签合同'" class="signStatus">
+              {{ item.signStatus }}</div>
+            <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '已签合同'" class="signStatus1">
+              {{ item.signStatus }}</div>
+            <span v-show="item.temporaryDriverFlag != 0" width="22" height="22" class="del" @click="del(index)"
+              src="../../../public/img/del.png" alt>×</span>
           </ws-info-table>
         </div>
       </div>
@@ -290,77 +197,91 @@
       <el-button class="bg-bottom" type="primary" size="small" @click="submit(deptBudgetList)">提交</el-button>
       <el-button class="bg-bottom" type="primary" size="small" @click="finished (deptBudgetList)">完货</el-button>
     </div>
+    <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
+			@on-cancel="handleClose">
+			<ws-upload ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
+				accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+		</WinseaContentModal>
   </div>
 </template>
 <script>
-import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
-import {
-  seeCat,
-  packList,
-  feedback,
-  getbank,
-  state,
-  importApplFileUrl
-} from '@/model/transport/index'
-import { getstaff } from '@/model/warehouse/index'
-import WsUpload from '@/components/WsUpload'
-import mapDrag from '@/components/mapdrag/mapdrag'
-export default {
-  name: 'viewSpareMoney',
-  components: {
-    WsUpload,
-    mapDrag
-  },
-  watch: {
-    vesselId(val) {
-      this.getVesselData()
+  import {
+    regionData,
+    CodeToText,
+    TextToCode
+  } from 'element-china-area-data'
+  import {
+    seeCat,
+    packList,
+    feedback,
+    getbank,
+    state,
+    importApplFileUrl
+  } from '@/model/transport/index'
+  import {
+    getstaff
+  } from '@/model/warehouse/index'
+  import WsUpload from '@/components/WsUpload'
+  import mapDrag from '@/components/mapdrag/mapdrag'
+  export default {
+    name: 'viewSpareMoney',
+    components: {
+      WsUpload,
+      mapDrag
     },
-    isShow(val) {
-      this.showType = val
-    }
-  },
-  data() {
-    return {
-      deptBudgetList: {
-        totalStorage: 0
+    watch: {
+      vesselId(val) {
+        this.getVesselData()
       },
-      options_: regionData,
-      heightData: '600px',
-      zoom: 7,
-      selectedOptions: [],
-      center: [116.244694, 39.517344],
-      window: '',
-      radio: 1,
-      personCharge: [],
-      district: null,
-      driverList: [],
-      readonly: true,
-      fileTemp: {},
-      listDate: { country: '中国', level: 'country', city: '' },
-      citylist: [],
-      compId: sessionStorage.getItem('ws-pf_compId'),
-      rules: {
-        warehouseName: [
-          {
-            required: true,
-            message: '请输入仓库名称',
-            trigger: 'blur'
-          },
-          {
-            min: 2,
-            max: 20,
-            message: '仓库名长度不符合要求，请输入2-20字符之内',
-            trigger: 'blur'
-          }
-        ]
-      },
-      tranType: 1,
-      size: 10,
-      value1: '',
-      unitList: [],
+      isShow(val) {
+        this.showType = val
+      }
+    },
+    data() {
+      return {
+        excelFreightspace: [],
+        deptBudgetList: {
+          totalStorage: 0
+        },
+        options_: regionData,
+        heightData: '600px',
+        zoom: 7,
+        selectedOptions: [],
+        center: [116.244694, 39.517344],
+        window: '',
+        radio: 1,
+        personCharge: [],
+        district: null,
+        driverList: [],
+        readonly: true,
+        fileTemp: {},
+        listDate: {
+          country: '中国',
+          level: 'country',
+          city: ''
+        },
+        citylist: [],
+        compId: sessionStorage.getItem('ws-pf_compId'),
+        rules: {
+          warehouseName: [{
+              required: true,
+              message: '请输入仓库名称',
+              trigger: 'blur'
+            },
+            {
+              min: 2,
+              max: 20,
+              message: '仓库名长度不符合要求，请输入2-20字符之内',
+              trigger: 'blur'
+            }
+          ]
+        },
+        tranType: 1,
+        size: 10,
+        value1: '',
+        unitList: [],
 
-      freightspace1: [
-        {
+        freightspace1: [{
           accountTypeFlag: '1',
           payeeName: '',
           payeeNumberCard: '',
@@ -368,872 +289,966 @@ export default {
           bankDeposit: '',
           addressUrlArray: [],
           bankCard: ''
-        }
-      ],
-      freightspace: [
-        {
-          driver: '',
-          driverPhone: '',
-          carNo: '',
-          loadNetWeight: '',
-          loadPoundImg: null
-        }
-        // {loadPoundImg:{}},
-      ],
-      name: '',
-      staffList: [],
-      options: [],
-      carModel: [],
-      tranCarInfoList: {
-        loadPoundImg: ''
-      },
-      localFile:'',
-      //上传
+        }],
+        freightspace: [{
+            driver: '',
+            driverPhone: '',
+            carNo: '',
+            loadNetWeight: '',
+            loadPoundImg: null
+          }
+          // {loadPoundImg:{}},
+        ],
+        name: '',
+        staffList: [],
+        options: [],
+        carModel: [],
+        tranCarInfoList: {
+          loadPoundImg: ''
+        },
+        localFile: '',
+        //上传
 
-      accessoryTFs: false,
-      fileList: [],
-      appendixIdsAdd: '',
-      messageAddEventListener: ''
-    }
-  },
-  activated() {
-    this.deptBudgetList.id = this.$route.query.id
-    this.getList()
-  },
-  mounted() {
-    window.noMessege = this.noMessege
-  },
-  computed: {
-    totalStorage: function() {
-      var maxStorage = 0
-      for (var i = 0; i < this.freightspace.length; i++) {
-        maxStorage += Number(this.freightspace[i].maxStorage)
+        accessoryTFs: false,
+        fileList: [],
+        appendixIdsAdd: '',
+        messageAddEventListener: ''
       }
-      return maxStorage
     },
-    total: function() {
-      if (this.deptBudgetList.tranCarInfoList != null) {
+    activated() {
+      this.deptBudgetList.id = this.$route.query.id
+      this.getList()
+    },
+    mounted() {
+      window.noMessege = this.noMessege
+    },
+    computed: {
+      totalStorage: function() {
         var maxStorage = 0
-        for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
-          maxStorage += Number(
-            this.deptBudgetList.tranCarInfoList[i].loadNetWeight
-          )
+        for (var i = 0; i < this.freightspace.length; i++) {
+          maxStorage += Number(this.freightspace[i].maxStorage)
         }
         return maxStorage
-      } else {
-        return 0
+      },
+      total: function() {
+        if (this.deptBudgetList.tranCarInfoList != null) {
+          var maxStorage = 0
+          for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
+            maxStorage += Number(
+              this.deptBudgetList.tranCarInfoList[i].loadNetWeight
+            )
+          }
+          return maxStorage
+        } else {
+          return 0
+        }
       }
-    }
-  },
-  methods: {
-    uploadHandle(response, file, fileList){
-      this.localFile=file.raw  // 或者 this.localFile=file.raw
-let Base64 = require('js-base64').Base64
-                    // 转换操作可以不放到这个函数里面，
-                    // 因为这个函数会被多次触发，上传时触发，上传成功也触发
-                    let reader = new FileReader()
-                    reader.readAsDataURL(this.localFile);// 这里也可以直接写参数event.raw
-                      
-                    // 转换成功后的操作，reader.result即为转换后的DataURL ，
-                    // 它不需要自己定义，你可以console.log(reader.result)看一下
-                    reader.onload=()=>{
-                      console.log(reader.result)
-                    }
+    },
+    methods: {
+      preview(item) {
+				this.accessoryTFs = true
+				this.appendixIdss = item.loadPoundImg
+			},
 
+      uploadHandle(response, file, fileList) {
+        this.localFile = file.raw // 或者 this.localFile=file.raw
+        let Base64 = require('js-base64').Base64
+        // 转换操作可以不放到这个函数里面，
+        // 因为这个函数会被多次触发，上传时触发，上传成功也触发
+        let reader = new FileReader()
+        reader.readAsDataURL(this.localFile); // 这里也可以直接写参数event.raw
 
-    },
-    handleChange(file, fileList) {
-            this.fileTemp = file.raw
-                let fileName = file.raw.name
-                let fileType = fileName.substring(fileName.lastIndexOf('.') + 1);
-                // 判断上传文件格式
-                if (this.fileTemp) {
-                    if ((fileType == 'xlsx') || (fileType == 'xls')) {
-                        this.importf(this.fileTemp)
-                    } else {
-                        this.$message({
-                            type: 'warning',
-                            message: '附件格式错误，请删除后重新上传！'
-                        })
-                    }
-                } else {
-                    this.$message({
-                        type: 'warning',
-                        message: '请上传附件！'
-                    })
-                }
+        // 转换成功后的操作，reader.result即为转换后的DataURL ，
+        // 它不需要自己定义，你可以console.log(reader.result)看一下
+        reader.onload = () => {
+          console.log(reader.result)
+        }
 
-    },
- importf(obj) {
-                this.dialogVisible = true;
-                let _this = this;
-                let inputDOM = this.$refs.inputer;   // 通过DOM取文件数据
-                this.file = event.currentTarget.files[0];
-                var rABS = false; //是否将文件读取为二进制字符串
-                var f = this.file;
-                var reader = new FileReader();
-                //if (!FileReader.prototype.readAsBinaryString) {
-                FileReader.prototype.readAsBinaryString = function (f) {
-                    var binary = "";
-                    var rABS = false; //是否将文件读取为二进制字符串
-                    var pt = this;
-                    var wb; //读取完成的数据
-                    var outdata;
-                    var reader = new FileReader();
-                    reader.onload = function (e) {
-                        var bytes = new Uint8Array(reader.result);
-                        var length = bytes.byteLength;
-                        for (var i = 0; i < length; i++) {
-                            binary += String.fromCharCode(bytes[i]);
-                        }
-                        var XLSX = require('xlsx');
-                        if (rABS) {
-                            wb = XLSX.read(btoa(fixdata(binary)), { //手动转化
-                                type: 'base64'
-                            });
-                        } else {
-                            wb = XLSX.read(binary, {
-                                type: 'binary'
-                            });
-                        }
-                        // outdata就是你想要的东西 excel导入的数据
-                        outdata = XLSX.utils.sheet_to_json(wb.Sheets[wb.SheetNames[0]]);
-                        // excel 数据再处理
-                        let arr = []
-                        outdata.map(v => {
-                            // let jsonString = JSON.stringify(v).replace(/\*/g, '').replace(/\s/ig,'');
-                            let jsonString = JSON.stringify(v).replace(/\//g, '').replace(/\s/ig,'');
-                            console.log(jsonString);
-                            v = JSON.parse(jsonString);
-                            let obj = {}
-                            //xxx代表列名
-                            obj.temporaryDriverFlag = v.临时司机标识
-                            obj.caseNo= v.箱号
-                            obj.titleNo= v.封号
-                            obj.driverPhone = v.司机电话
-                            obj.driver=v.司机姓名
-                            obj.loadNetWeight = v.装车净重
-                            obj.loadingDate = toString(v.装车日期)
-                            obj.status= v.状态
-                            obj.carNo = v.车牌号
-                            obj.unloadPoundImg = v.磅单
-                            console.log(obj)
-                            _this.freightspace.push(obj)
-                        })
-                        // _this.freightspace.concat(arr)
-                        console.log(arr,_this.freightspace)
-                    }
-                    reader.readAsArrayBuffer(f);
-                }
-                if (rABS) {
-                    reader.readAsArrayBuffer(f);
-                } else {
-                    reader.readAsBinaryString(f);
-                }
-                console.log(reader)
-            },
-    beforeUpload(file){
-          if(window.createObjectURL!=undefined){
-            this.fileName = window.createObjectURL(file)
-          }else if(window.URL!=undefined){
-            this.fileName = window.URL.createObjectURL(file)
-          }else if (window.webkitURL!=undefined){
-            this.fileName = window.webkitURL.createObjectURL(file)
-          }
-          console.log(this.fileName)
-        },
-    uploadSuccessHandle(e) {
-      console.log(e)
-      importApplFileUrl({ file: e.url })
-        .toPromise()
-        .then(response => {
-          console.log(response)
-        })
-    },
-    dataFilter(val) {
-      this.deptBudgetList.personCharge = val
-      if (val) {
-        this.options = this.staffList.filter(item => {
-          if (
-            !!~item.staffName.indexOf(val) ||
-            !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
-          ) {
-            return true
+
+      },
+      handleChange(file, fileList) {
+        this.fileTemp = file.raw
+        let fileName = file.raw.name
+        let fileType = fileName.substring(fileName.lastIndexOf('.') + 1);
+        // 判断上传文件格式
+        if (this.fileTemp) {
+          if ((fileType == 'xlsx') || (fileType == 'xls')) {
+            this.importf(this.fileTemp)
+          } else {
+            this.$message({
+              type: 'warning',
+              message: '附件格式错误，请删除后重新上传！'
+            })
           }
-        })
-      } else {
-        this.options = this.staffList
-      }
-    },
-    selectstaff(e) {
-      for (var i = 0; i < this.staffList.length; i++) {
-        if (this.staffList[i].staffName == e) {
-          this.deptBudgetList.driverPhone = this.staffList[i].staffMobilePhone
-          this.freightspace[i].driverPhone = this.staffList[i].staffMobilePhone
-          this.deptBudgetList.personChargeKey = this.staffList[i].staffId
+        } else {
+          this.$message({
+            type: 'warning',
+            message: '请上传附件！'
+          })
         }
-      }
-    },
-    marker: function(item) {
-      this.deptBudgetList.warehousePositioning =
-        item.lnglat.lat + ',' + item.lnglat.lng
-    },
-    selectedAddress(e) {
-      this.deptBudgetList.warehousePositioning =
-        e.center.lat + ',' + e.center.lng
-    },
-    confirmPositioncity() {
-      this.listDate.level = 'city'
-      this.listDate.country = this.name
-    },
-    // 关闭 dialog时 处理文件url 初始化upload组件
-    handleClose() {
-      this.dialogViewSpareMoney = false
-    },
-    add() {
-      this.freightspace.push({
-        driver: '',
-        driverPhone: '',
-        carNo: '',
-        loadNetWeight: ''
-      })
-    },
-    del(index) {
-      if (this.freightspace.length > 1) {
-        this.freightspace.splice(index, 1)
-      }
-    },
-    //下拉司机姓名改变事件
-    selectdriver() {},
-
-    returnsales() {
-      this.deptBudgetList = {}
-      this.freightspace = {}
-      this.selectedOptions = ''
-      this.deptBudgetList.tranCarInfoList = []
-      this.$router.push({ path: 'tranManagementTransporHairRespond' })
-    },
-    // 上传附件
-    uploadSuccess(data, files, url) {
-      console.log(data, files, url)
-    },
-    handleClose() {
-      this.accessoryTFs = false
-    },
-    //导入
-    import() {},
-    finished() {
-      this.$confirm(`完货操作后，装车信息不可修改，是否确定完货？`, {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          this.$refs.deptBudgetList.validate(valid => {
-            if (valid) {
-              var tranProcessInfo = {}
-              tranProcessInfo.id = this.deptBudgetList.id
-              state(tranProcessInfo)
-                .toPromise()
-                .then(response => {
-                  this.$message.success('完货成功')
-                  this.deptBudgetList = {}
-                  this.freightspace = {}
-                  this.selectedOptions = ''
-                  this.$router.push({
-                    path: 'tranManagementTransporHairRespond'
-                  })
-                })
+
+      },
+      importf(obj) {
+        this.excelFreightspace = []
+        this.dialogVisible = true;
+        let _this = this;
+        let inputDOM = this.$refs.inputer; // 通过DOM取文件数据
+        this.file = event.currentTarget.files[0];
+        var rABS = false; //是否将文件读取为二进制字符串
+        var f = this.file;
+        var reader = new FileReader();
+        //if (!FileReader.prototype.readAsBinaryString) {
+        FileReader.prototype.readAsBinaryString = function(f) {
+          var binary = "";
+          var rABS = false; //是否将文件读取为二进制字符串
+          var pt = this;
+          var wb; //读取完成的数据
+          var outdata;
+          var reader = new FileReader();
+          reader.onload = function(e) {
+            var bytes = new Uint8Array(reader.result);
+            var length = bytes.byteLength;
+            for (var i = 0; i < length; i++) {
+              binary += String.fromCharCode(bytes[i]);
+            }
+            var XLSX = require('xlsx');
+            if (rABS) {
+              wb = XLSX.read(btoa(fixdata(binary)), { //手动转化
+                type: 'base64',
+                cellDates: true
+              });
             } else {
-              return false
+              wb = XLSX.read(binary, {
+                type: 'binary'
+              });
             }
-          })
-        })
-        .catch(() => {
-          return false
-        })
-    },
-    noMessege() {
-      sessionStorage.setItem('qy-msg',"true")
-    },
-    validateFunc() {
-      this.$refs.deptBudgetList.validate(valid => {
-        if (valid) {
-          // this.deptBudgetList.totalStorage = this.totalStorage
-          this.tranCarInfoList = this.freightspace
-          this.tranCarInfoList.driver = this.deptBudgetList.driver
-          this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
-          this.tranCarInfoList.tranCarNo = this.deptBudgetList.tranCarNo
-          this.tranCarInfoList.carNo = this.deptBudgetList.carNo
-          this.tranCarInfoList.loadNetWeight = this.deptBudgetList.loadNetWeight
-          this.tranCarInfoList.tranType = this.tranType
-          this.tranCarInfoList.loadPoundImg = this.deptBudgetList.loadPoundImg
-          // this.tranCarInfoList.boxNo = this.arr.toString()
-          for (var i = 0; i < this.tranCarInfoList.length; i++) {
-            this.tranCarInfoList[i].id = this.freightspace[i].id
-            if (this.tranCarInfoList[i].temporaryDriverFlag != 0) {
-              this.tranCarInfoList[i].temporaryDriverFlag = 1
-              this.tranCarInfoList[i].tranType = this.tranType
+            // outdata就是你想要的东西 excel导入的数据
+            outdata = XLSX.utils.sheet_to_json(wb.Sheets[wb.SheetNames[0]]);
+            // excel 数据再处理
+            let arr = []
+            outdata.map(v => {
+              // let jsonString = JSON.stringify(v).replace(/\*/g, '').replace(/\s/ig,'');
+              let jsonString = JSON.stringify(v).replace(/\//g, '').replace(/\s/ig, '');
+              console.log(jsonString);
+              v = JSON.parse(jsonString);
+              let obj = {}
+              //xxx代表列名
+              obj.caseNo = v.箱号
+              obj.titleNo = v.封号
+              obj.driverPhone = v.司机电话
+              obj.driver = v.姓名
+              obj.loadNetWeight = v.装车净重
+              obj.sendDateStart = v.装车日期
+              obj.status = v.状态
+              obj.carNo = v.车牌号
+              obj.loadPoundImg = v.磅单
+              console.log(obj)
+              _this.excelFreightspace.push(obj)
+            })
+            let _ispushData = true
+            // _this.freightspace.concat(arr)
+            console.log(arr, _this.freightspace)
+            for (let i = 0; i < _this.excelFreightspace.length; i++) {
+              _ispushData = true
+              for (let k = 0; k < _this.freightspace.length; k++) {
+                if (_this.excelFreightspace[i].driverPhone == _this.freightspace[k].driverPhone) {
+                  _this.freightspace[k] = _this.excelFreightspace[i]
+                  _ispushData = false
+                }
+              }
+              if (_ispushData) {
+                _this.freightspace.push(_this.excelFreightspace[i])
+                _ispushData = true
+              }
             }
           }
-          var tranProcessInfo = {}
-          tranProcessInfo.id = this.deptBudgetList.id
-          tranProcessInfo.infoId = this.deptBudgetList.infoId
-          tranProcessInfo.processNo = this.deptBudgetList.processNo
-          tranProcessInfo.tranPrice = this.deptBudgetList.tranPrice
-          tranProcessInfo.tranCarInfoList = this.tranCarInfoList
-          // dispatchCat({tranCarInfo:{tranCarInfoList:[this.tranCarInfoList],id:this.deptBudgetList.id}
-          feedback(tranProcessInfo)
-            .toPromise()
-            .then(response => {
-              this.$message.success('提交成功')
-              this.deptBudgetList = {}
-              this.freightspace = {}
-              this.selectedOptions = ''
-              this.$router.push({
-                path: 'tranManagementTransporHairRespond'
-              })
-            })
+          reader.readAsArrayBuffer(f);
+        }
+        if (rABS) {
+          reader.readAsArrayBuffer(f);
         } else {
-          // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
-          return false
+          reader.readAsBinaryString(f);
         }
-      })
-    },
-    submit() {
-      for (var i = 0; i < this.freightspace.length; i++) {
-        if (this.freightspace[i].temporaryDriverFlag != 0) {
-          if (!this.freightspace[i].driver) {
-            this.$message({
-              message: '司机姓名不能为空！',
-              type: 'warning'
-            })
-            return
-          }
-          if (!this.freightspace[i].driverPhone) {
-            this.$message({
-              message: '司机电话不能为空！',
-              type: 'warning'
-            })
-            return
-          }
-          if (!this.freightspace[i].carNo) {
-            this.$message({
-              message: '车牌号不能为空！',
-              type: 'warning'
-            })
-            return
-          }
-          if (!this.freightspace[i].loadNetWeight) {
-            this.$message({
-              message: '装载净重不能为空！',
-              type: 'warning'
-            })
-            return
+        console.log(reader)
+      },
+      beforeUpload(file) {
+        if (window.createObjectURL != undefined) {
+          this.fileName = window.createObjectURL(file)
+        } else if (window.URL != undefined) {
+          this.fileName = window.URL.createObjectURL(file)
+        } else if (window.webkitURL != undefined) {
+          this.fileName = window.webkitURL.createObjectURL(file)
+        }
+        console.log(this.fileName)
+      },
+      uploadSuccessHandle(e) {
+        console.log(e)
+        importApplFileUrl({
+            file: e.url
+          })
+          .toPromise()
+          .then(response => {
+            console.log(response)
+          })
+      },
+      dataFilter(val) {
+        this.deptBudgetList.personCharge = val
+        if (val) {
+          this.options = this.staffList.filter(item => {
+            if (
+              !!~item.staffName.indexOf(val) ||
+              !!~item.staffName.toUpperCase().indexOf(val.toUpperCase())
+            ) {
+              return true
+            }
+          })
+        } else {
+          this.options = this.staffList
+        }
+      },
+      selectstaff(e) {
+        for (var i = 0; i < this.staffList.length; i++) {
+          if (this.staffList[i].staffName == e) {
+            this.deptBudgetList.driverPhone = this.staffList[i].staffMobilePhone
+            this.freightspace[i].driverPhone = this.staffList[i].staffMobilePhone
+            this.deptBudgetList.personChargeKey = this.staffList[i].staffId
           }
         }
-      }
-      if (sessionStorage.getItem('qy-msg')) {
-        this.validateFunc()
-      } else {
-        this.$alert(
-          '<div><strong>提交成功后提醒司机及时签订运输合同，确定提交装车信息？</strong><div style="display:flex;align-items: center;"><input id="noMsg" type="checkbox" onclick="window.noMessege(1)"><span style="margin-left:10px">不在提示</span><div></div>',
-          '',
-          {
-            dangerouslyUseHTMLString: true,
-            distinguishCancelAndClose: true,
-            showCancelButton: true,
+      },
+      marker: function(item) {
+        this.deptBudgetList.warehousePositioning =
+          item.lnglat.lat + ',' + item.lnglat.lng
+      },
+      selectedAddress(e) {
+        this.deptBudgetList.warehousePositioning =
+          e.center.lat + ',' + e.center.lng
+      },
+      confirmPositioncity() {
+        this.listDate.level = 'city'
+        this.listDate.country = this.name
+      },
+      // 关闭 dialog时 处理文件url 初始化upload组件
+      handleClose() {
+        this.dialogViewSpareMoney = false
+      },
+      add() {
+        this.freightspace.push({
+          driver: '',
+          driverPhone: '',
+          carNo: '',
+          loadNetWeight: ''
+        })
+      },
+      del(index) {
+        if (this.freightspace.length > 1) {
+          this.freightspace.splice(index, 1)
+        }
+      },
+      //下拉司机姓名改变事件
+      selectdriver() {},
+
+      returnsales() {
+        this.deptBudgetList = {}
+        this.freightspace = {}
+        this.selectedOptions = ''
+        this.deptBudgetList.tranCarInfoList = []
+        this.$router.push({
+          path: 'tranManagementTransporHairRespond'
+        })
+      },
+      // 上传附件
+      uploadSuccess(data, files, url) {
+        console.log(data, files, url)
+      },
+      handleClose() {
+        this.accessoryTFs = false
+      },
+      //导入
+      import() {},
+      finished() {
+        this.$confirm(`完货操作后，装车信息不可修改，是否确定完货？`, {
             confirmButtonText: '确定',
-            cancelButtonText: '取消'
-          }
-        )
+            cancelButtonText: '取消',
+            type: 'warning'
+          })
           .then(() => {
-            this.validateFunc()
+            this.$refs.deptBudgetList.validate(valid => {
+              if (valid) {
+                var tranProcessInfo = {}
+                tranProcessInfo.id = this.deptBudgetList.id
+                state(tranProcessInfo)
+                  .toPromise()
+                  .then(response => {
+                    this.$message.success('完货成功')
+                    this.deptBudgetList = {}
+                    this.freightspace = {}
+                    this.selectedOptions = ''
+                    this.$router.push({
+                      path: 'tranManagementTransporHairRespond'
+                    })
+                  })
+              } else {
+                return false
+              }
+            })
           })
           .catch(() => {
             return false
           })
-      }
-    },
-
-    resetForm(deptBudgetList) {
-      this.$refs[deptBudgetList].resetFields()
-    },
-    getList() {
-      seeCat({ id: this.deptBudgetList.id })
-        .toPromise()
-        .then(response => {
-          this.deptBudgetList = response
-          //  this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
-          this.freightspace = response.tranCarInfoList
-          for (var i = 0; i < this.freightspace.length; i++) {
-            if (!this.freightspace[i].loadNetWeight) {
-              this.freightspace[i].loadNetWeight = 0
+      },
+      noMessege() {
+        sessionStorage.setItem('qy-msg', "true")
+      },
+      validateFunc() {
+        this.$refs.deptBudgetList.validate(valid => {
+          if (valid) {
+            // this.deptBudgetList.totalStorage = this.totalStorage
+            this.tranCarInfoList = this.freightspace
+            this.tranCarInfoList.driver = this.deptBudgetList.driver
+            this.tranCarInfoList.driverPhone = this.deptBudgetList.driverPhone
+            this.tranCarInfoList.tranCarNo = this.deptBudgetList.tranCarNo
+            this.tranCarInfoList.carNo = this.deptBudgetList.carNo
+            this.tranCarInfoList.loadNetWeight = this.deptBudgetList.loadNetWeight
+            this.tranCarInfoList.tranType = this.tranType
+            this.tranCarInfoList.loadPoundImg = this.deptBudgetList.loadPoundImg
+            // this.tranCarInfoList.boxNo = this.arr.toString()
+            for (var i = 0; i < this.tranCarInfoList.length; i++) {
+              this.tranCarInfoList[i].id = this.freightspace[i].id
+              if (this.tranCarInfoList[i].temporaryDriverFlag != 0) {
+                this.tranCarInfoList[i].temporaryDriverFlag = 1
+                this.tranCarInfoList[i].tranType = this.tranType
+              }
             }
+            var tranProcessInfo = {}
+            tranProcessInfo.id = this.deptBudgetList.id
+            tranProcessInfo.infoId = this.deptBudgetList.infoId
+            tranProcessInfo.processNo = this.deptBudgetList.processNo
+            tranProcessInfo.tranPrice = this.deptBudgetList.tranPrice
+            tranProcessInfo.tranCarInfoList = this.tranCarInfoList
+            // dispatchCat({tranCarInfo:{tranCarInfoList:[this.tranCarInfoList],id:this.deptBudgetList.id}
+            feedback(tranProcessInfo)
+              .toPromise()
+              .then(response => {
+                this.$message.success('提交成功')
+                this.deptBudgetList = {}
+                this.freightspace = {}
+                this.selectedOptions = ''
+                this.$router.push({
+                  path: 'tranManagementTransporHairRespond'
+                })
+              })
+          } else {
+            // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
+            return false
           }
         })
-      //司机姓名下拉
-      getstaff({ compId: sessionStorage.getItem('ws-pf_compId') })
-        .toPromise()
-        .then(response => {
-          this.options = response
-          this.staffList = response
-        })
-      //车型
-      packList({ constId: 'TRAN5' })
-        .toPromise()
-        .then(response => {
-          this.carModel = response
-        })
-    },
-    handleExamine() {},
-    approve() {},
-    // returnsales() {
-    //   this.$router.push({ path: 'purchaseContract' })
-    // },
-    selectChapterTwo(e) {
-      for (var i = 0; i < this.ChapterTwoList.length; i++) {
-        if (this.ChapterTwoList[i].constValue == e) {
-          this.deptBudgetList.gradeKey = this.ChapterTwoList[i].constKey
+      },
+      submit() {
+        for (var i = 0; i < this.freightspace.length; i++) {
+          if (this.freightspace[i].temporaryDriverFlag != 0) {
+            if (!this.freightspace[i].driver) {
+              this.$message({
+                message: '司机姓名不能为空！',
+                type: 'warning'
+              })
+              return
+            }
+            if (!this.freightspace[i].driverPhone) {
+              this.$message({
+                message: '司机电话不能为空！',
+                type: 'warning'
+              })
+              return
+            }
+            if (!this.freightspace[i].carNo) {
+              this.$message({
+                message: '车牌号不能为空！',
+                type: 'warning'
+              })
+              return
+            }
+            if (!this.freightspace[i].loadNetWeight) {
+              this.$message({
+                message: '装载净重不能为空！',
+                type: 'warning'
+              })
+              return
+            }
+          }
         }
-      }
-    },
-    selectunitList(e) {
-      for (var i = 0; i < this.unitList.length; i++) {
-        if (this.unitList[i].constValue == e) {
-          this.deptBudgetList.acceptanceMethodKey = this.unitList[i].constKey
+        if (sessionStorage.getItem('qy-msg')) {
+          this.validateFunc()
+        } else {
+          this.$alert(
+              '<div><strong>提交成功后提醒司机及时签订运输合同，确定提交装车信息？</strong><div style="display:flex;align-items: center;"><input id="noMsg" type="checkbox" onclick="window.noMessege(1)"><span style="margin-left:10px">不在提示</span><div></div>',
+              '', {
+                dangerouslyUseHTMLString: true,
+                distinguishCancelAndClose: true,
+                showCancelButton: true,
+                confirmButtonText: '确定',
+                cancelButtonText: '取消'
+              }
+            )
+            .then(() => {
+              this.validateFunc()
+            })
+            .catch(() => {
+              return false
+            })
         }
-      }
-    },
-    selectgrade(e) {
-      for (var i = 0; i < this.gradeList.length; i++) {
-        if (this.gradeList[i].constValue == e) {
-          this.deptBudgetList.gradeKey = this.gradeList[i].constKey
+      },
+
+      resetForm(deptBudgetList) {
+        this.$refs[deptBudgetList].resetFields()
+      },
+      getList() {
+        seeCat({
+            id: this.deptBudgetList.id
+          })
+          .toPromise()
+          .then(response => {
+            this.deptBudgetList = response
+            //  this.deptBudgetList.tranCarInfoList = response.tranCarInfoList
+            this.freightspace = response.tranCarInfoList
+            for (var i = 0; i < this.freightspace.length; i++) {
+              if (!this.freightspace[i].loadNetWeight) {
+                this.freightspace[i].loadNetWeight = 0
+              }
+            }
+          })
+        //司机姓名下拉
+        getstaff({
+            compId: sessionStorage.getItem('ws-pf_compId')
+          })
+          .toPromise()
+          .then(response => {
+            this.options = response
+            this.staffList = response
+          })
+        //车型
+        packList({
+            constId: 'TRAN5'
+          })
+          .toPromise()
+          .then(response => {
+            this.carModel = response
+          })
+      },
+      handleExamine() {},
+      approve() {},
+      // returnsales() {
+      //   this.$router.push({ path: 'purchaseContract' })
+      // },
+      selectChapterTwo(e) {
+        for (var i = 0; i < this.ChapterTwoList.length; i++) {
+          if (this.ChapterTwoList[i].constValue == e) {
+            this.deptBudgetList.gradeKey = this.ChapterTwoList[i].constKey
+          }
         }
-      }
-    },
-    selectgoodsName(e) {
-      for (var i = 0; i < this.goodnameList.length; i++) {
-        if (this.goodnameList[i].constValue == e) {
-          this.deptBudgetList.goodsNameKey = this.goodnameList[i].constKey
+      },
+      selectunitList(e) {
+        for (var i = 0; i < this.unitList.length; i++) {
+          if (this.unitList[i].constValue == e) {
+            this.deptBudgetList.acceptanceMethodKey = this.unitList[i].constKey
+          }
         }
-      }
-    },
-    selectpackingMethod(e) {
-      for (var i = 0; i < this.packtypeList.length; i++) {
-        if (this.packtypeList[i].constValue == e) {
-          this.deptBudgetList.packingMethodKey = this.packtypeList[i].constKey
+      },
+      selectgrade(e) {
+        for (var i = 0; i < this.gradeList.length; i++) {
+          if (this.gradeList[i].constValue == e) {
+            this.deptBudgetList.gradeKey = this.gradeList[i].constKey
+          }
+        }
+      },
+      selectgoodsName(e) {
+        for (var i = 0; i < this.goodnameList.length; i++) {
+          if (this.goodnameList[i].constValue == e) {
+            this.deptBudgetList.goodsNameKey = this.goodnameList[i].constKey
+          }
         }
+      },
+      selectpackingMethod(e) {
+        for (var i = 0; i < this.packtypeList.length; i++) {
+          if (this.packtypeList[i].constValue == e) {
+            this.deptBudgetList.packingMethodKey = this.packtypeList[i].constKey
+          }
+        }
+      },
+      uploadSuccessHandle1(e, index) {
+        this.freightspace[index].loadPoundImg = e.url
       }
-    },
-    uploadSuccessHandle1(e, index) {
-      this.freightspace[index].loadPoundImg = e.url
     }
   }
-}
 </script>
 
 <style lang="scss" scoped>
-/deep/.totalStorage .el-input__inner {
-  color: #afb5cb;
-  background: #f5f7fa;
-}
-.small-title {
-  position: relative;
-  padding: 10px;
-  font-weight: 600;
-}
-.small-title::before {
-  position: absolute;
-  content: '';
-  display: block;
-  background: #5473e8;
-  width: 4px;
-  height: 14px;
-  left: 0px;
-  top: 13px;
-}
-.position {
-  position: relative;
-}
-
-.del {
-  position: absolute;
-  right: -38px;
-  top: 14px;
-  cursor: pointer;
-  right: 0;
-  display: inline-block;
-  font-size: 26px;
-  width: 26px;
-  height: 10px;
-  line-height: 0px;
-}
-
-.amap-page-container {
-  width: 300px;
-  height: 300px;
-}
-.el-form {
-  padding: 0 15%;
-}
-/deep/.ws-info-table .el-form-item {
-  border-right: 1px solid transparent;
-  border-bottom: 1px solid transparent;
-}
-.readonly {
-  position: relative;
-}
-.readonly:after {
-  content: '*';
-  color: #ff2727;
-  position: absolute;
-  right: 8px;
-  z-index: 10;
-  top: 21%;
-  font-size: 20px;
-}
-.title {
-  position: relative;
-}
-.title::before {
-  content: '';
-  display: inline-block;
-  width: 5px;
-  height: 30px;
-  background: #5473e8;
-  position: absolute;
-  left: 0;
-}
-.el-button--primary {
-  background-color: #5878e8;
-  border-color: #5878e8;
-}
-.el-col {
-  background: #f6f7fc;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  padding: 0 25px;
-  border-left: 1px solid transparent;
-  background: #fff;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  width: 100px;
-  text-align: center;
-  background: #fff;
-  // border: 1px solid #cdd2dc;
-}
-.button-container {
-  display: flex;
-  flex-wrap: nowrap;
-  justify-content: space-between;
-  align-items: center;
-  background-color: #fff;
-  width: 100%;
-  height: 50px;
-  padding: 0 10px;
-  & > div {
-    margin-left: 10px;
+  /deep/.totalStorage .el-input__inner {
+    color: #afb5cb;
+    background: #f5f7fa;
+  }
+
+  .small-title {
+    position: relative;
+    padding: 10px;
+    font-weight: 600;
+  }
+
+  .small-title::before {
+    position: absolute;
+    content: '';
+    display: block;
+    background: #5473e8;
+    width: 4px;
+    height: 14px;
+    left: 0px;
+    top: 13px;
+  }
+
+  .position {
+    position: relative;
+  }
+
+  .del {
+    position: absolute;
+    right: -38px;
+    top: 14px;
+    cursor: pointer;
+    right: 0;
+    display: inline-block;
+    font-size: 26px;
+    width: 26px;
+    height: 10px;
+    line-height: 0px;
+  }
+
+  .amap-page-container {
+    width: 300px;
+    height: 300px;
+  }
+
+  .el-form {
+    padding: 0 15%;
+  }
+
+  /deep/.ws-info-table .el-form-item {
+    border-right: 1px solid transparent;
+    border-bottom: 1px solid transparent;
+  }
+
+  .readonly {
+    position: relative;
+  }
+
+  .readonly:after {
+    content: '*';
+    color: #ff2727;
+    position: absolute;
+    right: 8px;
+    z-index: 10;
+    top: 21%;
+    font-size: 20px;
+  }
+
+  .title {
+    position: relative;
+  }
+
+  .title::before {
+    content: '';
+    display: inline-block;
+    width: 5px;
+    height: 30px;
+    background: #5473e8;
+    position: absolute;
+    left: 0;
+  }
+
+  .el-button--primary {
+    background-color: #5878e8;
+    border-color: #5878e8;
+  }
+
+  .el-col {
+    background: #f6f7fc;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__content {
+    padding: 0 25px;
+    border-left: 1px solid transparent;
+    background: #fff;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__label {
+    width: 100px;
+    text-align: center;
+    background: #fff;
+    // border: 1px solid #cdd2dc;
+  }
+
+  .button-container {
     display: flex;
     flex-wrap: nowrap;
-    flex-direction: row;
-    & > span {
-      line-height: 50px;
-    }
-  }
+    justify-content: space-between;
+    align-items: center;
+    background-color: #fff;
+    width: 100%;
+    height: 50px;
+    padding: 0 10px;
+
+    &>div {
+      margin-left: 10px;
+      display: flex;
+      flex-wrap: nowrap;
+      flex-direction: row;
 
-  /deep/.auditFlow-box {
-    position: unset;
-    margin-left: 10px;
-    &/deep/.auditFlow-icon {
-      width: auto;
-      padding-right: 5px;
+      &>span {
+        line-height: 50px;
+      }
     }
-    &/deep/.auditFlow-main {
-      position: absolute;
+
+    /deep/.auditFlow-box {
+      position: unset;
+      margin-left: 10px;
+
+      &/deep/.auditFlow-icon {
+        width: auto;
+        padding-right: 5px;
+      }
+
+      &/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;
+
+  .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;
-}
-.bg-left {
-  padding-left: 30px;
-}
-.bg-right {
-  padding-right: 2px;
-  text-align: right;
-}
-.bg-bottom {
-  margin: 15px 0px;
-}
-.wenzi {
-  width: 900px;
-  margin: 0 auto;
-}
-.wenzi h3 {
-  display: inline-block;
-  left: 10px;
-}
-.wenzi p {
-  display: inline-block;
-}
-.center {
-  width: 900px;
-  margin: 0 auto;
-}
-.el-form-item {
-  width: 50%;
-}
-.el-form-item__label {
-  text-align: center;
-}
-.ce {
-  width: 900px;
-  margin: 0 auto;
-}
-/*.crt-main .textarea /deep/ .el-form-item__label {*/
-/*  height: 82px;*/
-/*}*/
-// 控制select为只读的时候显示样式
-
-.hide-sel {
-  .el-input__inner {
-    border: 0px;
+
+  .collapse-bottom {
+    margin-bottom: 20px;
   }
-  .el-icon-arrow-up {
-    display: none;
+
+  .input-main .textarea .el-textarea__inner {
+    width: 100%;
+    z-index: 1;
   }
-  .el-textarea__inner {
-    background-color: #fff !important;
-    border: 0;
+
+  .bg-left {
+    padding-left: 30px;
+  }
+
+  .bg-right {
+    padding-right: 2px;
+    text-align: right;
+  }
+
+  .bg-bottom {
+    margin: 15px 0px;
+  }
+
+  .wenzi {
+    width: 900px;
+    margin: 0 auto;
+  }
+
+  .wenzi h3 {
+    display: inline-block;
+    left: 10px;
+  }
+
+  .wenzi p {
+    display: inline-block;
+  }
+
+  .center {
+    width: 900px;
+    margin: 0 auto;
+  }
+
+  .el-form-item {
+    width: 50%;
   }
-  .el-date-editor {
-    i {
+
+  .el-form-item__label {
+    text-align: center;
+  }
+
+  .ce {
+    width: 900px;
+    margin: 0 auto;
+  }
+
+  /*.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;
+      }
+    }
+
+    /deep/ .picker {
+      padding-right: 3px !important;
+    }
+
+    // .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;
+    //   }
+    // }
   }
-  /deep/ .picker {
-    padding-right: 3px !important;
+
+  // 控制select为只读的时候显示样式
+  /deep/.ws-class-table-col {
+    height: auto;
+    padding: 0px 2px;
+
+    /deep/.el-input__inner {
+      padding: 0px 2px;
+    }
   }
 
-  // .is-disabled {
-  //   .el-input__inner:hover {
-  //     background-color: #fff !important;
-  //     border: 0;
+  // /deep/.is-disabled {
+  //   .el-input__prefix,
+  //   .el-input__suffix {
+  //     display: none;
   //   }
-  //   color: #606266;
   //   .el-input__inner {
-  //     background-color: #fff !important;
-  //     border: 0;
-  //     color: #606266;
-  //   }
-  //   .el-textarea__inner {
-  //     background-color: #fff !important;
-  //     border: 0;
-  //     color: #606266;
+  //     background-color: #fff;
+  //     border-color: #fff !important;
+  //     color: #000 !important;
+  //     font-size: 14px;
+  //     cursor: text;
+  //     padding: 0 !important;
   //   }
   // }
-}
+  .winseaview-view {
+    padding: 0 0 20px;
+  }
 
-// 控制select为只读的时候显示样式
-/deep/.ws-class-table-col {
-  height: auto;
-  padding: 0px 2px;
-  /deep/.el-input__inner {
-    padding: 0px 2px;
+  .container {
+    overflow: scroll;
+    height: 93vh;
+  }
+
+  .ws-info-table .el-form-item {
+    width: 33.3333%;
+  }
+
+  .readonly:after {
+    display: none;
+  }
+
+  .el-textarea__inner {
+    display: none;
+  }
+
+  .el-form {
+    margin-top: 50px;
+  }
+
+  .readonly {
+    width: 16%;
+  }
+
+  //去边框
+  /deep/.el-form-item {
+    border-right: 0px;
+    border-bottom: 0px;
+  }
+
+  /deep/.ws-info-table {
+    border-left: 0px;
+    border-top: 0px;
+  }
+
+  .ws-info-table .el-form-item .el-form-item__content {
+    border: none;
+  }
+
+  /deep/.ws-info-table .el-form-item {
+    border: none;
+    height: 50px;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__content {
+    background: #f5f7fa;
+    border-radius: 4px;
+    border: 1px solid #d8dce6;
+    font-family: PingFangSC-Regular, PingFang SC;
+    margin-bottom: 5px;
+    background-color: #fff;
+    font-size: 14px;
+    font-weight: 400;
+    color: #8890b1;
+    line-height: 16px;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__label {
+    background-color: #fff;
+    font-size: 13px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #8890b1;
+    line-height: 16px;
+  }
+
+  /deep/.ws-info-table .el-form-item .el-form-item__content {
+    background: #f5f7fa;
+    border-radius: 4px;
+    border: 1px solid #d8dce6;
+  }
+
+  /deep/.flex .ws-info-table .el-form-item .el-form-item__content {
+    border: 0px;
+  }
+
+  //联络员及车次
+  /deep/.liaison .ws-info-table .el-form-item {
+    width: 19%;
+  }
+
+  /deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
+    width: 100px;
+    background: #f6f7fc;
+  }
+
+  /deep/.liaison .ws-info-table {
+    width: 100%;
+    background: #f6f7fc;
+    border-radius: 4px;
+    border: 1px solid #d8dce6;
+    margin-top: 20px;
+  }
+
+  .catNos {
+    width: 100%;
+    height: 30px;
+    margin-top: 10px;
+    margin-left: 20px;
+    font-size: 14px;
+  }
+
+  .catNosCor {
+    color: #5473e8;
+  }
+
+  .add {
+    width: 130px;
+    height: 34px;
+    background: #f6f7fb;
+    border-radius: 17px;
+    color: #5473e8;
+    font-size: 14px;
+    border: none;
+  }
+
+  .add img {
+    display: inline-block;
+    margin-top: 3px;
+    margin-left: -30px;
+  }
+
+  .add .spans {
+    display: table-caption;
+    width: 56px;
+    height: 20px;
+    line-height: 18px;
+  }
+
+  .signStatus {
+    height: 25px;
+    border-radius: 3px;
+    border: 1px solid #5473e8;
+    padding: 0 3px;
+    color: #ffffff;
+    background: #c4cada;
+    line-height: 24px;
+    margin-left: 18px;
+  }
+
+  .signStatus1 {
+    height: 25px;
+    background: #e6ebff;
+    border-radius: 3px;
+    border: 1px solid #5473e8;
+    padding: 0 3px;
+    margin-left: 18px;
+    color: #5473e8;
+    line-height: 24px;
+  }
+
+  .line {
+    height: 26px;
+    margin-top: 6px;
+    left: 2px;
+  }
+
+  //送达/未送达
+  .noservice,
+  .service {
+    display: inline-block;
+    border-radius: 4px;
+    border: 1px solid #d8dce6;
+    padding: 2px;
+    font-size: 12px;
+  }
+
+  .noservice {
+    background: #c4cada;
+    color: #ffffff;
+  }
+
+  .service {
+    background: #e5f1f7;
+    color: #50cad4;
+  }
+
+  /deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
+    padding: 0px;
   }
-}
-// /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;
-//   }
-// }
-.winseaview-view {
-  padding: 0 0 20px;
-}
-.container {
-  overflow: scroll;
-  height: 93vh;
-}
-.ws-info-table .el-form-item {
-  width: 33.3333%;
-}
-.readonly:after {
-  display: none;
-}
-.el-textarea__inner {
-  display: none;
-}
-.el-form {
-  margin-top: 50px;
-}
-.readonly {
-  width: 16%;
-}
-
-//去边框
-/deep/.el-form-item {
-  border-right: 0px;
-  border-bottom: 0px;
-}
-/deep/.ws-info-table {
-  border-left: 0px;
-  border-top: 0px;
-}
-.ws-info-table .el-form-item .el-form-item__content {
-  border: none;
-}
-/deep/.ws-info-table .el-form-item {
-  border: none;
-  height: 50px;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  background: #f5f7fa;
-  border-radius: 4px;
-  border: 1px solid #d8dce6;
-  font-family: PingFangSC-Regular, PingFang SC;
-  margin-bottom: 5px;
-  background-color: #fff;
-  font-size: 14px;
-  font-weight: 400;
-  color: #8890b1;
-  line-height: 16px;
-}
-/deep/.ws-info-table .el-form-item .el-form-item__label {
-  background-color: #fff;
-  font-size: 13px;
-  font-family: PingFangSC-Regular, PingFang SC;
-  font-weight: 400;
-  color: #8890b1;
-  line-height: 16px;
-}
-
-/deep/.ws-info-table .el-form-item .el-form-item__content {
-  background: #f5f7fa;
-  border-radius: 4px;
-  border: 1px solid #d8dce6;
-}
-/deep/.flex .ws-info-table .el-form-item .el-form-item__content {
-  border: 0px;
-}
-//联络员及车次
-/deep/.liaison .ws-info-table .el-form-item {
-  width: 19%;
-}
-/deep/.liaison .ws-info-table .el-form-item .el-form-item__label {
-  width: 50%;
-  background: #f6f7fc;
-}
-/deep/.liaison .ws-info-table {
-  width:100%;
-  background: #f6f7fc;
-  border-radius: 4px;
-  border: 1px solid #d8dce6;
-  margin-top: 20px;
-}
-.catNos {
-  width: 100%;
-  height: 30px;
-  margin-top: 10px;
-  margin-left: 20px;
-  font-size: 14px;
-}
-.catNosCor {
-  color: #5473e8;
-}
-.add {
-  width: 130px;
-  height: 34px;
-  background: #f6f7fb;
-  border-radius: 17px;
-  color: #5473e8;
-  font-size: 14px;
-  border: none;
-}
-.add img {
-  display: inline-block;
-  margin-top: 3px;
-  margin-left: -30px;
-}
-.add .spans {
-  display: table-caption;
-  width: 56px;
-  height: 20px;
-  line-height: 18px;
-}
-.signStatus {
-  height: 25px;
-  border-radius: 3px;
-  border: 1px solid #5473e8;
-  padding: 0 3px;
-  color: #ffffff;
-  background: #c4cada;
-  line-height: 24px;
-  margin-left: 18px;
-}
-.signStatus1 {
-  height: 25px;
-  background: #e6ebff;
-  border-radius: 3px;
-  border: 1px solid #5473e8;
-  padding: 0 3px;
-  margin-left: 18px;
-  color: #5473e8;
-  line-height: 24px;
-}
-.line {
-  height: 26px;
-  margin-top: 6px;
-  left: 2px;
-}
-//送达/未送达
-.noservice,
-.service {
-  display: inline-block;
-  border-radius: 4px;
-  border: 1px solid #d8dce6;
-  padding: 2px;
-  font-size: 12px;
-}
-.noservice {
-  background: #c4cada;
-  color: #ffffff;
-}
-.service {
-  background: #e5f1f7;
-  color: #50cad4;
-}
-/deep/.liaison .ws-info-table .el-form-item .el-form-item__content {
-  padding: 0px;
-}
-</style>
+</style>

src/views/tranManagement/tranManagementTransporHairRespond.vue

@@ -92,7 +92,7 @@
             <span v-else>{{ scope.$index + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="processNo" label="运输任务编号">
+        <el-table-column prop="processNo" label="运输任务编号" width="140">
         </el-table-column>
         <el-table-column prop="tranType" label="运输方式"> </el-table-column>
         <el-table-column prop="goodsName" label="货名"> </el-table-column>
@@ -165,7 +165,7 @@
         </el-table-column>
         <el-table-column prop="createDate" class="table_td" label="接单时间" width="90">
         </el-table-column>
-        <el-table-column prop="seller" label="操作" width="200">
+        <el-table-column prop="seller" label="操作" width="160">
           <template slot-scope="scope">
             <template v-if="scope.row.feedbackStatus != '已完货'">
               <div class="record" @click="trainSee(scope.row)">查看</div>