From 7fb0a8f0ab16c149484bf043754cd10cfa94de2f Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期一, 19 一月 2026 14:48:05 +0800
Subject: [PATCH] 增加了业务员，保管员和验收员的对应的显示
---
src/views/ICMO/ScICMOBillList.vue | 705 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 515 insertions(+), 190 deletions(-)
diff --git a/src/views/ICMO/ScICMOBillList.vue b/src/views/ICMO/ScICMOBillList.vue
index 2ba18c5..2c9388c 100644
--- a/src/views/ICMO/ScICMOBillList.vue
+++ b/src/views/ICMO/ScICMOBillList.vue
@@ -1,6 +1,13 @@
<template>
- <div style="padding: 10px;position: relative;">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="78px" class="searchBox">
+ <div style="padding: 10px; position: relative;">
+ <el-form
+ :model="queryParams"
+ ref="queryForm"
+ size="small"
+ :inline="true"
+ label-width="78px"
+ class="searchBox"
+ >
<el-row>
<el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px">
<el-date-picker
@@ -8,6 +15,8 @@
type="date"
placeholder="寮�濮嬫棩鏈�"
style="width: 150px"
+ :disabled="queryParams.HInitTimeCycle != -1"
+ value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
@@ -17,93 +26,142 @@
type="date"
placeholder="缁撴潫鏃ユ湡"
style="width: 150px"
+ :disabled="queryParams.HInitTimeCycle != -1"
+ value-format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
<el-form-item label="鏃ユ湡闂撮殧">
- <el-select v-model="queryParams.HInitTimeCycle" placeholder="璇烽�夋嫨" @change="riqiChange">
- <el-option v-for="(item, index) in rqsgList" :key="index" :label="item.label" :value="item.value">
+ <el-select
+ v-model="queryParams.HInitTimeCycle"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ >
+ <el-option
+ v-for="(item, index) in rqsgList"
+ :key="index"
+ :label="item.label"
+ :value="item.value"
+ >
</el-option>
</el-select>
</el-form-item>
<el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
- <el-input v-model="queryParams.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" @keyup.enter.native="handleQuery" />
+ <el-input
+ v-model="queryParams.HBillNo"
+ placeholder="璇疯緭鍏ュ崟鎹彿"
+ @keyup.enter.native="handleQuery"
+ />
</el-form-item>
<el-form-item label="缁勭粐">
- <el-select v-model="queryParams.HOrgID" placeholder="璇烽�夋嫨" class="ForFilteringSchemes">
- <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name"
- :value="item.ID.toString()">
+ <el-select
+ v-model="queryParams.HOrgID"
+ placeholder="璇烽�夋嫨"
+ class="ForFilteringSchemes"
+ >
+ <el-option
+ v-for="(item, index) in organizationList"
+ :key="index"
+ :label="item.Name"
+ :value="item.ID.toString()"
+ >
</el-option>
</el-select>
</el-form-item>
<el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
- <el-input v-model="queryParams.HBillNo" placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�" @keyup.enter.native="handleQuery" />
+ <el-input
+ v-model="queryParams.HBillNo"
+ placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�"
+ @keyup.enter.native="handleQuery"
+ />
</el-form-item>
<el-form-item label="涓氬姟鐘舵��" prop="HStatus">
<el-select v-model="queryParams.HStatus" placeholder="璇烽�夋嫨涓氬姟鐘舵��">
- <el-option :label="item.label" :value="item.value" :key="index" v-for="(item, index) in [
- {
- label: '寮�宸�',
- value: '寮�宸�',
- },
- {
- label: '璁″垝',
- value: '璁″垝',
- },
- {
- label: '璁″垝纭',
- value: '璁″垝纭',
- },
- {
- label: '涓嬭揪',
- value: '涓嬭揪',
- },
- {
- label: '鍏ㄩ儴',
- value: '0',
- },
- {
- label: '瀹屽伐',
- value: '瀹屽伐',
- },
- {
- label: '缁撴',
- value: '缁撴',
- },
- ]"></el-option>
+ <el-option
+ :label="item.label"
+ :value="item.value"
+ :key="index"
+ v-for="(item, index) in [
+ {
+ label: '寮�宸�',
+ value: '寮�宸�',
+ },
+ {
+ label: '璁″垝',
+ value: '璁″垝',
+ },
+ {
+ label: '璁″垝纭',
+ value: '璁″垝纭',
+ },
+ {
+ label: '涓嬭揪',
+ value: '涓嬭揪',
+ },
+ {
+ label: '鍏ㄩ儴',
+ value: '0',
+ },
+ {
+ label: '瀹屽伐',
+ value: '瀹屽伐',
+ },
+ {
+ label: '缁撴',
+ value: '缁撴',
+ },
+ ]"
+ ></el-option>
</el-select>
</el-form-item>
<el-form-item label="鏄惁涓嬫帹鐢熸垚娴佽浆鍗�" prop="HSF" label-width="180px">
<el-select v-model="queryParams.HSF">
- <el-option :label="item.label" :value="item.value" :key="item.label" v-for="item in [
- {
- label: '鍏ㄩ儴',
- value: '鍏ㄩ儴',
- },
- {
- label: '宸蹭笅鎺�',
- value: '宸蹭笅鎺�',
- },
- {
- label: '鏈笅鎺�',
- value: '鏈笅鎺�',
- },
- ]"></el-option>
+ <el-option
+ :label="item.label"
+ :value="item.value"
+ :key="item.label"
+ v-for="item in [
+ {
+ label: '鍏ㄩ儴',
+ value: '鍏ㄩ儴',
+ },
+ {
+ label: '宸蹭笅鎺�',
+ value: '宸蹭笅鎺�',
+ },
+ {
+ label: '鏈笅鎺�',
+ value: '鏈笅鎺�',
+ },
+ ]"
+ ></el-option>
</el-select>
</el-form-item>
<el-form-item label="瑙勬牸鍨嬪彿" prop="HModel">
- <el-input v-model="queryParams.HModel" placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�" @keyup.enter.native="handleQuery" />
+ <el-input
+ v-model="queryParams.HModel"
+ placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�"
+ @keyup.enter.native="handleQuery"
+ />
</el-form-item>
<el-form-item label="椤圭洰鍙�" prop="HProject">
<el-select v-model="queryParams.HProject">
- <el-option :label="item.label" :value="item.value" :key="item.label"
- v-for="item in HProjectList"></el-option>
+ <el-option
+ :label="item.label"
+ :value="item.value"
+ :key="item.label"
+ v-for="item in HProjectList"
+ ></el-option>
</el-select>
</el-form-item>
<el-form-item label="鐢熶骇杞﹂棿" prop="HDeptName">
<el-select v-model="queryParams.HDeptName">
- <el-option :label="item.label" :value="item.value" :key="item.label"
- v-for="item in HDeptNameList"></el-option>
+ <el-option
+ :label="item.label"
+ :value="item.value"
+ :key="item.label"
+ v-for="item in HDeptNameList"
+ ></el-option>
</el-select>
</el-form-item>
</el-row>
@@ -111,13 +169,25 @@
<el-collapse v-model="activeSeach">
<el-collapse-item title="鏇村" name="1">
<el-form-item label="鍗曟嵁绫诲瀷" prop="HBillType">
- <el-input v-model="queryParams.HBillType" placeholder="璇疯緭鍏ュ崟鎹被鍨�" @keyup.enter.native="handleQuery" />
+ <el-input
+ v-model="queryParams.HBillType"
+ placeholder="璇疯緭鍏ュ崟鎹被鍨�"
+ @keyup.enter.native="handleQuery"
+ />
</el-form-item>
<el-form-item label="鍞竴ID" prop="HErpID">
- <el-input v-model="queryParams.HErpID" placeholder="璇疯緭鍏ュ敮涓�ID" @keyup.enter.native="handleQuery" />
+ <el-input
+ v-model="queryParams.HErpID"
+ placeholder="璇疯緭鍏ュ敮涓�ID"
+ @keyup.enter.native="handleQuery"
+ />
</el-form-item>
<el-form-item label="鍗曟嵁鍙�" prop="HBillNo2">
- <el-input v-model="HBillNo2" placeholder="璇疯緭鍏ュ崟鎹彿" @keyup.enter.native="syncBill">
+ <el-input
+ v-model="HBillNo2"
+ placeholder="璇疯緭鍏ュ崟鎹彿"
+ @keyup.enter.native="syncBill"
+ >
<el-button slot="append" @click="syncBill">閲嶆柊鍚屾</el-button>
</el-input>
</el-form-item>
@@ -127,69 +197,132 @@
<el-row>
<el-form-item label-width="0">
<el-col :span="7">
- <el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨" @change="riqiChange"
- class="ForFilteringSchemes">
+ <el-select
+ v-model="queryParams.ColName1"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ class="ForFilteringSchemes"
+ >
<span v-for="(item, index) in btList" :key="index">
- <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+ <el-option
+ :label="item.field"
+ :value="item.field"
+ v-if="!item.hide"
+ ></el-option>
</span>
</el-select>
</el-col>
<el-col :span="6" style="padding: 0 10px">
- <el-select v-model="queryParams.Comparator1" placeholder="璇烽�夋嫨" @change="riqiChange"
- class="ForFilteringSchemes">
- <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
- :value="item.value"></el-option>
+ <el-select
+ v-model="queryParams.Comparator1"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ class="ForFilteringSchemes"
+ >
+ <el-option
+ v-for="(item, index) in comparatorList"
+ :key="index"
+ :label="item.label"
+ :value="item.value"
+ ></el-option>
</el-select>
</el-col>
<el-col :span="11">
- <el-input v-model="queryParams.ColContent1" placeholder="璇疯緭鍏�" clearable
- @keyup.enter.native="handleQuery" class="ForFilteringSchemes" />
+ <el-input
+ v-model="queryParams.ColContent1"
+ placeholder="璇疯緭鍏�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ class="ForFilteringSchemes"
+ />
</el-col>
</el-form-item>
</el-row>
<el-row>
<el-form-item label-width="0">
<el-col :span="7">
- <el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨" @change="riqiChange"
- class="ForFilteringSchemes">
+ <el-select
+ v-model="queryParams.ColName2"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ class="ForFilteringSchemes"
+ >
<span v-for="(item, index) in btList" :key="index">
- <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+ <el-option
+ :label="item.field"
+ :value="item.field"
+ v-if="!item.hide"
+ ></el-option>
</span>
</el-select>
</el-col>
<el-col :span="6" style="padding: 0 10px">
- <el-select v-model="queryParams.Comparator2" placeholder="璇烽�夋嫨" @change="riqiChange"
- class="ForFilteringSchemes">
+ <el-select
+ v-model="queryParams.Comparator2"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ class="ForFilteringSchemes"
+ >
<span v-for="(item, index) in btList" :key="index">
- <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+ <el-option
+ :label="item.field"
+ :value="item.field"
+ v-if="!item.hide"
+ ></el-option>
</span>
</el-select>
</el-col>
<el-col :span="11">
- <el-input v-model="queryParams.ColContent2" placeholder="璇疯緭鍏�" clearable
- @keyup.enter.native="handleQuery" class="ForFilteringSchemes" />
+ <el-input
+ v-model="queryParams.ColContent2"
+ placeholder="璇疯緭鍏�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ class="ForFilteringSchemes"
+ />
</el-col>
</el-form-item>
</el-row>
<el-row>
<el-form-item label-width="0">
<el-col :span="7">
- <el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" @change="riqiChange"
- class="ForFilteringSchemes">
- <el-option v-for="(item, index) in btList" :key="index" :label="item.field"
- :value="item.field"></el-option>
+ <el-select
+ v-model="queryParams.ColName"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ class="ForFilteringSchemes"
+ >
+ <el-option
+ v-for="(item, index) in btList"
+ :key="index"
+ :label="item.field"
+ :value="item.field"
+ ></el-option>
</el-select>
</el-col>
<el-col :span="6" style="padding: 0 10px">
- <el-select v-model="queryParams.Comparator" placeholder="璇烽�夋嫨" @change="riqiChange"
- class="ForFilteringSchemes">
- <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
- :value="item.value"></el-option>
+ <el-select
+ v-model="queryParams.Comparator"
+ placeholder="璇烽�夋嫨"
+ @change="riqiChange"
+ class="ForFilteringSchemes"
+ >
+ <el-option
+ v-for="(item, index) in comparatorList"
+ :key="index"
+ :label="item.label"
+ :value="item.value"
+ ></el-option>
</el-select>
</el-col>
<el-col :span="11">
- <el-input v-model="queryParams.ColContent" placeholder="璇疯緭鍏�" clearable
- @keyup.enter.native="handleQuery" class="ForFilteringSchemes" />
+ <el-input
+ v-model="queryParams.ColContent"
+ placeholder="璇疯緭鍏�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ class="ForFilteringSchemes"
+ />
</el-col>
</el-form-item>
</el-row>
@@ -200,8 +333,11 @@
<el-form-item label-width="78px">
<el-button type="primary" size="small" icon="el-icon-search" @click="handleQuery">
- 鎼� 绱�</el-button>
- <el-button icon="el-icon-circle-close" size="small" @click="searchOpen = false">鍙� 娑�</el-button>
+ 鎼� 绱�</el-button
+ >
+ <el-button icon="el-icon-circle-close" size="small" @click="searchOpen = false"
+ >鍙� 娑�</el-button
+ >
</el-form-item>
</el-form>
@@ -217,28 +353,64 @@
>
</el-col> -->
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddEdit((OperationType = 1))"
- id="btn-Add">鏂板</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleAddEdit((OperationType = 1))"
+ id="btn-Add"
+ >鏂板</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="handleEdit((row = rowForm), (OperationType = 3))">缂栬緫</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="handleEdit((row = rowForm), (OperationType = 3))"
+ >缂栬緫</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="handleEdit((row = rowForm), (OperationType = 2))">澶嶅埗</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="handleEdit((row = rowForm), (OperationType = 2))"
+ >澶嶅埗</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
+ <el-button
+ type="primary"
+ icon="el-icon-delete"
+ size="mini"
+ :disabled="single"
+ @click="handleDelete"
+ >鍒犻櫎
</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="set_CheckBill(1, (form = rowForm))">瀹℃牳</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="set_CheckBill(1, (form = rowForm))"
+ >瀹℃牳</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="set_CheckBill(2, (form = rowForm))">鍙嶅鏍�</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="set_CheckBill(2, (form = rowForm))"
+ >鍙嶅鏍�</el-button
+ >
</el-col>
<!-- <el-col :span="1.5">
<el-button
@@ -263,79 +435,188 @@
>
</el-col> -->
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="set_CloseBill(1, (form = rowForm))">鍏抽棴</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="set_CloseBill(1, (form = rowForm))"
+ >鍏抽棴</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="set_CloseBill(2, (form = rowForm))">鍙嶅叧闂�</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="set_CloseBill(2, (form = rowForm))"
+ >鍙嶅叧闂�</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="set_CloseRow(0, (form = rowForm))">琛屽叧闂�</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="set_CloseRow(0, (form = rowForm))"
+ >琛屽叧闂�</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="set_CloseRow(1, (form = rowForm))">琛屽弽鍏抽棴</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="set_CloseRow(1, (form = rowForm))"
+ >琛屽弽鍏抽棴</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="set_DropBill(1, (form = rowForm))">浣滃簾</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="set_DropBill(1, (form = rowForm))"
+ >浣滃簾</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="set_DropBill(2, (form = rowForm))">鍙嶄綔搴�</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="set_DropBill(2, (form = rowForm))"
+ >鍙嶄綔搴�</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="push_PackingInStockBill((form = rowForm))">涓嬫帹鍖呰棰嗙敤鐢宠鍗�</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="push_PackingInStockBill((form = rowForm))"
+ >涓嬫帹鍖呰棰嗙敤鐢宠鍗�</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-download"
+ size="mini"
+ @click="handleExport"
+ >瀵煎嚭</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-download" size="mini" @click="handleRowHide">闅愯棌鍒楄缃�</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-download"
+ size="mini"
+ @click="handleRowHide"
+ >闅愯棌鍒楄缃�</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch">鎼� 绱�</el-button>
+ <el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch"
+ >鎼� 绱�</el-button
+ >
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
+ <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
+ >閲� 缃�</el-button
+ >
</el-col>
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
</el-row>
<div class="tableBox" v-loading="loading">
- <el-table :data="tableData" ref="tableData" max-height="750" :summary-method="getSummaries"
- @selection-change="handleSelectionChange" show-summary border @row-click="handleRowClick" :row-style="rowStyle"
- @cell-dblclick="handleDblclick" v-if="tableShow">
+ <el-table
+ :data="tableData"
+ ref="tableData"
+ max-height="750"
+ :summary-method="getSummaries"
+ @selection-change="handleSelectionChange"
+ show-summary
+ border
+ @row-click="handleRowClick"
+ :row-style="rowStyle"
+ @cell-dblclick="handleDblclick"
+ v-if="tableShow"
+ >
<template v-for="(item, index) in btList">
- <el-table-column type="selection" width="55" align="center" :fixed="item.fixed" v-if="item.type == 'checkbox'"
- :key="index" />
- <el-table-column :align="item.align" :prop="item.field" :label="item.title" :width="item.width"
- :key="item.sorderid" v-else-if="!item.hide && item.type != 'checkbox'" :sortable="item.sort"
- show-overflow-tooltip :fixed="item.fixed">
+ <el-table-column
+ type="selection"
+ width="55"
+ align="center"
+ :fixed="item.fixed"
+ v-if="item.type == 'checkbox'"
+ :key="index"
+ />
+ <el-table-column
+ :align="item.align"
+ :prop="item.field"
+ :label="item.title"
+ :width="item.width"
+ :key="item.sorderid"
+ v-else-if="!item.hide && item.type != 'checkbox'"
+ :sortable="item.sort"
+ show-overflow-tooltip
+ :fixed="item.fixed"
+ >
<template slot-scope="{ row, column }">
<el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
<div :style="item.style">
<span v-if="column.property.includes('鏃ユ湡')">{{
parseTime(row[column.property], "{y}-{m}-{d}")
}}</span>
- <el-button type="text" @click="handleEdit(row, (OperationType = 3))"
- v-else-if="column.property == '鍗曟嵁鍙�'">{{ row.鍗曟嵁鍙� }}</el-button>
+
+ <el-button
+ type="text"
+ @click.stop="handleEdit(row, (OperationType = 3))"
+ v-else-if="column.property == '鍗曟嵁鍙�'"
+ >{{ row.鍗曟嵁鍙� }}</el-button
+ >
<span v-else>{{ row[column.label] }}</span>
</div>
</template>
</el-table-column>
</template>
</el-table>
- <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" :pageSizes="pageSizes"
- @pagination="getList" />
- <el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
- <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
+ <pagination
+ v-show="total > 0"
+ :total="total"
+ :page.sync="page"
+ :limit.sync="pageSize"
+ :pageSizes="pageSizes"
+ @pagination="getList"
+ />
+ <el-dialog
+ title="闅愯棌鍒楄缃�"
+ :visible.sync="openRowHide"
+ width="816px"
+ append-to-body
+ >
+ <RowSettings
+ :colName="btResList"
+ :HModName="HModName"
+ @rowEditClose="rowSetClose"
+ v-if="rowHideShow"
+ />
</el-dialog>
<!-- 缂栬緫 -->
- <el-dialog title="缂栬緫鐢熶骇璁㈠崟" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox"
- :before-close="close">
+ <el-dialog
+ title="缂栬緫鐢熶骇璁㈠崟"
+ :visible.sync="openEdit"
+ width="1480px"
+ append-to-body
+ class="xsckdBox"
+ :before-close="close"
+ >
<!-- <edit
:OperationType="OperationType"
:linterid="this.rowForm.HItemID"
@@ -345,43 +626,97 @@
@editCloseGy="editGyClose"
v-if="editShow"
/> -->
- <div style="height: 80vh" v-if="openEdit">
+
+ <div style="height: 70vh" v-if="openEdit">
<iframe :src="iframeUrl" width="100%" height="100%" frameborder="0"></iframe>
</div>
</el-dialog>
- <el-dialog :title="upload.title" :visible.sync="upload.open" width="1500px" append-to-body>
+ <el-dialog
+ :title="upload.title"
+ :visible.sync="upload.open"
+ width="1500px"
+ append-to-body
+ >
<div style="margin-top: -20px">
<el-button type="primary" @click="set_AddNew">瀵煎叆鏁版嵁</el-button>
<el-button type="primary" @click="upload.open = false">閫� 鍑�</el-button>
- <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" style="display: inline-block; margin-left: 10px"
- :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
- :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess">
+ <el-upload
+ ref="upload"
+ :limit="1"
+ accept=".xlsx, .xls"
+ style="display: inline-block; margin-left: 10px"
+ :action="upload.url + '?updateSupport=' + upload.updateSupport"
+ :disabled="upload.isUploading"
+ :on-progress="handleFileUploadProgress"
+ :on-success="handleFileSuccess"
+ >
<el-button type="primary">鏂囦欢涓婁紶</el-button>
</el-upload>
</div>
- <el-table :data="uploadData" v-loading="uploadTableLoading" :row-class-name="uploadDataIndex" border
- height="550">
+ <el-table
+ :data="uploadData"
+ v-loading="uploadTableLoading"
+ :row-class-name="uploadDataIndex"
+ border
+ height="550"
+ >
<el-table-column type="index" label="搴忓彿" width="55" align="center" />
<el-table-column label="缁勭粐浠ｇ爜" prop="缁勭粐浠ｇ爜" align="center" width="120" />
<el-table-column label="缁勭粐鍚嶇О" prop="缁勭粐鍚嶇О" align="center" width="120" />
- <el-table-column label="鐢熶骇璧勬簮鍚嶇О" prop="鐢熶骇璧勬簮鍚嶇О" align="center" width="120" />
- <el-table-column label="鐢熶骇璧勬簮浠ｇ爜" prop="鐢熶骇璧勬簮浠ｇ爜" align="center" width="120" />
+ <el-table-column
+ label="鐢熶骇璧勬簮鍚嶇О"
+ prop="鐢熶骇璧勬簮鍚嶇О"
+ align="center"
+ width="120"
+ />
+ <el-table-column
+ label="鐢熶骇璧勬簮浠ｇ爜"
+ prop="鐢熶骇璧勬簮浠ｇ爜"
+ align="center"
+ width="120"
+ />
<el-table-column label="閮ㄩ棬浠ｇ爜" prop="閮ㄩ棬浠ｇ爜" align="center" width="120" />
<el-table-column label="閮ㄩ棬鍚嶇О" prop="閮ㄩ棬鍚嶇О" align="center" width="120" />
- <el-table-column label="璐熻矗浜轰唬鐮�" prop="璐熻矗浜轰唬鐮�" align="center" width="120" />
+ <el-table-column
+ label="璐熻矗浜轰唬鐮�"
+ prop="璐熻矗浜轰唬鐮�"
+ align="center"
+ width="120"
+ />
<el-table-column label="璐熻矗浜�" prop="璐熻矗浜�" align="center" width="120" />
- <el-table-column label="宸ヤ綔涓績浠ｇ爜" prop="宸ヤ綔涓績浠ｇ爜" align="center" width="120" />
- <el-table-column label="宸ヤ綔涓績鍚嶇О" prop="宸ヤ綔涓績鍚嶇О" align="center" width="120" />
+ <el-table-column
+ label="宸ヤ綔涓績浠ｇ爜"
+ prop="宸ヤ綔涓績浠ｇ爜"
+ align="center"
+ width="120"
+ />
+ <el-table-column
+ label="宸ヤ綔涓績鍚嶇О"
+ prop="宸ヤ綔涓績鍚嶇О"
+ align="center"
+ width="120"
+ />
<el-table-column label="鍗曠彮宸ユ椂" prop="鍗曠彮宸ユ椂" align="center" width="120" />
<el-table-column label="鎿嶄綔" align="center">
<template slot-scope="scope">
- <el-button size="mini" type="text" icon="el-icon-delete"
- @click="uploadDataDelete(scope.row)">鍒犻櫎</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="uploadDataDelete(scope.row)"
+ >鍒犻櫎</el-button
+ >
</template>
</el-table-column>
</el-table>
- <pagination v-show="uploadTotal > 0" :total="uploadTotal" :page.sync="uploadPage" :limit.sync="uploadPageSize"
- :pageSizes="uploadPageSizes" @pagination="currentPage" />
+ <pagination
+ v-show="uploadTotal > 0"
+ :total="uploadTotal"
+ :page.sync="uploadPage"
+ :limit.sync="uploadPageSize"
+ :pageSizes="uploadPageSizes"
+ @pagination="currentPage"
+ />
</el-dialog>
</div>
</div>
@@ -400,10 +735,10 @@
},
data() {
return {
- selRowList: [],
iframeUrl: "",
activeSeach: "",
HModName: "Sc_ICMOBillList",
+ rowList:[],
editShow: false,
openEdit: false,
totalNameList: [],
@@ -549,8 +884,7 @@
updateSupport: 0,
// 璁剧疆涓婁紶鐨勮姹傚ご閮�
// headers: { Authorization: "Bearer " + getToken() },
- // 涓婁紶鐨勫湴鍧�
- url: "http://47.96.97.237/API/Gy_Source/Gy_Source_Excel",
+ url: "",
},
uploadData: [],
alluploadList: [],
@@ -567,6 +901,8 @@
};
},
created() {
+ // set upload URL from configured baseURL
+ this.upload.url = this.$baseUrl + "Gy_Source/Gy_Source_Excel";
this.riqiChange();
this.get_HProjectList();
this.get_HDeptNameList();
@@ -578,7 +914,7 @@
},
methods: {
syncBill() {
- axios.get(`${this.baseURL}/Sc_ICMOBill/Sc_ICMOBillViewApi`, {
+ axios.get(`${this.$baseUrl}/Sc_ICMOBill/Sc_ICMOBillViewApi`, {
params: {
BillNo: this.HBillNo2,
BillType: "3710",
@@ -586,7 +922,7 @@
});
},
async get_HDeptNameList() {
- let res = await axios.get(`${this.baseURL}/Sc_ICMOBill/GetHDeptList`, {
+ let res = await axios.get(`${this.$baseUrl}/Sc_ICMOBill/GetHDeptList`, {
params: { HOrgID: sessionStorage["OrganizationID"] },
});
this.HDeptNameList = [
@@ -597,7 +933,7 @@
];
},
async get_HProjectList() {
- let res = await axios.get(`${this.baseURL}/Gy_Material/Get_HProject`);
+ let res = await axios.get(`${this.$baseUrl}/Gy_Material/Get_HProject`);
this.HProjectList = res.data.data.map((e) => {
return { label: e.HName, value: e.HItemID };
});
@@ -645,7 +981,7 @@
defaintOperationByCompanyName() {
var result = false;
axios
- .get(this.baseURL + "/Xt_getInfo/getCompanyName")
+ .get(this.$baseUrl + "/Xt_getInfo/getCompanyName")
.then((res) => {
var data1 = res.data;
if (data1.count == 1) {
@@ -753,7 +1089,7 @@
try {
let res = await axios.get(
- this.baseURL + "/LEMS/MES_IF_ICMOBillList_Json_byPage",
+ this.$baseUrl + "/LEMS/MES_IF_ICMOBillList_Json_byPage",
{
params: {
sWhere: this.sWhere,
@@ -861,7 +1197,7 @@
DisPlay_HideColumn(HModName, user, option, dataOption) {
this.totalNameList = [];
axios
- .get(this.baseURL + "/Xt_grdAlignment_WMES/grdAlignmentWMESList", {
+ .get(this.$baseUrl + "/Xt_grdAlignment_WMES/grdAlignmentWMESList", {
params: {
HModName: HModName,
user: user,
@@ -1009,8 +1345,8 @@
this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
this.lastSelectedRowIndex = this.tableData.indexOf(row);
this.$refs.tableData.toggleRowSelection(row);
- if (this.openPage == 'Gy_BarCodeBill' || this.openPage == 'Sc_MouldOutRequestBill') {
- this.$emit('deptEmit', this.selRowList, 10)
+ if (this.openPage) {
+ this.$emit('deptEmit', this.rowList, 10)
}
},
//閫変腑琛岄珮浜牱寮�
@@ -1022,28 +1358,17 @@
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
this.OperationType = 3;
- if (this.openPage == 'Gy_BarCodeBill' || this.openPage == 'Sc_MouldOutRequestBill') {
- let rowdata=[]
- rowdata.push(row)
- console.log(rowdata)
- this.$emit('deptEmit', rowdata, 10)
- } else {
- this.handleEdit(row, this.OperationType);
- }
+ this.handleEdit(row, this.OperationType);
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
- console.log(selection)
// this.rowForm = {}
- this.selRowList = selection
+ this.rowList=selection
this.ids = selection.map((item) => item.hmainid);
this.single = selection.length != 1;
this.multiple = !selection.length;
if (!this.single) {
this.rowForm = selection[0];
- }
- if (this.openPage == 'Gy_BarCodeBill' || this.openPage == 'Sc_MouldOutRequestBill') {
- this.$emit('deptEmit', this.selRowList, 10)
}
},
//鎵撳紑渚ц竟鎼滅储寮圭獥
@@ -1166,7 +1491,7 @@
getOrgIDByUser() {
var res = "";
axios
- .get(this.baseURL + "/Xt_User/getOrgIDListByUser", {
+ .get(this.$baseUrl + "/Xt_User/getOrgIDListByUser", {
params: {
HModName: this.HModName,
user: sessionStorage["HUserName"],
@@ -1252,7 +1577,7 @@
.then(() => {
if (!this.rowForm.瀹℃牳浜�) {
axios
- .get(this.baseURL + "/Xs_SeOutStockBill/DeltetSeOutStockBill", {
+ .get(this.$baseUrl + "/Xs_SeOutStockBill/DeltetSeOutStockBill", {
params: {
HInter: this.rowForm.hmainid.toString(),
HsupId: this.rowForm.HsupId,
@@ -1277,14 +1602,14 @@
this.$modal.msgError("姝ゆ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎!");
}
})
- .catch(() => { });
+ .catch(() => {});
},
// 鍙嶅鏍�/瀹℃牳鏁版嵁
set_CheckBill(num, form) {
var InterID = form.HItemID || form.HInterID || form.hmainid;
//閫昏緫瀹℃牳鏂规硶
axios
- .get(this.baseURL + "/Xs_SeOutStockBill/CheckXs_SeOutStockBill", {
+ .get(this.$baseUrl + "/Xs_SeOutStockBill/CheckXs_SeOutStockBill", {
params: {
HInterID: InterID,
TypeError: num,
@@ -1309,7 +1634,7 @@
let HInterID = form.HItemID || form.HInterID || form.hmainid;
try {
let res = await axios.get(
- `${this.baseURL}/Xs_SeOutStockBill/CloseXs_SeOutStockBill`,
+ `${this.$baseUrl}/Xs_SeOutStockBill/CloseXs_SeOutStockBill`,
{
params: {
HInterID: HInterID,
@@ -1336,7 +1661,7 @@
let HEntryID = form.HEntryID || form.hsubid;
try {
let res = await axios.get(
- `${this.baseURL}/Xs_SeOutStockBill/CloseRowXs_SeOutStockBill`,
+ `${this.$baseUrl}/Xs_SeOutStockBill/CloseRowXs_SeOutStockBill`,
{
params: {
HInterID: HInterID,
@@ -1363,7 +1688,7 @@
let HInterID = form.HItemID || form.HInterID || form.hmainid;
try {
let res = await axios.get(
- `${this.baseURL}/Xs_SeOutStockBill/CancellXs_SeOutStockBill`,
+ `${this.$baseUrl}/Xs_SeOutStockBill/CancellXs_SeOutStockBill`,
{
params: {
HInterID: HInterID,
@@ -1389,7 +1714,7 @@
var InterID = form.HItemID || form.HInterID;
//閫昏緫瀹℃牳鏂规硶
axios
- .get(this.baseURL + "/Gy_Employee/StopGy_Employee", {
+ .get(this.$baseUrl + "/Gy_Employee/StopGy_Employee", {
params: {
HInterID: InterID,
IsStop: num,
@@ -1441,8 +1766,8 @@
} else {
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
- res.Message +
- "</div>",
+ res.Message +
+ "</div>",
"瀵煎叆缁撴灉",
{ dangerouslyUseHTMLString: true }
);
@@ -1463,7 +1788,7 @@
var sMainSub = sSubStr + "&鍜�" + sessionStorage["HUserName"];
axios({
method: "post",
- url: this.baseURL + "/Gy_Source/Gy_Source_btnSave",
+ url: this.$baseUrl + "/Gy_Source/Gy_Source_btnSave",
data: {
sMainSub: sMainSub,
},
@@ -1471,8 +1796,8 @@
.then((res) => {
this.$alert(
"<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" +
- res.data.Message +
- "</div>",
+ res.data.Message +
+ "</div>",
"瀵煎叆缁撴灉",
{ dangerouslyUseHTMLString: true }
);
@@ -1496,7 +1821,7 @@
return deleteList.indexOf(item.index) == -1;
});
})
- .catch(() => { });
+ .catch(() => {});
},
getPage(page, list) {
let sindex = (parseInt(page) - 1) * this.uploadPageSize;
@@ -1519,7 +1844,7 @@
width: 100%;
}
-.form-item-inline>.el-form-item__content {
+.form-item-inline > .el-form-item__content {
display: flex;
flex-direction: row;
width: 60%;
--
Gitblit v1.9.1