.env.development
@@ -5,8 +5,8 @@ ENV = 'development' # 智云迈思L-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 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') }, src/layout/components/UpdatePsw.vue
New file @@ -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> 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%; 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, 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 = "部门列表"; 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) { 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.承运合同子ID 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 附件上传相关方法 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, //后端接口前缀(后端服务器ip地址) @@ -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> 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(); }, 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> 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> 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> 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> 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> 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> 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> 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; 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, });
