From a1cc3f87d24ae2a19295c7b38faa17228cd863ec Mon Sep 17 00:00:00 2001
From: wangyi <2946747746@qq.com>
Date: 星期六, 28 二月 2026 15:11:24 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue | 12
src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue | 12
src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue | 21
src/views/basic/gyCar/gyCarList.vue | 10
src/views/system/user/GyDriver.vue | 756 ++++++-------------------
src/views/sell/XsSeOutStockBill.vue | 2
src/layout/components/Navbar.vue | 11
src/views/scMould/basicModeling/Gy_MouldFileList.vue | 10
src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue | 12
src/layout/components/UpdatePsw.vue | 132 ++++
src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue | 153 +++-
src/views/basic/gyCar/gyCarEdit.vue | 28
src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue | 12
.env.development | 5
src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue | 12
src/views/logistics/transportGPS/WL_YayBill.vue | 201 +++++-
src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue | 282 ++++----
src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue | 12
src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue | 12
19 files changed, 825 insertions(+), 870 deletions(-)
diff --git a/.env.development b/.env.development
index 305e1ec..d493a77 100644
--- a/.env.development
+++ b/.env.development
@@ -5,8 +5,8 @@
ENV = 'development'
# 鏅轰簯杩堟�滾-MOM绠＄悊绯荤粺/寮�鍙戠幆澧�
-# VUE_APP_BASE_API = http://localhost:81/API/
-VUE_APP_BASE_API = 'http://47.96.97.237/API/'
+VUE_APP_BASE_API = http://localhost:81/API/
+# VUE_APP_BASE_API = 'http://47.96.97.237/API/'
# VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/'
# VUE_APP_BASE_API = 'http://localhost:8082/LuBaoAPI/'
#閿﹂殕
@@ -19,5 +19,6 @@
# VUE_APP_BASE_API = http://localhost:8082/API/
# 鍐呯綉鍦板潃娴嬭瘯
# VUE_APP_BASE_API_INNER = http://192.168.1.11/API/
+VUE_APP_BASE_API_INNER = http://192.168.1.11/API/
# 璺敱鎳掑姞杞�
VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 5d9ab49..56d54ee 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -31,17 +31,22 @@
<el-dropdown-item @click.native="setLayout" v-if="setting">
<span>甯冨眬璁剧疆</span>
</el-dropdown-item>
+ <el-dropdown-item @click.native="handleUpdatePsw">
+ <span>淇敼瀵嗙爜</span>
+ </el-dropdown-item>
<el-dropdown-item divided @click.native="logout">
<span>閫�鍑虹櫥褰�</span>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
+ <update-psw ref="pswDialog" />
</div>
</template>
<script>
import { mapGetters } from 'vuex'
+import UpdatePsw from '@/layout/components/UpdatePsw'
import Breadcrumb from '@/components/Breadcrumb'
import TopNav from '@/components/TopNav'
import Hamburger from '@/components/Hamburger'
@@ -61,7 +66,8 @@
SizeSelect,
Search,
RuoYiGit,
- RuoYiDoc
+ RuoYiDoc,
+ UpdatePsw
},
computed: {
...mapGetters([
@@ -87,6 +93,9 @@
}
},
methods: {
+ handleUpdatePsw() {
+ this.$refs.pswDialog.open()
+ },
toggleSideBar() {
this.$store.dispatch('app/toggleSideBar')
},
diff --git a/src/layout/components/UpdatePsw.vue b/src/layout/components/UpdatePsw.vue
new file mode 100644
index 0000000..9b8fbcc
--- /dev/null
+++ b/src/layout/components/UpdatePsw.vue
@@ -0,0 +1,132 @@
+<template>
+ <el-dialog title="淇敼瀵嗙爜" :visible.sync="dialogVisible" width="500px" @close="handleClose">
+ <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+ <el-form-item label="褰撳墠鐢ㄦ埛">
+ <el-input v-model="form.currentUser" :readonly="true" />
+ </el-form-item>
+ <el-form-item label="褰撳墠瀵嗙爜">
+ <el-input v-model="form.oldPassword" type="password" :readonly="true" />
+ </el-form-item>
+ <el-form-item label="鏂板瘑鐮�" prop="newPassword">
+ <el-input v-model="form.newPassword" type="password" placeholder="6鍒�16涓瓧绗�" show-password />
+ </el-form-item>
+ <el-form-item label="纭鏂板瘑鐮�" prop="confirmPassword">
+ <el-input v-model="form.confirmPassword" type="password" placeholder="鍐嶆杈撳叆鏂板瘑鐮�" show-password />
+ </el-form-item>
+ <el-form-item label="閲戣澏浜戣处鍙�">
+ <el-input v-model="form.cloudUserName" />
+ </el-form-item>
+ <el-form-item label="閲戣澏浜戝瘑鐮�">
+ <el-input v-model="form.cloudUserPsd" type="password" show-password />
+ </el-form-item>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="submitForm" :loading="submitting">纭� 璁� 淇� 鏀�</el-button>
+ </span>
+ </el-dialog>
+</template>
+
+<script>
+import request from '@/utils/request'
+
+export default {
+ name: 'UpdatePsw',
+ data() {
+
+ const validateConfirm = (rule, value, callback) => {
+ if (value !== this.form.newPassword) {
+ callback(new Error('涓ゆ杈撳叆瀵嗙爜涓嶄竴鑷�'))
+ } else {
+ callback()
+ }
+ }
+ return {
+ dialogVisible: false,
+ submitting: false,
+ form: {
+ currentUser: '',
+ oldPassword: '',
+ newPassword: '',
+ confirmPassword: '',
+ cloudUserName: '',
+ cloudUserPsd: ''
+ },
+ rules: {
+ newPassword: [
+ { required: true, message: '璇疯緭鍏ユ柊瀵嗙爜', trigger: 'blur' },
+ { min: 6, max: 16, message: '闀垮害鍦� 6 鍒� 16 涓瓧绗�', trigger: 'blur' }
+ ],
+ confirmPassword: [
+ { required: true, message: '璇峰啀娆¤緭鍏ユ柊瀵嗙爜', trigger: 'blur' },
+ { validator: validateConfirm, trigger: 'blur' }
+ ]
+ }
+ }
+ },
+ methods: {
+
+ open() {
+ this.form.currentUser = sessionStorage['HUserName'] || ''
+ this.form.oldPassword = sessionStorage['Czmm'] || ''
+ this.form.cloudUserName = sessionStorage['HCloudUserName'] || ''
+ this.form.cloudUserPsd = sessionStorage['HCloudUserPsd'] || ''
+
+ this.form.newPassword = ''
+ this.form.confirmPassword = ''
+ this.dialogVisible = true
+
+ this.$nextTick(() => {
+ this.$refs.form?.clearValidate()
+ })
+ },
+
+ handleClose() {
+
+ this.$refs.form?.resetFields()
+ },
+
+ submitForm() {
+ this.$refs.form.validate(valid => {
+ if (!valid) return
+ this.submitting = true
+
+ const params = {
+ UserName: sessionStorage['Czybm'] || '',
+ oldPassword: this.form.oldPassword,
+ PassWord: this.form.newPassword,
+ Repassword: this.form.confirmPassword,
+ HCloudUserName: this.form.cloudUserName,
+ HCloudUserPsd: this.form.cloudUserPsd
+ }
+ request({
+ url: '/Web/GetXGPassword',
+ method: 'get',
+ params: params
+ }).then(res => {
+ if (res.count === 1) {
+
+ this.$modal.msgSuccess(res.Message || '淇敼鎴愬姛')
+
+ sessionStorage.clear()
+
+ this.$router.push('/index')
+
+ this.dialogVisible = false
+ } else {
+
+ this.$modal.msgError(res.Message || '淇敼澶辫触')
+ }
+ }).catch(err => {
+ this.$modal.msgError(err.message || '璇锋眰澶辫触')
+ }).finally(() => {
+ this.submitting = false
+ })
+ })
+ }
+ }
+}
+</script>
+
+<style scoped>
+</style>
\ No newline at end of file
diff --git a/src/views/basic/gyCar/gyCarEdit.vue b/src/views/basic/gyCar/gyCarEdit.vue
index 8d598f0..3769c34 100644
--- a/src/views/basic/gyCar/gyCarEdit.vue
+++ b/src/views/basic/gyCar/gyCarEdit.vue
@@ -45,7 +45,7 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="6">
+ <!-- <el-col :span="6">
<el-form-item label="鐖剁骇" prop="HParentName">
<el-input v-model="form.HParentName" placeholder="璇烽�夋嫨鐖剁骇" disabled>
<el-button
@@ -56,7 +56,7 @@
></el-button>
</el-input>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="6">
<el-form-item label="杞︽灦鍙�" prop="HCarSN">
<el-input v-model="form.HCarSN" placeholder="璇疯緭鍏ヨ溅鏋跺彿"></el-input>
@@ -174,7 +174,8 @@
<el-button
slot="append"
icon="el-icon-search"
- class="select-btn-primary"
+ class="select-btn-disabled"
+ disabled
@click.stop="openDataDialog(3)"
></el-button>
</el-input>
@@ -749,8 +750,8 @@
HCarTypeName: "",
HCarPric: "",
HCarCardIDPic: "",
- HCompID: 0,
- HCompName: "",
+ HCompID: sessionStorage["HSupID"],
+ HCompName: sessionStorage["HSupName"],
HModel: "",
HColor: "",
HBuyDate: dayjs(new Date()).format("YYYY-MM-DD"),
@@ -847,8 +848,8 @@
HCarCheckDate: data.杞﹁締骞存鏃ユ湡
? dayjs(data.杞﹁締骞存鏃ユ湡).format("YYYY-MM-DD")
: "",
- HCarTypeID: data.杞﹀瀷,
- HCarTypeName: data.杞﹀瀷鍚嶇О || "",
+ HCarTypeID: data.HCarTypeID,
+ HCarTypeName: data.杞﹀瀷 || "",
HCarPric: data.杞﹁締鐓х墖,
HCarCardIDPic: data.杞﹁締琛岄┒璇佺収鐗�,
HCompID: data.HCompID,
@@ -870,6 +871,7 @@
HModifyTime: data.淇敼鏃堕棿
? dayjs(data.淇敼鏃堕棿).format("YYYY-MM-DD")
: "",
+
},
};
@@ -1103,10 +1105,11 @@
},
// 鍙嶅鏍�/瀹℃牳鏁版嵁
set_CheckBill(num, form) {
- var InterID = form.hmainid || form.HInterID;
+ console.log(form)
+ var InterID = form.hmainid || form.HInterID || form.HItemID;
//閫昏緫瀹℃牳鏂规硶
axios
- .get(this.$baseUrl + "/Kf_SellOutBill/AuditKf_SellOutBill", {
+ .get(this.$baseUrl + "/Gy_Car/AuditGy_Car", {
params: {
HInterID: InterID,
IsAudit: num,
@@ -1117,6 +1120,8 @@
let result = response.data;
if (result.code == 1) {
this.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+ this.subDisabled = true
+ this.checkDisabled = true
} else {
this.$modal.msgError("閿欒:" + result.code + result.Message);
}
@@ -1172,6 +1177,11 @@
color: #fff !important;
}
+.select-btn-disabled {
+ background-color: rgba(245, 247, 250, 1) !important;
+ color: #000 !important;
+}
+
.image-input-outer {
display: inline-flex;
width: 60%;
diff --git a/src/views/basic/gyCar/gyCarList.vue b/src/views/basic/gyCar/gyCarList.vue
index 3d9099a..e34bf0b 100644
--- a/src/views/basic/gyCar/gyCarList.vue
+++ b/src/views/basic/gyCar/gyCarList.vue
@@ -112,11 +112,11 @@
</el-collapse-item>
</el-collapse>
- <el-form-item label-width="78px">
+ <!-- <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-form-item>
+ </el-form-item> -->
</el-form>
<el-row :gutter="10" class="mb8">
@@ -176,7 +176,7 @@
>鍙嶇鐢�</el-button
>
</el-col> -->
- <el-col :span="1.5">
+ <!-- <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-col>
@@ -199,7 +199,7 @@
<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-col>
+ </el-col> -->
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
@@ -1139,7 +1139,7 @@
var InterID = form.HItemID || form.HInterID || form.hmainid;
//閫昏緫瀹℃牳鏂规硶
axios
- .get(this.$baseUrl + "/Cg_POInStockBill/AuditCg_POInStockBill", {
+ .get(this.$baseUrl + "/Gy_Car/AuditGy_Car", {
params: {
HInterID: InterID,
IsAudit: num,
diff --git a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue
index 0412f6c..0946f36 100644
--- a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue
+++ b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue
@@ -17,7 +17,7 @@
<el-tab-pane label="鍩烘湰淇℃伅" name="first">
<el-row>
<el-col :span="6">
- <el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
+ <el-form-item label="鍗曟嵁鍙�" prop="HBillNo" required>
<el-input v-model="form.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" />
</el-form-item>
</el-col>
@@ -33,7 +33,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鍚堝悓缂栧彿" prop="HContractNumber">
+ <el-form-item label="鍚堝悓缂栧彿" prop="HContractNumber" required>
<el-input v-model="form.HContractNumber" placeholder="" />
</el-form-item>
</el-col>
@@ -49,8 +49,8 @@
</el-col>
<el-col :span="6">
- <el-form-item label="渚涘簲鍟�" prop="HSupName">
- <el-input v-model="form.HSupName" placeholder="璇烽�夋嫨渚涘簲鍟�" disabled>
+ <el-form-item label="鎵胯繍鍟�" prop="HSupName" required>
+ <el-input v-model="form.HSupName" placeholder="璇烽�夋嫨鎵胯繍鍟�" disabled>
<el-button
slot="append"
icon="el-icon-search"
@@ -62,7 +62,7 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="涓氬姟鍛�" prop="HEmpName">
+ <el-form-item label="涓氬姟鍛�" prop="HEmpName" required>
<el-input v-model="form.HEmpName" placeholder="璇烽�夋嫨" disabled>
<el-button
slot="append"
@@ -75,7 +75,7 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="甯佸埆" prop="HCurName">
+ <el-form-item label="甯佸埆" prop="HCurName" required>
<el-input v-model="form.HCurName" placeholder="璇烽�夋嫨璋冨叆甯佸埆" disabled>
<el-button
slot="append"
@@ -86,7 +86,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="缁撶畻鏂瑰紡" prop="HSSName">
+ <el-form-item label="缁撶畻鏂瑰紡" prop="HSSName" required>
<el-input v-model="form.HSSName" placeholder="璇烽�夋嫨缁撶畻鏂瑰紡" disabled>
<el-button
slot="append"
@@ -98,11 +98,11 @@
</el-col>
<el-col :span="6">
<el-form-item label="姹囩巼" prop="HExRate">
- <el-input v-model="form.HExRate" placeholder="" />
+ <el-input v-model="form.HExRate" placeholder="" disabled/>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="閮ㄩ棬" prop="HDeptName">
+ <el-form-item label="閮ㄩ棬" prop="HDeptName" required>
<el-input v-model="form.HDeptName" placeholder="璇烽�夋嫨閮ㄩ棬" disabled>
<el-button
slot="append"
@@ -120,7 +120,7 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="缁勭粐" prop="HSTOCKINORGID" >
+ <el-form-item label="缁勭粐" prop="HSTOCKINORGID" required>
<el-select v-model="form.HSTOCKINORGID" placeholder="璇烽�夋嫨缁勭粐" :disabled="OperationType == 3" @change="StockInOrgChangeHandler">
<el-option
v-for="(item, index) in organizationList"
@@ -175,8 +175,9 @@
<el-form-item label="鍒跺崟鏃ユ湡" prop="HMakeDate">
<el-date-picker
v-model="form.HMakeDate"
- type="date"
+ type="datetime"
placeholder="閫夋嫨鍒跺崟鏃ユ湡"
+ value-format="yyyy-MM-dd HH:mm:ss"
disabled
>
</el-date-picker>
@@ -186,8 +187,9 @@
<el-form-item label="淇敼鏃ユ湡" prop="HUpDateDate">
<el-date-picker
v-model="form.HUpDateDate"
- type="date"
+ type="datetime"
placeholder="閫夋嫨瀹℃牳鏃ユ湡"
+ value-format="yyyy-MM-dd HH:mm:ss"
disabled
>
</el-date-picker>
@@ -197,8 +199,9 @@
<el-form-item label="瀹℃牳鏃ユ湡" prop="HCheckDate">
<el-date-picker
v-model="form.HCheckDate"
- type="date"
+ type="datetime"
placeholder="閫夋嫨瀹℃牳鏃ユ湡"
+ value-format="yyyy-MM-dd HH:mm:ss"
disabled
>
</el-date-picker>
@@ -208,8 +211,9 @@
<el-form-item label="鍏抽棴鏃ユ湡" prop="HCloseDate">
<el-date-picker
v-model="form.HCloseDate"
- type="date"
+ type="datetime"
placeholder="閫夋嫨鍏抽棴鏃ユ湡"
+ value-format="yyyy-MM-dd HH:mm:ss"
disabled
>
</el-date-picker>
@@ -318,7 +322,7 @@
</el-table-column>
- <el-table-column align="center" label="杩愯緭鏂瑰紡" width="120">
+ <el-table-column align="center" label="杞﹀瀷" width="120">
<template slot-scope="scope">
<el-input
v-model="scope.row.杩愯緭鏂瑰紡鍚嶇О"
@@ -335,13 +339,26 @@
</template>
</el-table-column>
<el-table-column align="center" label="璺濈锛堝叕閲岋級" width="120">
+ <template slot-scope="scope">
+ <el-input-number
+ v-model="scope.row.HDistance"
+ placeholder="璇疯緭鍏�"
+ :controls="false"
+ :min="0"
+
+ style="width: 100%"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="杩愯緭鏃舵晥锛堟椂锛�" width="120">
<template slot-scope="scope">
- <el-input v-model="scope.row.HDistance" placeholder="璇疯緭鍏�" />
- </template>
- </el-table-column>
- <el-table-column align="center" label="杩愯緭鏃舵晥" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.HTransportTimes" placeholder="璇疯緭鍏�" />
+ <el-input-number
+ v-model="scope.row.HTransportTimes"
+ placeholder="璇疯緭鍏�"
+ :controls="false"
+ :min="0"
+ style="width: 100%"
+ />
</template>
</el-table-column>
<el-table-column align="center" label="杩愯緭绫诲瀷" width="120">
@@ -367,12 +384,24 @@
</el-table-column>
<el-table-column align="center" label="杩愯緭璐圭敤" width="120">
<template slot-scope="scope">
- <el-input v-model="scope.row.HMoney" placeholder="璇疯緭鍏�" />
+ <el-input-number
+ v-model="scope.row.HMoney"
+ placeholder="璇疯緭鍏�"
+ :controls="false"
+ :min="0"
+ style="width: 100%"
+ />
</template>
</el-table-column>
<el-table-column align="center" label="鍘嗗彶杩愯緭璐圭敤" width="120">
<template slot-scope="scope">
- <el-input v-model="scope.row.HMoney_His" placeholder="璇疯緭鍏�" />
+ <el-input-number
+ v-model="scope.row.HMoney_His"
+ placeholder="璇疯緭鍏�"
+ :controls="false"
+ :min="0"
+ style="width: 100%"
+ />
</template>
</el-table-column>
@@ -583,15 +612,17 @@
form: {},
// 琛ㄥ崟鏍￠獙
rules: {
- HDate: [{ required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }],
- HSupName: [{ required: true, message: "寰�鏉ュ崟浣嶄笉鑳戒负绌�", trigger: "blur" }],
- HEmpName: [{ required: true, message: "涓氬姟鍛樹笉鑳戒负绌�", trigger: "blur" }],
- HMangerName: [{ required: true, message: "涓荤涓嶈兘涓虹┖", trigger: "blur" }],
- HSecManagerName: [{ required: true, message: "楠屾敹鍛樹笉鑳戒负绌�", trigger: "blur" }],
- HKeeperName: [{ required: true, message: "淇濈鍛樹笉鑳戒负绌�", trigger: "blur" }],
- HCurName: [{ required: true, message: "璋冨叆浠撳簱涓嶈兘涓虹┖", trigger: "blur" }],
- HSSName: [{ required: true, message: "璋冨嚭浠撳簱涓嶈兘涓虹┖", trigger: "blur" }],
- HDeptName: [{ required: true, message: "閮ㄩ棬涓嶈兘涓虹┖", trigger: "blur" }],
+ HDate: [{ required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }],
+ HBillNo: [{ required: true, message: "鍗曟嵁鍙蜂笉鑳戒负绌�", trigger: "blur" }],
+ HContractNumber: [{ required: true, message: "鍚堝悓缂栧彿涓嶈兘涓虹┖", trigger: "blur" }],
+ HContractName: [{ required: true, message: "鍚堝悓鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
+ HSupID: [{ required: true, message: "渚涘簲鍟嗕笉鑳戒负绌�", trigger: "blur" }],
+ HEmpID: [{ required: true, message: "涓氬姟鍛樹笉鑳戒负绌�", trigger: "blur" }],
+ HDeptID: [{ required: true, message: "閮ㄩ棬涓嶈兘涓虹┖", trigger: "blur" }],
+ HCurID: [{ required: true, message: "甯佸埆涓嶈兘涓虹┖", trigger: "blur" }],
+ HExRate: [{ required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }],
+ HSTOCKINORGID: [{ required: true, message: "缁勭粐涓嶈兘涓虹┖", trigger: "change" }],
+ HSSName: [{ required: true, message: "缁撶畻鏂瑰紡涓嶈兘涓虹┖", trigger: "blur" }],
},
};
},
@@ -667,6 +698,7 @@
} else if (num == 2) {
this.form.HCurName = deptRow.璐у竵鍚嶇О;
this.form.HCurID = deptRow.HItemID;
+ this.form.HExRate = deptRow.姹囩巼;
this.CurrencyDialogShow = false;
this.openData = false;
} else if (num == 3) {
@@ -708,10 +740,10 @@
} else if (num == 5) {
this.form.HSSName = deptRow.缁撶畻鏂瑰紡鍚嶇О;
this.form.HSSID = deptRow.HItemID;
- this.form.HExRate = deptRow.姹囩巼;
+ //this.form.HExRate = deptRow.姹囩巼;
this.SettleStyleDialogShow = false;
this.openData = false;
- }else if (num == 7) {
+ }else if (num == 13) {
this.editData[this.zbIndex].HTransportCar = deptRow.HItemID;
this.editData[this.zbIndex].杩愯緭鏂瑰紡鍚嶇О = deptRow.杞﹀瀷鍚嶇О;
this.CarTypeShow = false;
@@ -732,6 +764,9 @@
deptClose() {
this.deptform = {};
this.openData = false;
+ this.$nextTick(() => {
+ this.showReset();
+ });
},
//琛ㄥ崟鍒濆鍖�
@@ -750,8 +785,8 @@
HExRate: 1,
HSSName: "",
HSSID: 0,
- HEmpName: "",
- HEmpID: "",
+ HEmpName: sessionStorage["HEmpName"] || "",
+ HEmpID: sessionStorage["HEmpID"] || 0,
HMangerName: "",
HMangerID: "",
HSecManagerName: "",
@@ -920,6 +955,7 @@
HDeleteDate: data[0].浣滃簾鏃ユ湡,
// HSTOCKOUTORGID: data[0].HSTOCKOUTORGID.toString(),
//HSTOCKINORGID: data[0].HSTOCKINORGID.toString(),
+ HSTOCKINORGID:sessionStorage["OrganizationID"],
},
};
//瀛愯〃
@@ -1070,19 +1106,36 @@
this.$refs["form"].validate((valid) => {
if (valid) {
let fhck = false;
- if (this.editData.length == 0) {
- fhck = true;
- this.$modal.msgError("娌℃湁鐗╂枡鏄庣粏璁板綍锛�");
- }
- this.editData.map((item, index) => {
- if (!item.HMaterID) {
+ const requiredFields = [
+ { field: 'HBillNo', name: '鍗曟嵁鍙�' },
+ { field: 'HContractNumber', name: '鍚堝悓缂栧彿' },
+ { field: 'HContractName', name: '鍚堝悓鍚嶇О' },
+ { field: 'HSupID', name: '渚涘簲鍟�' },
+ { field: 'HEmpID', name: '涓氬姟鍛�' },
+ { field: 'HDeptID', name: '閮ㄩ棬' },
+ { field: 'HCurID', name: '甯佸埆' },
+ { field: 'HExRate', name: '姹囩巼' },
+ { field: 'HSTOCKINORGID', name: '缁勭粐' },
+ { field: 'HSSName', name: '缁撶畻鏂瑰紡' }
+ ];
+ for (let i = 0; i < requiredFields.length; i++) {
+ const field = requiredFields[i].field;
+ const name = requiredFields[i].name;
+ if (!this.form[field] || this.form[field] === 0 || this.form[field] === '') {
fhck = true;
- this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍣ㄥ叿鏈�夋嫨锛�");
- } else if (!item.HQty || item.HQty == 0) {
- fhck = true;
- this.$modal.msgError("绗�" + (index + 1) + "琛岋細鏁伴噺涓嶈兘涓�0锛�");
+ this.$modal.msgError(name + "涓嶈兘涓虹┖锛�");
}
- });
+ }
+
+ // this.editData.map((item, index) => {
+ // if (!item.HMaterID) {
+ // fhck = true;
+ // this.$modal.msgError("绗�" + (index + 1) + "琛岋細鍣ㄥ叿鏈�夋嫨锛�");
+ // } else if (!item.HQty || item.HQty == 0) {
+ // fhck = true;
+ // this.$modal.msgError("绗�" + (index + 1) + "琛岋細鏁伴噺涓嶈兘涓�0锛�");
+ // }
+ // });
this.$nextTick(() => {
if (!fhck) {
var Operation = null;
@@ -1110,7 +1163,7 @@
axios({
method: "post",
url:
- this.$baseUrl + "/Kf_MoveStockRequestBill/Kf_MoveStockRequestBillEdit",
+ this.$baseUrl + "/Cg_ContractTransportBillListController/Save%EF%BB%BFCg_ContractTransportBillList",
data: {
sMainSub: sMainSub,
},
@@ -1139,6 +1192,9 @@
this.gyEmployeeShow = false;
this.gySupplierShow = false;
this.AreaDialogShow = false;
+ this.CurrencyDialogShow = false;
+ this.SettleStyleDialogShow = false;
+ this.CarTypeShow = false;
},
// 鎵撳紑鏁版嵁鍒楄〃寮圭獥
openDataDialog(num, row) {
@@ -1146,6 +1202,7 @@
if (row) {
this.zbIndex = row.index - 1;
}
+
this.showReset();
if (num == 1) {
this.dialogTitle = "閮ㄩ棬鍒楄〃";
diff --git a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
index 4807b1e..4af588b 100644
--- a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
+++ b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
@@ -123,11 +123,11 @@
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
- @click="set_CheckBill(1, form = rowForm)">瀹℃牳</el-button>
+ @click="set_CheckBill(0, form = rowForm)">瀹℃牳</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
- @click="set_CheckBill(2, form = rowForm)">杩斿鏍�</el-button>
+ @click="set_CheckBill(1, 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>
@@ -732,10 +732,12 @@
this.getList()
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
+ //Delete%EF%BB%BFBill
handleDelete() {
+ console.log("鍒犻櫎", this.rowForm.HInterID.toString())
this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
axios.get(this.$baseUrl + "/Cg_ContractTransportBillListController/Delete%EF%BB%BFBill", {
- params: { 'HInterID': this.rowForm.hmainid.toString() }
+ params: { 'HInterID': this.rowForm.HInterID.toString(), 'user': sessionStorage["HUserName"] }
}).then(response => {
if (response.data.count == 1) {
this.getList()
@@ -750,10 +752,10 @@
},
// 鍙嶅鏍�/瀹℃牳鏁版嵁
set_CheckBill(num, form) {
- var InterID = form.hmainid || form.HInterID
+ var InterID = this.rowForm.HInterID.toString()
//閫昏緫瀹℃牳鏂规硶
axios.get(this.$baseUrl + "/Cg_ContractTransportBillEdit/AuditCg_ContractTransportBillEdit", {
- params: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] }
+ params: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
}).then(response => {
let result = response.data
if (result.count == 1) {
diff --git a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
index 66c4ddb..785ff45 100644
--- a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -21,7 +21,7 @@
<el-col :span="6">
<el-form-item label="鏃ユ湡" prop="HDate">
<el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡"
- value-format="yyyy-MM-dd" disabled> </el-date-picker>
+ format="yyyy-MM-dd" disabled> </el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -177,36 +177,20 @@
<el-col :span="6">
<el-form-item label="瑕佹眰鎻愯揣鏃ユ湡" prop="HDateForRequestedPick">
<el-date-picker v-model="form.HDateForRequestedPick" type="date"
- placeholder="閫夋嫨瑕佹眰鎻愯揣鏃ユ湡" value-format="yyyy-MM-dd">
+ placeholder="閫夋嫨瑕佹眰鎻愯揣鏃ユ湡" format="yyyy-MM-dd hh:mm:ss">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鎵胯繍鍟嗙‘璁ゆ棩鏈�" prop="HDate_CarrierSure">
<el-date-picker v-model="form.HDate_CarrierSure" type="date" placeholder="閫夋嫨鎵胯繍鍟嗙‘璁ゆ棩鏈�"
- value-format="yyyy-MM-dd">
+ format="yyyy-MM-dd hh:mm:ss" disabled>
</el-date-picker>
</el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item label="鍒嗛厤鍙告満鏃ユ湡" prop="HDate_AllocationDriver">
- <el-date-picker v-model="form.HDate_AllocationDriver" type="date"
- placeholder="閫夋嫨鍒嗛厤鍙告満鏃ユ湡" value-format="yyyy-MM-dd">
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="瑕佹眰鍒拌揪鏃ユ湡" prop="HDataForRequestedArrived">
- <el-date-picker v-model="form.HDataForRequestedArrived" type="date"
- placeholder="閫夋嫨瑕佹眰鍒拌揪鏃ユ湡" value-format="yyyy-MM-dd">
- </el-date-picker>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
<el-col :span="6">
<el-form-item label="鐗╂祦鐘舵��" prop="HCarryStatus">
- <el-select v-model="form.HCarryStatus" placeholder="璇烽�夋嫨鐗╂祦鐘舵��">
+ <el-select v-model="form.HCarryStatus" placeholder="璇烽�夋嫨鐗╂祦鐘舵��" disabled>
<el-option label="鐢宠涓�" value="1"></el-option>
<el-option label="宸插鏍�" value="2"></el-option>
<el-option label="鎵胯繍鍟嗙‘璁�" value="3"></el-option>
@@ -219,9 +203,27 @@
</el-select>
</el-form-item>
</el-col>
+ </el-row>
+ </el-tab-pane>
+ <el-tab-pane label="鎵胯繍鍟嗕俊鎭�" name="second">
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鍒嗛厤鍙告満鏃ユ湡" prop="HDate_AllocationDriver">
+ <el-date-picker v-model="form.HDate_AllocationDriver" type="date"
+ placeholder="閫夋嫨鍒嗛厤鍙告満鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="瑕佹眰鍒拌揪鏃ユ湡" prop="HDataForRequestedArrived">
+ <el-date-picker v-model="form.HDataForRequestedArrived" type="date"
+ placeholder="閫夋嫨瑕佹眰鍒拌揪鏃ユ湡" format="yyyy-MM-dd hh:mm:ss">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
<el-col :span="6">
<el-form-item label="杞﹁締" prop="HCarName">
- <el-input v-model="form.HCarName" placeholder="璇疯緭鍏ヨ溅杈�">
+ <el-input v-model="form.HCarName" placeholder="璇疯緭鍏ヨ溅杈�" disabled>
<el-button slot="append" icon="el-icon-search"
@click="openDataDialog(14)"></el-button>
</el-input>
@@ -229,52 +231,80 @@
</el-col>
<el-col :span="6">
<el-form-item label="鍙告満" prop="HDriverName">
- <el-input v-model="form.HDriverName" placeholder="璇疯緭鍏ュ徃鏈�">
+ <el-input v-model="form.HDriverName" placeholder="璇疯緭鍏ュ徃鏈�" disabled>
<el-button slot="append" icon="el-icon-search"
@click="openDataDialog(15)"></el-button>
</el-input>
</el-form-item>
</el-col>
</el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鍒板巶纭浜�" prop="HSurer_Arrive">
+ <el-input v-model="form.HSurer_Arrive" placeholder="璇疯緭鍏ュ埌鍘傜‘璁や汉" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍒板巶纭鏃堕棿" prop="HDate_Arrive">
+ <el-date-picker v-model="form.HDate_Arrive" type="date" format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨鍒板巶纭鏃堕棿" disabled>
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鎻愯揣纭浜�" prop="HSurer_Pick">
+ <el-input v-model="form.HSurer_Pick" placeholder="璇疯緭鍏ユ彁璐х‘璁�" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鎻愯揣纭鏃堕棿" prop="HDate_Pick">
+ <el-date-picker v-model="form.HDate_Pick" type="date" format="yyyy-MM-dd hh:mm:ss"
+ placeholder="閫夋嫨鎻愯揣纭鏃堕棿" disabled>
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鍑哄巶杩愯緭纭浜�" prop="HSurer_Trans">
+ <el-input v-model="form.HSurer_Trans" placeholder="璇疯緭鍏ュ埌鍘傜‘璁や汉" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍑哄巶杩愯緭纭鏃堕棿" prop="HDate_Trans">
+ <el-date-picker v-model="form.HDate_Trans" type="date" format="yyyy-MM-dd hh:mm:ss"
+ placeholder="閫夋嫨鍒板嚭鍘傝繍杈撶‘璁ゆ椂闂�" disabled>
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="绛炬敹纭浜�" prop="HSurer_Receive">
+ <el-input v-model="form.HSurer_Receive" placeholder="璇疯緭鍏ョ鏀剁‘璁や汉" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="绛炬敹纭鏃堕棿" prop="HDate_Receive">
+ <el-date-picker v-model="form.HDate_Receive" type="date"
+ format="yyyy-MM-dd hh:mm:ss" placeholder="閫夋嫨绛炬敹纭鏃堕棿" disabled>
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鏍哥畻浜�" prop="HSurer_Accounting">
+ <el-input v-model="form.HSurer_Accounting" placeholder="璇疯緭鍏ユ牳绠椾汉" disabled />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鏍哥畻鏃堕棿" prop="HDate_Accounting">
+ <el-date-picker v-model="form.HDate_Accounting" type="date"
+ format="yyyy-MM-dd hh:mm:ss" placeholder="閫夋嫨鏍哥畻鏃堕棿" disabled>
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-tab-pane>
- <!-- <el-tab-pane label="闄勪欢淇℃伅" name="second">
- <div style="padding: 10px;">
- <el-upload class="upload-demo" ref="upload" action="" :on-change="handleFileChange"
- :show-file-list="false" :on-remove="handleFileRemove" :file-list="uploadFiles"
- :auto-upload="false" multiple>
- <el-button slot="trigger" size="small" type="primary">閫夋嫨鏂囦欢</el-button>
- <el-button style="margin-left: 10px;" size="small" type="success" @click="submitUpload"
- :loading="uploadLoading">涓婁紶鏂囦欢</el-button>
- </el-upload>
- <el-table :data="uploadFiles" style="width: 100%" border>
- <el-table-column prop="name" label="鏂囦欢鍚�">
- </el-table-column>
- <el-table-column prop="type" label="鏂囦欢绫诲瀷">
- <template slot-scope="scope">
- {{ scope.row.name.substring(scope.row.name.lastIndexOf('.') + 1).toLowerCase()
- }}
- </template>
-</el-table-column>
-<el-table-column prop="size" label="澶у皬">
- <template slot-scope="scope">
- {{ (scope.row.size / 1024).toFixed(1) + ' KB' }}
- </template>
-</el-table-column>
-<el-table-column prop="status" label="鐘舵��">
- <template slot-scope="scope">
- <span v-if="scope.row.status == 'ready'">鏈笂浼�</span>
- </template>
-</el-table-column>
-<el-table-column label="鎿嶄綔" width="180">
- <template slot-scope="scope">
- <el-button size="mini" type="primary"
- @click="flieUpload(scope.row)">涓婁紶</el-button>
- <el-button size="mini" type="danger" @click="deleteFile(index)">鍒犻櫎</el-button>
- </template>
-</el-table-column>
-</el-table>
-</div>
-</el-tab-pane> -->
<el-tab-pane label="鍒跺崟淇℃伅" name="third">
<el-row>
<el-col :span="6">
@@ -340,72 +370,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="鍒板巶纭浜�" prop="HSurer_Arrive">
- <el-input v-model="form.HSurer_Arrive" placeholder="璇疯緭鍏ュ埌鍘傜‘璁や汉" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍒板巶纭鏃堕棿" prop="HDate_Arrive">
- <el-date-picker v-model="form.HDate_Arrive" type="date" placeholder="閫夋嫨鍒板巶纭鏃堕棿"
- disabled>
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鎻愯揣纭浜�" prop="HSurer_Pick">
- <el-input v-model="form.HSurer_Pick" placeholder="璇疯緭鍏ユ彁璐х‘璁�" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鎻愯揣纭鏃堕棿" prop="HDate_Pick">
- <el-date-picker v-model="form.HDate_Pick" type="date" placeholder="閫夋嫨鎻愯揣纭鏃堕棿"
- disabled>
- </el-date-picker>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="鍑哄巶杩愯緭纭浜�" prop="HSurer_Trans">
- <el-input v-model="form.HSurer_Trans" placeholder="璇疯緭鍏ュ埌鍘傜‘璁や汉" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍑哄巶杩愯緭纭鏃堕棿" prop="HDate_Trans">
- <el-date-picker v-model="form.HDate_Trans" type="date" placeholder="閫夋嫨鍒板嚭鍘傝繍杈撶‘璁ゆ椂闂�"
- disabled>
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="绛炬敹纭浜�" prop="HSurer_Receive">
- <el-input v-model="form.HSurer_Receive" placeholder="璇疯緭鍏ョ鏀剁‘璁や汉" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="绛炬敹纭鏃堕棿" prop="HDate_Receive">
- <el-date-picker v-model="form.HDate_Receive" type="date" placeholder="閫夋嫨绛炬敹纭鏃堕棿"
- disabled>
- </el-date-picker>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="鏍哥畻浜�" prop="HSurer_Accounting">
- <el-input v-model="form.HSurer_Accounting" placeholder="璇疯緭鍏ユ牳绠椾汉" disabled />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鏍哥畻鏃堕棿" prop="HDate_Accounting">
- <el-date-picker v-model="form.HDate_Accounting" type="date" placeholder="閫夋嫨鏍哥畻鏃堕棿"
- disabled>
- </el-date-picker>
- </el-form-item>
- </el-col>
- </el-row>
+
</el-tab-pane>
</el-tabs>
<el-card class="box-card">
@@ -470,7 +435,11 @@
</template>
</el-table-column>
<el-table-column align="center" label="鍖呰瀹瑰櫒鏁伴噺" width="120">
- <template slot-scope="scope">{{ scope.row.HMouldQty }}</template>
+ <template slot-scope="scope">
+ <el-input-number v-model="scope.row.HMouldQty" :min="0" style="width: 90px;"
+ controls-position="right"
+ @change="changeHMouldQty(scope.row)"></el-input-number>
+ </template>
</el-table-column>
<el-table-column align="center" label="鐗╂枡鏁伴噺" width="120">
<template slot-scope="scope">
@@ -485,9 +454,9 @@
</template>
</el-table-column>
<el-table-column align="center" label="闆跺崟鍗犵敤浣撶Н" width="120">
- <template slot-scope="scope">
- <el-input-number v-model="scope.row.HScatteredVolume" :min="0" style="width: 90px;"
- controls-position="right"></el-input-number>
+ <template slot-scope="scope">{{ scope.row.HScatteredVolume }}
+ <!-- <el-input-number v-model="scope.row.HScatteredVolume" :min="0" style="width: 90px;"
+ controls-position="right"></el-input-number> -->
</template>
</el-table-column>
<el-table-column align="center" label="鎿嶄綔" width="55" fixed="right">
@@ -817,7 +786,7 @@
this.form.HSurer_Accounting = data.鏍哥畻浜�
this.form.HDate_Accounting = data.鏍哥畻鏃堕棿
}
- this.form.HOrgID = data.HOrgID.toString()
+ this.form.HOrgID = data.HOrgID
this.form.HExRate = !data.姹囩巼 ? 0 : data.姹囩巼
this.form.HMainSourceInterID = data.HMainSourceInterID
this.form.HMainSourceEntryID = data.HMainSourceEntryID
@@ -839,7 +808,7 @@
this.form.HCarTypeName = data.杞﹀瀷鍚嶇О
this.form.HCarTypeMaxVolume = data.杞﹀瀷鏈�澶у绉�
this.form.HTotalVolume = data.鎬讳綋绉�
- this.form.HLoadingRate = data.瑁呰浇鐜�
+ this.form.HLoadingRate = (data.瑁呰浇鐜� * 100).toFixed(2) + '%'
this.form.HContractTransportInterID = data.鎵胯繍鍚堝悓ID
this.form.HContractTransportEntryID = data.鎵胯繍鍚堝悓瀛怚D
this.form.HContractTransportBillNo = data.鎵胯繍鍚堝悓鍗曟嵁鍙�
@@ -976,7 +945,7 @@
this.gyCarShow = true
this.openData = true
} else if (num == 15) {
- this.dialogTitle = '杞﹁締鍒楄〃'
+ this.dialogTitle = '鍙告満鍒楄〃'
this.gyDriverShow = true
this.openData = true
} else if (num == 16) {
@@ -1063,12 +1032,14 @@
this.gyDriverShow = false
this.openData = false
} else if (num == 16) {
+ console.log(deptRow)
this.form.HContractTransportBillNo = deptRow.鍗曟嵁鍙�
this.form.HContractTransportInterID = deptRow.HInterID
this.form.HContractTransportEntryID = deptRow.HInterID
this.form.HDistance = deptRow.璺濈
this.form.HTransportTimes = deptRow.杩愯緭鏃舵晥
this.form.HTransportTyep = deptRow.杩愯緭绫诲瀷
+ this.form.HTransType = deptRow.杩愯緭绫诲瀷
this.form.HSSID = deptRow.缁撶畻鏂瑰紡
this.form.HSSName = deptRow.缁撶畻鏂瑰紡鍚嶇О
this.form.HCurID = deptRow.甯佸埆
@@ -1089,7 +1060,7 @@
this.editData[this.zbIndex].HMouldHeight = deptRow.楂樺害
this.editData[this.zbIndex].HMouldFoldHeight = deptRow.鎶樺彔楂樺害
this.editData[this.zbIndex].HSNP = deptRow.瀹瑰櫒鍖呰浜у搧鏁伴噺
- this.editData[this.zbIndex].HVolume = (this.editData[this.zbIndex].HMouldLength * this.editData[this.zbIndex].HMouldWidth * this.editData[this.zbIndex].HMouldHeight).toFixed(2) - 0
+ this.editData[this.zbIndex].HVolume = (this.editData[this.zbIndex].HMouldLength * this.editData[this.zbIndex].HMouldWidth * this.editData[this.zbIndex].HMouldHeight * this.editData[this.zbIndex].HMouldQty).toFixed(2) - 0
this.form.HTotalVolume = 0
this.editData.map(item => {
this.form.HTotalVolume = item.HVolume + this.form.HTotalVolume
@@ -1161,6 +1132,9 @@
this.form.HMainSourceEntryID = deptRow[0]["hsubid"]
this.form.HMainSourceBillType = deptRow[0]["HBillType"]
this.form.HMainSourceBillNo = deptRow[0]["鍗曟嵁鍙�"]
+ this.form.HCurName = deptRow[0]["甯佸埆"]
+ this.form.HCurID = deptRow[0]["HCurID"]
+ this.form.HExRate = deptRow[0]["姹囩巼"]
// 妫�鏌ユ槸鍚︽墍鏈夎褰曞睘浜庡悓涓�瀹㈡埛
for (var i = 0; i < deptRow.length; i++) {
if (deptRow[i]["HCusID"] != this.form.HCusID) {
@@ -1518,6 +1492,12 @@
this.editData = editData.filter(function (item) {
return checkedSysZb.indexOf(item.index) == -1
});
+ this.form.HTotalVolume = 0
+ if (this.editData.length > 0) {
+ this.editData.map(item => {
+ this.form.HTotalVolume = item.HVolume + this.form.HTotalVolume
+ })
+ }
}
},
//#endregion
@@ -1665,7 +1645,22 @@
});
},
//#endregion
-
+ // 鍖呰瀹瑰櫒鏁伴噺璁＄畻浣撶Н
+ changeHMouldQty(row) {
+ this.zbIndex = row.index - 1
+ let Volume = ((this.editData[this.zbIndex].HMouldLength * this.editData[this.zbIndex].HMouldWidth * this.editData[this.zbIndex].HMouldHeight * this.editData[this.zbIndex].HMouldQty).toFixed(2)) - 0
+ if (!Volume) {
+ this.editData[this.zbIndex].HVolume = 0
+ } else {
+ this.editData[this.zbIndex].HVolume = Volume
+ }
+ this.form.HTotalVolume = 0
+ this.editData.map(item => {
+ this.form.HTotalVolume = item.HVolume + this.form.HTotalVolume
+ })
+ this.calculateLoadingRate(parseFloat(this.form.HTotalVolume || 0));
+ },
+ //#endregion
// 璁＄畻瑁呰浇鐜囧嚱鏁�
calculateLoadingRate(totalVolume) {
var maxVolume = parseFloat(this.form.HCarTypeMaxVolume) || 0;
@@ -1690,7 +1685,6 @@
}
}
});
-
tableData.forEach(function (row) {
if (row.HSourceInterID && row.HSourceEntryID) {
var key = row.HSourceInterID + '_' + row.HSourceEntryID;
@@ -1728,17 +1722,29 @@
}
}
if (exceedSources.length > 0) {
+ let num = null
var message = '鐗╂枡鏁伴噺涔嬪拰瓒呰繃婧愬崟鏁伴噺锛�';
exceedSources.forEach(function (item, index) {
+ num = item.sourceQty
message += (index + 1) + '. 婧愬崟鍙凤細' + item.sourceBillNo +
'锛屾簮鍗曟暟閲忥細' + item.sourceQty +
'锛屽綋鍓嶆暟閲忥細' + item.currentTotal;
- });
+ });
+ this.$nextTick(() => {
+ this.editData[selRow.index - 1].HQty = num
+ this.changeHMouldQty(selRow)
+ })
this.$modal.msgError(message);
return true; // 琛ㄧず鏈夎秴鍑�
}
- this.editData[selRow.index-1].HMouldQty = Math.ceil(selRow.HQty / this.editData[selRow.index-1].HSNP)
+ let MouldQty = Math.ceil(selRow.HQty / this.editData[selRow.index - 1].HSNP)
+ if (!MouldQty||MouldQty=='Infinity') {
+ this.editData[selRow.index - 1].HMouldQty = 0
+ } else {
+ this.editData[selRow.index - 1].HMouldQty = MouldQty
+ }
+ this.changeHMouldQty(selRow)
return false; // 琛ㄧず娌℃湁瓒呭嚭
},
//#region 闄勪欢涓婁紶鐩稿叧鏂规硶
diff --git a/src/views/logistics/transportGPS/WL_YayBill.vue b/src/views/logistics/transportGPS/WL_YayBill.vue
index 7709a29..f1a6b7a 100644
--- a/src/views/logistics/transportGPS/WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/WL_YayBill.vue
@@ -172,7 +172,11 @@
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini"
- @click="handlePush(row = rowForm, OperationType = 4)">涓嬫帹锛堣垂鐢ㄧ粨绠楀崟锛�</el-button>
+ @click="handlePush(row = rowForm, OperationType = 4)">涓嬫帹锛堣垂鐢ㄧ粨绠楀崟锛�</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
+ @click="openDataDialog(14, form = rowForm)">鍒嗛厤鍙告満</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
@@ -281,11 +285,19 @@
<!-- 鍖呰瀹瑰櫒鍑哄叆搴撴槑缁� -->
<PackStockDetail :visible.sync="packStockDetailShow" ref="packStockDetail" />
<!-- 涓嬫帹 -->
- <el-dialog title="涓嬫帹杩愬崟缁撶畻鍗�" :visible.sync="openPush" width="1480px" append-to-body class="xsckdBox" @close="close">
- <PayMentOtherBillTranEdit :OperationType='4' :propsData='pushData' :HSouceBillType=this.rowForm.HSourceBillType
- @editClose="pushClose" v-if="pushShow" />
+ <el-dialog title="涓嬫帹杩愬崟缁撶畻鍗�" :visible.sync="openPush" width="1480px" append-to-body class="xsckdBox"
+ @close="close">
+ <PayMentOtherBillTranEdit :OperationType='4' :propsData='pushData'
+ :HSouceBillType=this.rowForm.HSourceBillType @editClose="pushClose" v-if="pushShow" />
</el-dialog>
-
+ <el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body>
+ <GyCar @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCarShow" />
+ <GyDriver @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyDriverShow" />
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
+ <el-button @click="deptClose">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
</div>
</div>
</template>
@@ -299,9 +311,11 @@
import PackStockDetail from '@/views/component/PackStockDetail' //鏉＄爜鏄庣粏缁勪欢
import Edit from '@/views/logistics/transportGPS/Add_Edit_WL_YayBill' //缂栬緫椤甸潰缁勪欢
import PayMentOtherBillTranEdit from "@/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillEdit.vue"; //缂栬緫椤甸潰缁勪欢
+import GyCar from "@/views/basic/gyCar/gyCarList.vue"
+import GyDriver from "@/views/system/user/GyDriver.vue"
export default {
name: 'WL_YayBill',
- components: { BarCodeDetail,PackStockDetail,Edit,RowSettings,PrintList,PayMentOtherBillTranEdit},
+ components: { BarCodeDetail, PackStockDetail, Edit, RowSettings, PrintList, PayMentOtherBillTranEdit, GyCar, GyDriver },
data() {
return {
baseURL: process.env.VUE_APP_BASE_API, //鍚庣鎺ュ彛鍓嶇紑(鍚庣鏈嶅姟鍣╥p鍦板潃)
@@ -351,7 +365,7 @@
openEdit: false, //缂栬緫缁勪欢鏄剧ず鏍囪
pushShow: false,
openPush: false,
- pushData:'',
+ pushData: '',
openPrintList: false, //鎵撳嵃缁勪欢瀹瑰櫒鏄剧ず鏍囪
printListShow: false, //鎵撳嵃缁勪欢鏄剧ず鏍囪
openBtnHide: false, //鎸夐挳缁勪欢瀹瑰櫒鏄剧ず鏍囪
@@ -361,6 +375,11 @@
barCodeDetailShow: false, //鏉＄爜鏄庣粏缁勪欢瀹瑰櫒鏄剧ず鏍囪
packStockDetailShow: false, //鍖呰瀹瑰櫒鍑哄叆搴撴槑缁嗗鍣ㄦ樉绀烘爣璁�
openVolume: false, //缁存姢闆跺崟鍗犵敤浣撶Н寮圭獥鏍囪
+ openData: false, //鏁版嵁寮圭獥
+ dialogTypeNum: null, //閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
+ gyCarShow: false, //杞﹁締鏁版嵁缁勪欢鏄剧ず鏍囪
+ gyDriverShow: false, //鍙告満鏁版嵁缁勪欢鏄剧ず鏍囪
+ deptform: {}, //寮圭獥閫変腑鏁版嵁
// 鏌ヨ鍙傛暟
sWhere: '', // 鎷兼帴杩囨护鏉′欢
queryParams: { // form鏁版嵁
@@ -448,7 +467,7 @@
//#region 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
// this.rowForm = {}
- this.rowList=selection
+ this.rowList = selection
this.ids = selection.map(item => item.HInterID)
this.single = selection.length != 1
this.multiple = !selection.length
@@ -576,6 +595,7 @@
// if (this.queryParams.HOrgID) {
// this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
// }
+ this.clearData()
this.getList()
},
//#endregion
@@ -804,13 +824,13 @@
this.OperationType = 4
},
//鍏抽棴涓嬫帹椤甸潰
- pushClose(val) {
- this.open = val
- this.pushShow = false
- this.openPush = val
- this.clearData()
- this.getList()
- },
+ pushClose(val) {
+ this.open = val
+ this.pushShow = false
+ this.openPush = val
+ this.clearData()
+ this.getList()
+ },
//#endregion
cancelVolume() {
this.openVolume = false
@@ -862,37 +882,37 @@
},
//#endregion
//#region 鎵撳紑涓嬫帹缁勪欢寮圭獥
- handlePush() {
+ handlePush() {
- if (this.rowList && this.rowList.length > 0) {
- var dataArray = [];
- for (var i = 0; i < this.rowList.length; i++) {
- if (this.rowList[i].鍗曟嵁鐘舵�� != "宸插鏍�") {
- this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹��" + this.rowList[i].鍗曟嵁鍙� + "銆戜笉涓哄凡瀹℃牳鐘舵��,涓嶅厑璁镐笅鎺紒")
- return;
+ if (this.rowList && this.rowList.length > 0) {
+ var dataArray = [];
+ for (var i = 0; i < this.rowList.length; i++) {
+ if (this.rowList[i].鍗曟嵁鐘舵�� != "宸插鏍�") {
+ this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹��" + this.rowList[i].鍗曟嵁鍙� + "銆戜笉涓哄凡瀹℃牳鐘舵��,涓嶅厑璁镐笅鎺紒")
+ return;
+ }
+ if (this.rowList[i].HQtyMust <= 0) {
+ this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹��" + this.rowList[i].鍗曟嵁鍙� + "銆戝搴斿彲涓嬫帹鏁伴噺蹇呴』澶т簬 0 锛�")
+ return;
+ }
+ var temp = {
+ "HInterID": this.rowList[i].HInterID
+ , "HEntryID": this.rowList[i].HEntryID
+ , "HBillStatus": this.rowList[i].鍗曟嵁鐘舵��
+ }
+ dataArray.push(temp);
+ }
+ var datajson = {
+ "data": dataArray
+ };
+ this.pushData = JSON.stringify(datajson)
+ this.pushShow = true
+ this.openPush = true
+ } else {
+ this.$modal.msgError("璇烽�夋嫨鏁版嵁涓嬫帹锛�")
}
- if (this.rowList[i].HQtyMust <= 0) {
- this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹��" + this.rowList[i].鍗曟嵁鍙� + "銆戝搴斿彲涓嬫帹鏁伴噺蹇呴』澶т簬 0 锛�")
- return;
- }
- var temp = {
- "HInterID": this.rowList[i].HInterID
- , "HEntryID": this.rowList[i].HEntryID
- , "HBillStatus": this.rowList[i].鍗曟嵁鐘舵��
- }
- dataArray.push(temp);
- }
- var datajson = {
- "data": dataArray
- };
- this.pushData = JSON.stringify(datajson)
- this.pushShow = true
- this.openPush = true
- } else {
- this.$modal.msgError("璇烽�夋嫨鏁版嵁涓嬫帹锛�")
- }
- },
- //#endregion
+ },
+ //#endregion
//#region 鍏抽棴/鍙嶅叧闂�
set_CloseBills(num) {
var InterID = form.hmainid || form.HInterID
@@ -1173,6 +1193,99 @@
return result;
},
//#endregion
+ //#region 鏁版嵁寮圭獥
+ //#region 鎵撳紑鏁版嵁鍒楄〃寮圭獥
+ openDataDialog(num, row) {
+ this.showReset()
+ if (num == 14) {
+ this.dialogTitle = '杞﹁締鍒楄〃'
+ this.gyCarShow = true
+ this.openData = true
+ } else if (num == 15) {
+ this.dialogTitle = '鍙告満鍒楄〃'
+ this.gyDriverShow = true
+ this.openData = true
+ }
+ },
+ //#region 灏嗘暟鎹脊绐楀叏閮ㄥ彇娑堝姞杞�
+ showReset() {
+ this.gyCarShow = false
+ this.gyDriverShow = false
+ },
+ //#endregion
+ //#endregion
+
+ //#region 寮圭獥鏁版嵁鍙屽嚮杩斿洖琛ㄥ崟璧嬪�间簨浠�
+ async dbEmitData(deptRow, num) {
+ let IsAudit = null
+ if (num == 14) {
+ IsAudit = 1
+ } else if (num == 15) {
+ IsAudit = 2
+ }
+ try {
+ const response = await axios.get(this.baseURL + '/WLYayBillController/selectDriver', {
+ params: {
+ "HInterID": this.rowForm.HInterID.toString(),
+ "HcheckID": deptRow.HItemID,
+ "IsAudit": IsAudit,
+ "CurUserName": sessionStorage["HUserName"]
+ },
+ });
+ if (response.data.code == 1) {
+ // return response.data.data[0];
+ if (num == 14) {
+ this.gyCarShow = false
+ this.openData = false
+ this.$modal.msgSuccess(response.data.msg || "杞﹁締娣诲姞鎴愬姛");
+ num = 15
+ this.$nextTick(() => {
+ this.gyDriverShow = true
+ this.openData = true
+ })
+
+ } else if (num == 15) {
+ this.gyDriverShow = false
+ this.openData = false
+ this.$modal.msgSuccess(response.data.msg || "鍙告満娣诲姞鎴愬姛");
+ }
+ } else {
+ this.$modal.msgError(response.data.msg || "鑾峰彇婧愬崟鏁版嵁澶辫触");
+ }
+ } catch (error) {
+ this.$modal.msgError("鑾峰彇婧愬崟鏁版嵁鏃跺彂鐢熼敊璇紝璇风◢鍚庨噸璇�!");
+ }
+ },
+ //#endregion
+ //#region 寮圭獥鏁版嵁鍗曞嚮浜嬩欢
+ emitData(deptRow, num) {
+ this.dialogTypeNum = num
+ this.deptform = deptRow
+ },
+ //#endregion
+ //#region 寮圭獥纭畾浜嬩欢
+ deptClickSub() {
+ this.dbEmitData(this.deptform, this.dialogTypeNum)
+ this.deptform = {}
+ },
+ //#endregion
+
+ //#region 寮圭獥鍙栨秷浜嬩欢
+ deptClose() {
+ this.deptform = {}
+ this.openData = false
+ },
+ //#endregion
+ //#endregion
+ //娓呴櫎閫変腑鏁版嵁鐨勭紦瀛�
+ clearData() {
+ this.ids = []
+ this.multiple = true
+ this.single = true
+ this.OperationType = 0
+ this.copyType = 0
+ },
+
}
};
</script>
diff --git a/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue b/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
index 485caa3..d76e0d4 100644
--- a/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
+++ b/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
@@ -179,7 +179,7 @@
<div :style="item.style">
<span v-if="column.property.includes('鏃ユ湡')">{{
parseTime(row[column.property], "{y}-{m}-{d}")
- }}</span>
+ }}</span>
<el-button type="text" @click="handleEdit(row, (OperationType = 3))"
v-else-if="column.property == '鍗曟嵁鍙�'">{{ row.鍗曟嵁鍙� }}</el-button>
<span v-else>{{ row[column.label] }}</span>
@@ -217,7 +217,7 @@
components: { RowSettings, Edit, PrintList, BarCodeDetail },
props: {
openPage: { type: String, },
- propHMaterID: { },
+ propHMaterID: {},
propHOrgID: {},
},
data() {
@@ -394,12 +394,16 @@
if (this.pageSize == 0) {
this.pageSize = 50;
}
- if (this.propHOrgID) {
+ if (this.propHOrgID) {
this.sWhere += " and HOrgID like '%" + this.propHOrgID + "%'";
}
if (this.propHMaterID) {
this.sWhere += " and HMaterID like '%" + this.propHMaterID + "%'";
}
+ if (this.openPage) {
+ this.sWhere += " and HUseFlag != '0' and HSendPackFlag != '0' and ISNULL(瀹℃牳浜�,'') != ''"
+ }
+ console.log(this.sWhere)
// 鍒楄〃
axios.get(this.$baseUrl + "/Gy_MaterialPackingRelation/Gy_MaterialPackingRelationList", {
params: {
@@ -411,6 +415,7 @@
},
})
.then((response) => {
+ console.log(response)
this.tyResList = response.data.data; //鎬绘暟鎹�
let data1 = response.data;
let option = [];
@@ -783,22 +788,22 @@
this.sWhere += " and 鐗╂枡浠ｇ爜 like '%" + this.queryParams.MaterialCode + "%'";
}
if (this.queryParams.MaterialName) {
- this.sWhere += " and 鐗╂枡鍚嶇О like '%" + this.queryParams.MaterialName + "%'";
+ this.sWhere += " and 鐗╂枡鍚嶇О like '%" + this.queryParams.MaterialName + "%'";
}
if (this.queryParams.SpecificationModel) {
- this.sWhere += " and 瑙勬牸鍨嬪彿 like '%" + this.queryParams.SpecificationModel + "%'";
+ this.sWhere += " and 瑙勬牸鍨嬪彿 like '%" + this.queryParams.SpecificationModel + "%'";
}
if (this.queryParams.HSourceBillNo) {
- this.sWhere += " and 婧愬崟鍗曞彿 like '%" + this.queryParams.HSourceBillNo + "%'";
+ this.sWhere += " and 婧愬崟鍗曞彿 like '%" + this.queryParams.HSourceBillNo + "%'";
}
if (this.queryParams.Warehouse) {
this.sWhere += " and 鍙戣揣浠撳簱 like '%" + this.queryParams.Warehouse + "%'";
}
if (this.queryParams.Hmaker) {
- this.sWhere += " and 鍒跺崟浜� like '%" + this.queryParams.Hmaker + "%'";
+ this.sWhere += " and 鍒跺崟浜� like '%" + this.queryParams.Hmaker + "%'";
}
if (this.queryParams.HUSEORGID) {
- this.sWhere += " and HOrgID like '%" + this.queryParams.HUSEORGID + "%'";
+ this.sWhere += " and HOrgID like '%" + this.queryParams.HUSEORGID + "%'";
}
this.getList();
},
diff --git a/src/views/scMould/basicModeling/Gy_MouldFileList.vue b/src/views/scMould/basicModeling/Gy_MouldFileList.vue
index 56dc319..9833f91 100644
--- a/src/views/scMould/basicModeling/Gy_MouldFileList.vue
+++ b/src/views/scMould/basicModeling/Gy_MouldFileList.vue
@@ -475,6 +475,7 @@
},
//鍒楄〃鏁版嵁
getList() {
+ this.clearData()
this.pageSize = 50
this.tableShow = false
this.loading = true
@@ -1096,6 +1097,15 @@
this.uploadData = this.getPage(this.uploadPage, this.alluploadList)
}, 100)
},
+ //娓呴櫎閫変腑鏁版嵁鐨勭紦瀛�
+ clearData() {
+ this.ids = []
+ this.multiple = true
+ this.single = true
+ this.OperationType = 0
+ this.copyType = 0
+ },
+
}
};
</script>
diff --git a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
index b5f9c24..f5fa7b7 100644
--- a/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldInRequestBillEdit.vue
@@ -19,7 +19,7 @@
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鏃ユ湡" prop="HDate">
- <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd">
+ <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
@@ -132,25 +132,25 @@
<el-row>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鍒跺崟鏃ユ湡" prop="HMakeDate">
- <el-date-picker v-model="form.HMakeDate" type="date" placeholder="閫夋嫨鍒跺崟鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HMakeDate" type="date" placeholder="閫夋嫨鍒跺崟鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="淇敼鏃ユ湡" prop="HUpDateDate">
- <el-date-picker v-model="form.HUpDateDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HUpDateDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="瀹℃牳鏃ユ湡" prop="HCheckDate">
- <el-date-picker v-model="form.HCheckDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HCheckDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鍏抽棴鏃ユ湡" prop="HCloseDate">
- <el-date-picker v-model="form.HCloseDate" type="date" placeholder="閫夋嫨鍏抽棴鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HCloseDate" type="date" placeholder="閫夋嫨鍏抽棴鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
</el-date-picker>
</el-form-item>
</el-col>
@@ -165,7 +165,7 @@
<el-row>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="浣滃簾鏃ユ湡" prop="HDeleteDate">
- <el-date-picker v-model="form.HDeleteDate" type="date" placeholder="閫夋嫨浣滃簾鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HDeleteDate" type="date" placeholder="閫夋嫨浣滃簾鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
</el-date-picker>
</el-form-item>
</el-col>
diff --git a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
index a5ad3a4..5a38797 100644
--- a/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldMoveStockRequestBillEdit.vue
@@ -19,7 +19,7 @@
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鏃ユ湡" prop="HDate">
- <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd">
+ <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
@@ -149,25 +149,25 @@
<el-row>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鍒跺崟鏃ユ湡" prop="HMakeDate">
- <el-date-picker v-model="form.HMakeDate" type="date" placeholder="閫夋嫨鍒跺崟鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HMakeDate" type="date" placeholder="閫夋嫨鍒跺崟鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="淇敼鏃ユ湡" prop="HUpDateDate">
- <el-date-picker v-model="form.HUpDateDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HUpDateDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="瀹℃牳鏃ユ湡" prop="HCheckDate">
- <el-date-picker v-model="form.HCheckDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HCheckDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鍏抽棴鏃ユ湡" prop="HCloseDate">
- <el-date-picker v-model="form.HCloseDate" type="date" placeholder="閫夋嫨鍏抽棴鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HCloseDate" type="date" placeholder="閫夋嫨鍏抽棴鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
</el-date-picker>
</el-form-item>
</el-col>
@@ -182,7 +182,7 @@
<el-row>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="浣滃簾鏃ユ湡" prop="HDeleteDate">
- <el-date-picker v-model="form.HDeleteDate" type="date" placeholder="閫夋嫨浣滃簾鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HDeleteDate" type="date" placeholder="閫夋嫨浣滃簾鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
</el-date-picker>
</el-form-item>
</el-col>
diff --git a/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
index 3fed1f3..77552fe 100644
--- a/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldOutRequestBillEdit.vue
@@ -19,7 +19,7 @@
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鏃ユ湡" prop="HDate">
- <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd">
+ <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
@@ -149,25 +149,25 @@
<el-row>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鍒跺崟鏃ユ湡" prop="HMakeDate">
- <el-date-picker v-model="form.HMakeDate" type="date" placeholder="閫夋嫨鍒跺崟鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HMakeDate" type="date" placeholder="閫夋嫨鍒跺崟鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="淇敼鏃ユ湡" prop="HUpDateDate">
- <el-date-picker v-model="form.HUpDateDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HUpDateDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="瀹℃牳鏃ユ湡" prop="HCheckDate">
- <el-date-picker v-model="form.HCheckDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HCheckDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鍏抽棴鏃ユ湡" prop="HCloseDate">
- <el-date-picker v-model="form.HCloseDate" type="date" placeholder="閫夋嫨鍏抽棴鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HCloseDate" type="date" placeholder="閫夋嫨鍏抽棴鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
</el-date-picker>
</el-form-item>
</el-col>
@@ -182,7 +182,7 @@
<el-row>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="浣滃簾鏃ユ湡" prop="HDeleteDate">
- <el-date-picker v-model="form.HDeleteDate" type="date" placeholder="閫夋嫨浣滃簾鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HDeleteDate" type="date" placeholder="閫夋嫨浣滃簾鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
</el-date-picker>
</el-form-item>
</el-col>
diff --git a/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
index cc30729..dfc7bcf 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdBackBillEdit.vue
@@ -19,7 +19,7 @@
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鏃ユ湡" prop="HDate">
- <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd">
+ <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
@@ -154,25 +154,25 @@
<el-row>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鍒跺崟鏃ユ湡" prop="HMakeDate">
- <el-date-picker v-model="form.HMakeDate" type="date" placeholder="閫夋嫨鍒跺崟鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HMakeDate" type="date" placeholder="閫夋嫨鍒跺崟鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="淇敼鏃ユ湡" prop="HUpDateDate">
- <el-date-picker v-model="form.HUpDateDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HUpDateDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="瀹℃牳鏃ユ湡" prop="HCheckDate">
- <el-date-picker v-model="form.HCheckDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HCheckDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鍏抽棴鏃ユ湡" prop="HCloseDate">
- <el-date-picker v-model="form.HCloseDate" type="date" placeholder="閫夋嫨鍏抽棴鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HCloseDate" type="date" placeholder="閫夋嫨鍏抽棴鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
</el-date-picker>
</el-form-item>
</el-col>
@@ -187,7 +187,7 @@
<el-row>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="浣滃簾鏃ユ湡" prop="HDeleteDate">
- <el-date-picker v-model="form.HDeleteDate" type="date" placeholder="閫夋嫨浣滃簾鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HDeleteDate" type="date" placeholder="閫夋嫨浣滃簾鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
</el-date-picker>
</el-form-item>
</el-col>
diff --git a/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
index 139b13e..52c9a9c 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdMoveBillEdit.vue
@@ -19,7 +19,7 @@
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鏃ユ湡" prop="HDate">
- <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd">
+ <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
@@ -171,25 +171,25 @@
<el-row>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鍒跺崟鏃ユ湡" prop="HMakeDate">
- <el-date-picker v-model="form.HMakeDate" type="date" placeholder="閫夋嫨鍒跺崟鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HMakeDate" type="date" placeholder="閫夋嫨鍒跺崟鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="淇敼鏃ユ湡" prop="HUpDateDate">
- <el-date-picker v-model="form.HUpDateDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HUpDateDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="瀹℃牳鏃ユ湡" prop="HCheckDate">
- <el-date-picker v-model="form.HCheckDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HCheckDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鍏抽棴鏃ユ湡" prop="HCloseDate">
- <el-date-picker v-model="form.HCloseDate" type="date" placeholder="閫夋嫨鍏抽棴鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HCloseDate" type="date" placeholder="閫夋嫨鍏抽棴鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
</el-date-picker>
</el-form-item>
</el-col>
@@ -204,7 +204,7 @@
<el-row>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="浣滃簾鏃ユ湡" prop="HDeleteDate">
- <el-date-picker v-model="form.HDeleteDate" type="date" placeholder="閫夋嫨浣滃簾鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HDeleteDate" type="date" placeholder="閫夋嫨浣滃簾鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
</el-date-picker>
</el-form-item>
</el-col>
diff --git a/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue b/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
index 6af902a..4ed5db1 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdOutBillEdit.vue
@@ -19,7 +19,7 @@
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鏃ユ湡" prop="HDate">
- <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" value-format="yyyy-MM-dd">
+ <el-date-picker v-model="form.HDate" type="date" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
@@ -154,25 +154,25 @@
<el-row>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鍒跺崟鏃ユ湡" prop="HMakeDate">
- <el-date-picker v-model="form.HMakeDate" type="date" placeholder="閫夋嫨鍒跺崟鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HMakeDate" type="date" placeholder="閫夋嫨鍒跺崟鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="淇敼鏃ユ湡" prop="HUpDateDate">
- <el-date-picker v-model="form.HUpDateDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HUpDateDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="瀹℃牳鏃ユ湡" prop="HCheckDate">
- <el-date-picker v-model="form.HCheckDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HCheckDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="鍏抽棴鏃ユ湡" prop="HCloseDate">
- <el-date-picker v-model="form.HCloseDate" type="date" placeholder="閫夋嫨鍏抽棴鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HCloseDate" type="date" placeholder="閫夋嫨鍏抽棴鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
</el-date-picker>
</el-form-item>
</el-col>
@@ -187,7 +187,7 @@
<el-row>
<el-col :span="6">
<el-form-item v-show="HIsShow" label="浣滃簾鏃ユ湡" prop="HDeleteDate">
- <el-date-picker v-model="form.HDeleteDate" type="date" placeholder="閫夋嫨浣滃簾鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HDeleteDate" type="date" placeholder="閫夋嫨浣滃簾鏃ユ湡" format="yyyy-MM-dd hh:mm:ss" disabled>
</el-date-picker>
</el-form-item>
</el-col>
diff --git a/src/views/sell/XsSeOutStockBill.vue b/src/views/sell/XsSeOutStockBill.vue
index 36b4215..82ff637 100644
--- a/src/views/sell/XsSeOutStockBill.vue
+++ b/src/views/sell/XsSeOutStockBill.vue
@@ -1105,7 +1105,7 @@
var sWhere = "";
//this.openPage鍒ゆ柇鏄惁鏈夊�硷紝鏈変唬琛ㄥ叾瀹冮〉闈㈤�氳繃閫夋嫨鎸夐挳鎵撳紑
if (this.openPage) {
- sWhere += " and 绂佺敤鏍囪 != 'Y' and ISNULL(瀹℃牳浜�,'') != ''";
+ sWhere += " and ISNULL(瀹℃牳浜�,'') != ''";
return sWhere;
}
return sWhere;
diff --git a/src/views/system/user/GyDriver.vue b/src/views/system/user/GyDriver.vue
index b010c32..d8b9a4a 100644
--- a/src/views/system/user/GyDriver.vue
+++ b/src/views/system/user/GyDriver.vue
@@ -1,301 +1,143 @@
<template>
<div style="padding: 10px">
<el-card class="search-card" style="margin-bottom: 15px">
- <el-button
- type="text"
- @click="toggleAdvancedSearch"
- style="font-size: 12px; color: #409eff"
- >
- {{ showAdvancedSearch ? "鏀惰捣" : "鏇村" }}
- <i
- :class="
- showAdvancedSearch
- ? 'el-icon-arrow-up'
- : 'el-icon-arrow-down'
- "
- ></i>
- </el-button>
+ <el-button type="text" @click="toggleAdvancedSearch" style="font-size: 12px; color: #409eff">
+ {{ showAdvancedSearch ? "鏀惰捣" : "鏇村" }}
+ <i :class="showAdvancedSearch
+ ? 'el-icon-arrow-up'
+ : 'el-icon-arrow-down'
+ "></i>
+ </el-button>
<div style="margin-top: 15px">
<el-row :gutter="15">
<el-col :span="6">
<div style="display: flex; align-items: center">
- <span style="width: 200px; text-align: right; margin-right: 10px"
- >椹鹃┒鍛樹唬鐮�:</span
- >
- <el-input
- v-model="queryParams.HNumber"
- placeholder="璇疯緭鍏ラ┚椹跺憳浠ｇ爜"
- size="small"
- @keyup.enter.native="handleQuery"
- clearable
- />
+ <span style="width: 200px; text-align: right; margin-right: 10px">椹鹃┒鍛樹唬鐮�:</span>
+ <el-input v-model="queryParams.HNumber" placeholder="璇疯緭鍏ラ┚椹跺憳浠ｇ爜" size="small"
+ @keyup.enter.native="handleQuery" clearable />
</div>
</el-col>
<el-col :span="6">
<div style="display: flex; align-items: center">
- <span style="width: 200px; text-align: right; margin-right: 10px"
- >椹鹃┒鍛樺悕绉�:</span
- >
- <el-input
- v-model="queryParams.HName"
- placeholder="璇疯緭鍏ラ┚椹跺憳鍚嶇О"
- size="small"
- @keyup.enter.native="handleQuery"
- clearable
- />
+ <span style="width: 200px; text-align: right; margin-right: 10px">椹鹃┒鍛樺悕绉�:</span>
+ <el-input v-model="queryParams.HName" placeholder="璇疯緭鍏ラ┚椹跺憳鍚嶇О" size="small"
+ @keyup.enter.native="handleQuery" clearable />
</div>
</el-col>
<el-col :span="6">
<div style="display: flex; align-items: center">
- <span style="width: 100px; text-align: right; margin-right: 10px"
- >缁勭粐:</span
- >
- <el-select
- v-model="queryParams.HUSEORGID"
- placeholder="璇烽�夋嫨缁勭粐"
- size="small"
- style="width: 100%"
- >
- <el-option
- v-for="(item, index) in organizationList"
- :key="index"
- :label="item.Name"
- :value="item.ID"
- >
+ <span style="width: 100px; text-align: right; margin-right: 10px">缁勭粐:</span>
+ <el-select v-model="queryParams.HUSEORGID" placeholder="璇烽�夋嫨缁勭粐" size="small" style="width: 100%">
+ <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</div>
</el-col>
<el-col :span="6">
<div style="display: flex; align-items: center">
- <span style="width: 80px; text-align: right; margin-right: 10px"
- >閲嶆柊鍚屾:</span
- >
- <el-input
- v-model="queryParams.HSyncNumber"
- placeholder="璇疯緭鍏ラ┚椹跺憳浠ｇ爜"
- size="small"
- @keyup.enter.native="handleSync"
- clearable
- style="flex: 1"
- />
- <el-button
- @click="handleSync"
- size="small"
- style="margin-left: 5px"
- >鍚屾</el-button
- >
+ <span style="width: 80px; text-align: right; margin-right: 10px">閲嶆柊鍚屾:</span>
+ <el-input v-model="queryParams.HSyncNumber" placeholder="璇疯緭鍏ラ┚椹跺憳浠ｇ爜" size="small"
+ @keyup.enter.native="handleSync" clearable style="flex: 1" />
+ <el-button @click="handleSync" size="small" style="margin-left: 5px">鍚屾</el-button>
</div>
</el-col>
</el-row>
- <div class="search-header">
- <div style="display: flex; justify-content: space-between; align-items: center">
- <div>
- <el-button
- type="primary"
- icon="el-icon-search"
- size="mini"
- @click="handleQuery"
- style="margin-right: 10px"
- >鎼滅储</el-button
- >
- <el-button
- icon="el-icon-refresh"
- size="mini"
- @click="resetQuery"
- style="margin-right: 10px"
- >閲嶇疆</el-button
- >
- <el-button
- icon="el-icon-refresh"
- size="mini"
- @click="getList"
- style="margin-right: 10px"
- >鍒锋柊</el-button
- >
+ <div class="search-header">
+ <div style="display: flex; justify-content: space-between; align-items: center">
+ <div>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
+ style="margin-right: 10px">鎼滅储</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+ style="margin-right: 10px">閲嶇疆</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="getList" style="margin-right: 10px">鍒锋柊</el-button>
+ </div>
</div>
</div>
- </div>
<el-collapse-transition>
<div v-show="showAdvancedSearch">
<div style="margin-top: 15px">
<el-row :gutter="15">
<div style="margin-bottom: 50px">
- <!-- 绗竴缁勮繃婊ゆ潯浠� -->
- <el-col :span="24">
- <div style="display: flex; align-items: center">
- <el-select
- v-model="queryParams.ColName"
- placeholder="璇烽�夋嫨"
- size="small"
- style="flex: 1"
- >
- <el-option label="" value="0"></el-option>
- <el-option
- v-for="(item, index) in filterColumnList"
- :key="index"
- :label="item.field"
- :value="item.field"
- v-if="!item.hide"
- ></el-option>
- </el-select>
- <el-select
- v-model="queryParams.Comparator"
- placeholder="璇烽�夋嫨"
- size="small"
- style="width: 100px; margin: 0 10px"
- >
- <el-option label="" value="0"></el-option>
- <el-option
- v-for="(item, index) in comparatorList"
- :key="index"
- :label="item.label"
- :value="item.value"
- ></el-option>
- </el-select>
- <el-input
- v-model="queryParams.ColContent"
- placeholder="璇疯緭鍏�"
- size="small"
- @keyup.enter.native="handleQuery"
- clearable
- style="flex: 1"
- />
- </div>
- </el-col>
+ <!-- 绗竴缁勮繃婊ゆ潯浠� -->
+ <el-col :span="24">
+ <div style="display: flex; align-items: center">
+ <el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" size="small" style="flex: 1">
+ <el-option label="" value="0"></el-option>
+ <el-option v-for="(item, index) in filterColumnList" :key="index" :label="item.field"
+ :value="item.field" v-if="!item.hide"></el-option>
+ </el-select>
+ <el-select v-model="queryParams.Comparator" placeholder="璇烽�夋嫨" size="small"
+ style="width: 100px; margin: 0 10px">
+ <el-option label="" value="0"></el-option>
+ <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+ :value="item.value"></el-option>
+ </el-select>
+ <el-input v-model="queryParams.ColContent" placeholder="璇疯緭鍏�" size="small"
+ @keyup.enter.native="handleQuery" clearable style="flex: 1" />
+ </div>
+ </el-col>
</div>
<div style="margin-bottom: 100px">
- <!-- 绗簩缁勮繃婊ゆ潯浠� -->
- <el-col :span="24">
- <div style="display: flex; align-items: center">
-
- <el-select
- v-model="queryParams.ColName1"
- placeholder="璇烽�夋嫨"
- size="small"
- style="flex: 1"
- >
- <!-- <el-option label="" value="0"></el-option> -->
- <el-option
- v-for="(item, index) in filterColumnList"
- :key="index"
- :label="item.field"
- :value="item.field"
- v-if="!item.hide"
- ></el-option>
- </el-select>
- <el-select
- v-model="queryParams.Comparator1"
- placeholder="璇烽�夋嫨"
- size="small"
- style="width: 100px; margin: 0 10px"
- >
- <!-- <el-option label="" value="0"></el-option> -->
- <el-option
- v-for="(item, index) in comparatorList"
- :key="index"
- :label="item.label"
- :value="item.value"
- ></el-option>
- </el-select>
- <el-input
- v-model="queryParams.ColContent1"
- placeholder="璇疯緭鍏�"
- size="small"
- @keyup.enter.native="handleQuery"
- clearable
- style="flex: 1"
- />
- </div>
- </el-col>
+ <!-- 绗簩缁勮繃婊ゆ潯浠� -->
+ <el-col :span="24">
+ <div style="display: flex; align-items: center">
+
+ <el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨" size="small" style="flex: 1">
+ <!-- <el-option label="" value="0"></el-option> -->
+ <el-option v-for="(item, index) in filterColumnList" :key="index" :label="item.field"
+ :value="item.field" v-if="!item.hide"></el-option>
+ </el-select>
+ <el-select v-model="queryParams.Comparator1" placeholder="璇烽�夋嫨" size="small"
+ style="width: 100px; margin: 0 10px">
+ <!-- <el-option label="" value="0"></el-option> -->
+ <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+ :value="item.value"></el-option>
+ </el-select>
+ <el-input v-model="queryParams.ColContent1" placeholder="璇疯緭鍏�" size="small"
+ @keyup.enter.native="handleQuery" clearable style="flex: 1" />
+ </div>
+ </el-col>
</div>
<div style="margin-bottom: 50px">
- <!-- 绗笁缁勮繃婊ゆ潯浠� -->
- <el-col :span="24">
- <div style="display: flex; align-items: center">
- <el-select
- v-model="queryParams.ColName2"
- placeholder="璇烽�夋嫨"
- size="small"
- style="flex: 1"
- >
- <!-- <el-option label="" value="0"></el-option> -->
- <el-option
- v-for="(item, index) in filterColumnList"
- :key="index"
- :label="item.field"
- :value="item.field"
- v-if="!item.hide"
- ></el-option>
- </el-select>
- <el-select
- v-model="queryParams.Comparator2"
- placeholder="璇烽�夋嫨"
- size="big"
- style="width: 100px; margin: 0 10px"
- >
- <el-option label="" value="0"></el-option>
- <el-option
- v-for="(item, index) in comparatorList"
- :key="index"
- :label="item.label"
- :value="item.value"
- ></el-option>
- </el-select>
- <el-input
- v-model="queryParams.ColContent2"
- placeholder="璇疯緭鍏�"
- size="big"
- @keyup.enter.native="handleQuery"
- clearable
- style="flex: 1"
- />
- </div>
- </el-col>
+ <!-- 绗笁缁勮繃婊ゆ潯浠� -->
+ <el-col :span="24">
+ <div style="display: flex; align-items: center">
+ <el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨" size="small" style="flex: 1">
+ <!-- <el-option label="" value="0"></el-option> -->
+ <el-option v-for="(item, index) in filterColumnList" :key="index" :label="item.field"
+ :value="item.field" v-if="!item.hide"></el-option>
+ </el-select>
+ <el-select v-model="queryParams.Comparator2" placeholder="璇烽�夋嫨" size="big"
+ style="width: 100px; margin: 0 10px">
+ <el-option label="" value="0"></el-option>
+ <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+ :value="item.value"></el-option>
+ </el-select>
+ <el-input v-model="queryParams.ColContent2" placeholder="璇疯緭鍏�" size="big"
+ @keyup.enter.native="handleQuery" clearable style="flex: 1" />
+ </div>
+ </el-col>
</div>
</el-row>
</div>
- <div
- v-if="currentFilterScheme"
- style="
+ <div v-if="currentFilterScheme" style="
margin-top: 15px;
padding: 10px;
background-color: #f0f9ff;
border-radius: 4px;
border-left: 4px solid #409eff;
- "
- >
+ ">
<span style="font-size: 14px; font-weight: bold; color: #fc9393">
褰撳墠杩囨护鏂规锛歿{ currentFilterScheme }}
</span>
- <span
- v-if="currentFilterRemark"
- style="font-size: 13px; color: #7b90fb; margin-left: 10px"
- >
+ <span v-if="currentFilterRemark" style="font-size: 13px; color: #7b90fb; margin-left: 10px">
({{ currentFilterRemark }})
</span>
- <el-button
- type="text"
- @click="handleSaveScheme"
- size="mini"
- style="margin-left: 20px"
- >淇濆瓨鏂规</el-button
- >
- <el-button
- type="text"
- @click="handleReadScheme"
- size="mini"
- >璇诲彇鏂规</el-button
- >
- <el-button
- type="text"
- @click="clearFilterScheme"
- size="mini"
- style="color: #f56c6c"
- >娓呴櫎鏂规</el-button
- >
+ <el-button type="text" @click="handleSaveScheme" size="mini" style="margin-left: 20px">淇濆瓨鏂规</el-button>
+ <el-button type="text" @click="handleReadScheme" size="mini">璇诲彇鏂规</el-button>
+ <el-button type="text" @click="clearFilterScheme" size="mini" style="color: #f56c6c">娓呴櫎鏂规</el-button>
</div>
</div>
</el-collapse-transition>
@@ -304,15 +146,8 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-upload2"
- size="mini"
- @click="handleImport"
- id="set_SouceExcel"
- >瀵煎叆</el-button
- >
+ <el-button type="primary" plain icon="el-icon-upload2" size="mini" @click="handleImport"
+ id="set_SouceExcel">瀵煎叆</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
@@ -326,190 +161,77 @@
>
</el-col> -->
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAddEdit((OperationType = 1))"
- id="set_add"
- >鏂板</el-button
- >
+ <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAddEdit((OperationType = 1))"
+ id="set_add">鏂板</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-document-copy"
- size="mini"
- :disabled="single"
- @click="handleCopy"
- id="set_Copy"
- >澶嶅埗</el-button
- >
+ <el-button type="primary" plain icon="el-icon-document-copy" size="mini" :disabled="single" @click="handleCopy"
+ id="set_Copy">澶嶅埗</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleEdit((row = rowForm), (OperationType = 3))"
- id="set_show"
- >缂栬緫</el-button
- >
+ <el-button type="primary" plain icon="el-icon-edit" size="mini" :disabled="single"
+ @click="handleEdit((row = rowForm), (OperationType = 3))" id="set_show">缂栬緫</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="single"
- @click="handleDelete"
- id="set_delete"
- >鍒犻櫎</el-button
- >
+ <el-button type="primary" plain icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete"
+ id="set_delete">鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-check"
- size="mini"
- :disabled="single"
- @click="handleAudit(0)"
- id="btn_audit"
- >瀹℃牳</el-button
- >
+ <el-button type="primary" plain icon="el-icon-check" size="mini" :disabled="single" @click="handleAudit(0)"
+ id="btn_audit">瀹℃牳</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-close"
- size="mini"
- :disabled="single"
- @click="handleAudit(1)"
- id="btn_deaudit"
- >鍙嶅鏍�</el-button
- >
+ <el-button type="primary" plain icon="el-icon-close" size="mini" :disabled="single" @click="handleAudit(1)"
+ id="btn_deaudit">鍙嶅鏍�</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-turn-off"
- size="mini"
- :disabled="single"
- @click="handleStop(0)"
- id="btn_stop"
- >绂佺敤</el-button
- >
+ <el-button type="primary" plain icon="el-icon-turn-off" size="mini" :disabled="single" @click="handleStop(0)"
+ id="btn_stop">绂佺敤</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-open"
- size="mini"
- :disabled="single"
- @click="handleStop(1)"
- id="btn_destop"
- >鍙嶇鐢�</el-button
- >
+ <el-button type="primary" plain icon="el-icon-open" size="mini" :disabled="single" @click="handleStop(1)"
+ id="btn_destop">鍙嶇鐢�</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-setting"
- size="mini"
- @click="handleRowHide"
- id="set_hidecolumn"
- >鍒楄缃�</el-button
- >
+ <el-button type="primary" plain icon="el-icon-setting" size="mini" @click="handleRowHide"
+ id="set_hidecolumn">鍒楄缃�</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-s-operation"
- size="mini"
- @click="handleBtnHide"
- id="HideButton"
- >鎸夐挳璁剧疆</el-button
- >
+ <el-button type="primary" plain icon="el-icon-s-operation" size="mini" @click="handleBtnHide"
+ id="HideButton">鎸夐挳璁剧疆</el-button>
</el-col>
</el-row>
<div class="tableBox" v-loading="loading">
- <el-table
- :data="tableData"
- ref="tableData"
- max-height="650"
- @selection-change="handleSelectionChange"
- border
- @row-click="handleRowClick"
- :row-style="rowStyle"
- @cell-dblclick="handleDblclick"
- v-if="tableShow"
- stripe
- >
- <el-table-column
- type="selection"
- width="55"
- align="center"
- fixed="left"
- />
+ <el-table :data="tableData" ref="tableData" max-height="650" @selection-change="handleSelectionChange" border
+ @row-click="handleRowClick" :row-style="rowStyle" @cell-dblclick="handleDblclick" v-if="tableShow" stripe>
+ <el-table-column type="selection" width="55" align="center" fixed="left" />
<template v-for="(item, index) in btList">
- <el-table-column
- :align="item.align"
- :prop="item.field"
- :label="item.title"
- :width="item.width"
- :key="item.field"
- v-if="!item.hide && item.field !== 'checkbox'"
- :sortable="item.sort"
- show-overflow-tooltip
- :fixed="item.fixed"
- >
+ <el-table-column :align="item.align" :prop="item.field" :label="item.title" :width="item.width"
+ :key="item.field" v-if="!item.hide && item.field !== 'checkbox'" :sortable="item.sort" show-overflow-tooltip
+ :fixed="item.fixed">
<template slot-scope="{ row, column }">
<div :style="item.style">
<!-- 鏃ユ湡鏍煎紡鍖� -->
- <span
- v-if="
- column.property.includes('鏃ユ湡') ||
- column.property.includes('Date')
- "
- >
+ <span v-if="
+ column.property.includes('鏃ユ湡') ||
+ column.property.includes('Date')
+ ">
{{ parseTime(row[column.property], "{y}-{m}-{d}") }}
</span>
- <el-button
- type="text"
- @click="handleDriverCodeClick(row)"
- v-else-if="column.property === '椹鹃┒鍛樹唬鐮�'"
- style="color: #409eff"
- >{{ row[column.property] }}</el-button
- >
- <span
- v-else-if="column.property === '绂佺敤鏍囪'"
- :style="{
- color: row[column.property] === 'Y' ? '#f56c6c' : '#67c23a',
- fontWeight:
- row[column.property] === 'Y' ? 'bold' : 'normal',
- }"
- >
+ <el-button type="text" @click="handleDriverCodeClick(row)" v-else-if="column.property === '椹鹃┒鍛樹唬鐮�'"
+ style="color: #409eff">{{ row[column.property] }}</el-button>
+ <span v-else-if="column.property === '绂佺敤鏍囪'" :style="{
+ color: row[column.property] === 'Y' ? '#f56c6c' : '#67c23a',
+ fontWeight:
+ row[column.property] === 'Y' ? 'bold' : 'normal',
+ }">
{{ row[column.property] === "Y" ? "宸茬鐢�" : "姝ｅ父" }}
</span>
<!-- 瀹℃牳鐘舵�佺壒娈婃牱寮� -->
- <span
- v-else-if="column.property === '瀹℃牳浜�'"
- :style="{
- color: row[column.property] ? '#67c23a' : '#909399',
- }"
- >
+ <span v-else-if="column.property === '瀹℃牳浜�'" :style="{
+ color: row[column.property] ? '#67c23a' : '#909399',
+ }">
{{ row[column.property] || "鏈鏍�" }}
</span>
<span v-else>{{ row[column.property] }}</span>
@@ -519,48 +241,19 @@
</template>
</el-table>
- <pagination
- v-show="total > 0"
- :total="total"
- :page.sync="page"
- :limit.sync="pageSize"
- :pageSizes="pageSizes"
- @pagination="getList"
- />
+ <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 title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
+ <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
</el-dialog>
<!-- 缂栬緫寮圭獥 -->
- <el-dialog
- :title="editDialogTitle"
- :visible.sync="openEdit"
- width="1480px"
- append-to-body
- class="driver-edit-dialog"
- :before-close="closeEditDialog"
- :close-on-click-modal="false"
- >
- <GyDriverEdit
- :OperationType="OperationType"
- :linterid="rowForm.HItemID"
- :HSouceBillType="''"
- @editCloseGy="editGyClose"
- v-if="editShow"
- ref="editComponent"
- />
+ <el-dialog :title="editDialogTitle" :visible.sync="openEdit" width="1480px" append-to-body
+ class="driver-edit-dialog" :before-close="closeEditDialog" :close-on-click-modal="false">
+ <GyDriverEdit :OperationType="OperationType" :linterid="rowForm.HItemID" :HSouceBillType="''"
+ @editCloseGy="editGyClose" v-if="editShow" ref="editComponent" />
<span slot="footer" class="dialog-footer" v-if="OperationType !== 4">
<!-- <el-button @click="closeEditDialog">鍙� 娑�</el-button>
<el-button type="primary" @click="saveDriverData">淇� 瀛�</el-button> -->
@@ -568,132 +261,47 @@
</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-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 :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="鎿嶄綔" 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>
<!-- 杩囨护鏂规寮圭獥 -->
- <el-dialog
- title="杩囨护鏂规鍒楄〃"
- :visible.sync="openFilterScheme"
- width="80%"
- append-to-body
- >
+ <el-dialog title="杩囨护鏂规鍒楄〃" :visible.sync="openFilterScheme" width="80%" append-to-body>
<div style="height: 500px; overflow: auto">
- <el-table
- :data="filterSchemeList"
- border
- style="width: 100%"
- @row-click="selectFilterScheme"
- >
- <el-table-column
- prop="鏂规鍚嶇О"
- label="鏂规鍚嶇О"
- width="200"
- ></el-table-column>
- <el-table-column
- prop="澶囨敞"
- label="澶囨敞"
- width="300"
- ></el-table-column>
+ <el-table :data="filterSchemeList" border style="width: 100%" @row-click="selectFilterScheme">
+ <el-table-column prop="鏂规鍚嶇О" label="鏂规鍚嶇О" width="200"></el-table-column>
+ <el-table-column prop="澶囨敞" label="澶囨敞" width="300"></el-table-column>
<el-table-column prop="鍒涘缓浜�" label="鍒涘缓浜�" width="120"></el-table-column>
- <el-table-column
- prop="鍒涘缓鏃ユ湡"
- label="鍒涘缓鏃ユ湡"
- width="150"
- ></el-table-column>
+ <el-table-column prop="鍒涘缓鏃ユ湡" label="鍒涘缓鏃ユ湡" width="150"></el-table-column>
<el-table-column label="鎿嶄綔" width="150" align="center">
<template slot-scope="scope">
- <el-button
- type="text"
- size="mini"
- @click="applyFilterScheme(scope.row)"
- >搴旂敤</el-button
- >
- <el-button
- type="text"
- size="mini"
- @click="deleteFilterScheme(scope.row)"
- style="color: #f56c6c"
- >鍒犻櫎</el-button
- >
+ <el-button type="text" size="mini" @click="applyFilterScheme(scope.row)">搴旂敤</el-button>
+ <el-button type="text" size="mini" @click="deleteFilterScheme(scope.row)"
+ style="color: #f56c6c">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -701,7 +309,7 @@
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="confirmFilterScheme">纭� 瀹�</el-button>
<el-button @click="openFilterScheme = false">鍙� 娑�</el-button>
-
+
</span>
</el-dialog>
</div>
@@ -743,7 +351,7 @@
{ label: "涓嶅寘鍚�", value: "10" },
],
-
+
sWhere: "",
organizationList: [],
filterColumnList: [],
@@ -824,8 +432,7 @@
async initData() {
try {
const userRes = await axios.get(
- `${this.$baseUrl}/Web/GetUser?UserName=${
- sessionStorage.getItem("UserName") || "001"
+ `${this.$baseUrl}/Web/GetUser?UserName=${sessionStorage.getItem("UserName") || "001"
}&PassWord=123456&HOrgName=100038`
);
if (userRes.data.data && userRes.data.data[0]) {
@@ -853,7 +460,7 @@
async getList() {
this.tableShow = false;
this.loading = true;
- console.log("鑾峰彇鍒楄〃鏁版嵁...",this.sWhere );
+ console.log("鑾峰彇鍒楄〃鏁版嵁...", this.sWhere);
try {
const params = {
sWhere: this.sWhere || "",
@@ -1025,7 +632,7 @@
// conditions.push(`HUSEORGID = '${this.queryParams.HUSEORGID}'`);
// }
-
+
if (this.queryParams.ColName !== "0" && this.queryParams.Comparator !== "0") {
const condition = this.buildCondition(
this.queryParams.ColName,
@@ -1035,7 +642,7 @@
if (condition) conditions.push(condition);
}
-
+
if (
this.queryParams.ColName1 !== "0" &&
this.queryParams.Comparator1 !== "0"
@@ -1060,14 +667,14 @@
if (condition) conditions.push(condition);
}
-
+
if (conditions.length > 0) {
- this.sWhere ="and "+conditions;
+ this.sWhere = "and " + conditions;
}
console.log("鏌ヨ鏉′欢:", this.sWhere);
//this.sWhere += this.addSWhereByOpenType();
- this.page = 1;
+ this.page = 1;
this.getList();
},
@@ -1075,15 +682,15 @@
if (!content) return null;
switch (comparator) {
- case "7":
+ case "7":
return `${colName} like '%${content}%'`;
- case "8":
+ case "8":
return `${colName} like '%${content}'`;
- case "9":
+ case "9":
return `${colName} like '${content}%'`;
- case "10":
+ case "10":
return `${colName} not like '%${content}%'`;
- default:
+ default:
return `${colName} ${comparator} '${content}'`;
}
},
@@ -1148,6 +755,9 @@
// 鐐瑰嚮琛�
handleRowClick(row) {
this.$refs.tableData.toggleRowSelection(row);
+ if (this.openPage) {
+ this.$emit('deptEmit', row, 15)
+ }
},
// 琛屾牱寮�
@@ -1398,7 +1008,7 @@
);
},
-
+
parseTime(time, cFormat) {
if (arguments.length === 0) {
return null;
@@ -1584,7 +1194,7 @@
applyFilterScheme(row) {
this.currentFilterScheme = row.鏂规鍚嶇О;
this.currentFilterRemark = row.澶囨敞;
-
+
// 杩欓噷搴旇鏍规嵁鏂规鍐呭璁剧疆鏌ヨ鏉′欢
// 鐢变簬鏂规鏁版嵁缁撴瀯澶嶆潅锛岃繖閲屽彧鍋氱畝鍗曟紨绀�
this.$modal.msgSuccess(`宸插簲鐢ㄦ柟妗堬細${row.鏂规鍚嶇О}`);
@@ -1595,7 +1205,7 @@
async deleteFilterScheme(row) {
try {
await this.$modal.confirm(`纭瑕佸垹闄ゆ柟妗�"${row.鏂规鍚嶇О}"鍚楋紵`);
-
+
const res = await axios.post(`${this.$baseUrl}/Xt_FastICScheme/delete`, {
HInterID: row.hmainid,
});
--
Gitblit v1.9.1