From a4989ac2090626b23c630a097f5f773f08f8f949 Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期一, 30 三月 2026 09:35:09 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue | 2
src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue | 2
src/views/basic/gyCar/gyCarList.vue | 121 ++++++++++++++-
src/views/KCGL/MoveStockBill/Kf_MoveStockBillList.vue | 2
src/views/system/user/GyDriver.vue | 38 +++-
src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue | 2
src/views/sell/XsSeOutStockBill.vue | 16 +
src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue | 4
src/store/modules/permission.js | 14 +
src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue | 4
src/router/index.js | 20 ++
src/views/basic/gyCar/gyCarEdit.vue | 25 +-
RuoYi-Vue | 1
src/views/system/user/GyDriverEdit.vue | 60 ++++---
src/views/sell/sellOut/sellOutBill.vue | 4
src/views/ProductInBill/Kf_ProductInBillList.vue | 47 +++--
src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue | 6
src/views/logistics/transportGPS/WL_YayBill.vue | 53 ++----
src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue | 2
src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue | 20 +-
src/views/FbStepFoldinBillList/fbStepFoldinBillList.vue | 2
src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue | 2
22 files changed, 310 insertions(+), 137 deletions(-)
diff --git a/RuoYi-Vue b/RuoYi-Vue
new file mode 160000
index 0000000..8a1cf9e
--- /dev/null
+++ b/RuoYi-Vue
@@ -0,0 +1 @@
+Subproject commit 8a1cf9ed55747229ce4149ddacf8596fa0995814
diff --git a/src/router/index.js b/src/router/index.js
index 9b170c9..bab52bd 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1587,6 +1587,26 @@
},
//#endregion
+ //#region 杞﹁締鍒楄〃
+ {
+ path: "/basic",
+ component: Layout,
+ hidden: true,
+ redirect: "noredirect",
+ meta: {
+ breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
+ activeMenu: "/basic/gy", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ },
+ children: [
+ {
+ path: "/basic/gy/GyDriver",
+ component: () => import("@/views/system/user/GyDriver.vue"),
+ name: "gyDriver",
+ meta: { title: "椹鹃┒鍛樺垪琛�", activeMenu: "/basic/gy" },
+ },
+ ],
+ },
+ //#endregion
//#endregion
//#region 璐圭敤鍩虹璧勬枡
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 1d5c8a7..cdc198b 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -705,7 +705,7 @@
},
component: () =>
import("@/views/basic/gyCartypelist/gyCartypelist.vue"),
- hidden: false,
+ hidden: HIsHide,
name: "GyCartypelist",
path: "gyCartypelist",
},
@@ -740,6 +740,18 @@
icon: "build",
link: null,
noCache: false,
+ title: "椹鹃┒鍛樺垪琛�",
+ },
+ component: () => import("@/views/system/user/GyDriver.vue"),
+ hidden: false,
+ name: "gyDriver",
+ path: "GyDriver",
+ },
+ {
+ meta: {
+ icon: "build",
+ link: null,
+ noCache: false,
title: "鑱屽憳鍒楄〃",
},
component: () =>
diff --git a/src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue b/src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue
index a4a8ed7..4e0e9a1 100644
--- a/src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue
+++ b/src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue
@@ -545,7 +545,7 @@
const num = parseInt(value)
if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
if (num.toString() !== value) return '璐存爣绛炬暟涓嶈兘涓哄皬鏁帮紒'
- if (num <= 0) return '璐存爣绛炬暟蹇呴』澶т簬0锛�'
+ if (num <0) return '璐存爣绛炬暟蹇呴』澶т簬0锛�'
return true
}
}).then(({ value }) => {
@@ -590,7 +590,7 @@
const num = parseInt(value)
if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
if (num.toString() !== value) return '鎵樻暟涓嶈兘涓哄皬鏁帮紒'
- if (num <= 0) return '鎵樻暟蹇呴』澶т簬0锛�'
+ if (num <0) return '鎵樻暟蹇呴』澶т簬0锛�'
return true
}
}).then(({ value }) => {
diff --git a/src/views/FbStepFoldinBillList/fbStepFoldinBillList.vue b/src/views/FbStepFoldinBillList/fbStepFoldinBillList.vue
index 3d5908c..167f89f 100644
--- a/src/views/FbStepFoldinBillList/fbStepFoldinBillList.vue
+++ b/src/views/FbStepFoldinBillList/fbStepFoldinBillList.vue
@@ -684,7 +684,7 @@
const num = parseInt(value)
if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
if (num.toString() !== value) return '鎵樻暟涓嶈兘涓哄皬鏁帮紒'
- if (num <= 0) return '鎵樻暟蹇呴』澶т簬0锛�'
+ if (num < 0) return '鎵樻暟蹇呴』澶т簬0锛�'
return true
}
}).then(({ value }) => {
diff --git a/src/views/KCGL/MoveStockBill/Kf_MoveStockBillList.vue b/src/views/KCGL/MoveStockBill/Kf_MoveStockBillList.vue
index 2d2be38..677aa13 100644
--- a/src/views/KCGL/MoveStockBill/Kf_MoveStockBillList.vue
+++ b/src/views/KCGL/MoveStockBill/Kf_MoveStockBillList.vue
@@ -666,7 +666,7 @@
const num = parseInt(value)
if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
if (num.toString() !== value) return '鎵樻暟涓嶈兘涓哄皬鏁帮紒'
- if (num <= 0) return '鎵樻暟蹇呴』澶т簬0锛�'
+ if (num < 0) return '鎵樻暟蹇呴』澶т簬0锛�'
return true
}
}).then(({ value }) => {
diff --git a/src/views/ProductInBill/Kf_ProductInBillList.vue b/src/views/ProductInBill/Kf_ProductInBillList.vue
index 9bba195..0a7958b 100644
--- a/src/views/ProductInBill/Kf_ProductInBillList.vue
+++ b/src/views/ProductInBill/Kf_ProductInBillList.vue
@@ -173,10 +173,11 @@
</el-table-column>
</template>
</el-table>
- <!-- 璁板綍鏁般�侀〉鏁般�佸綋鍓嶉〉 -->
- <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" @pagination="handleQuery" />
- <!-- 鍒楄缃� -->
+ <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>
<RowSettings :colName="btResList" HModName="Kf_ProductInBillList" @rowEditClose="rowSetClose"
v-if="rowHideShow" />
</el-dialog>
@@ -286,9 +287,17 @@
ColContent: '',
},
- page: 1, //page椤电储寮�
- pageSize: 0, //page椤甸潰璁板綍鏁�
- total: 0, //璁板綍鍚堣鏁�
+ loading: true,
+ tyResList: [],//鍒楄〃锛堟帴鍙ｆ暟鎹級
+ btList: [],//琛ㄥご鍒楄〃鏄剧ず
+ btResList: [],
+ tableData: [],//鍒楄〃(鍒嗛〉鏄剧ず)
+ dataList: [],
+ titleData: [],//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ pageSizes: [ 50,100, 500, 5000, 50000],
+ page: 1,
+ pageSize: 0,
+ total: 0, //璁板綍鍚堣鏁�
tableShow: true, // table鏄剧ず鏍囪
totalNameList: [], // 闇�瑕佽缃悎璁¤鐨勫垪鏁扮粍
tableData: [], // 鍒楄〃鏁版嵁銆傜敤浜巘able鐩戝惉浜嬩欢
@@ -498,7 +507,6 @@
//#region 鏌ヨ
getList() {
- this.pageSize = 50
if (this.pageSize == 0) {
this.pageSize = 50
}
@@ -506,18 +514,19 @@
this.loading = true
// 鍒楄〃鏌ヨ
- axios.get(this.$baseUrl + '/Kf_ProductInBillController/GetKf_ProductInBillList_Json', {
+ axios.get(this.$baseUrl + '/Kf_ProductInBillController/page', {
params: {
"sWhere": this.sWhere,
- "HMaker": sessionStorage["HUserName"],
- "OperationType": 1,
- "ViewName": "h_v_Kf_ProductInBillList"
+ "user": sessionStorage["HUserName"],
+ "page": this.page,
+ "size": this.pageSize,
+ "Type":'3802',
},
}).then(response => {
this.tyResList = response.data.data//鎬绘暟鎹�
let data1 = response.data
let option = []
- if (data1.count == 1) {
+ if (data1.list && data1.list.length > 0) {
this.btResList = data1.list //鍒楄〃琛ㄥご鏁版嵁
this.total = data1.count;
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -675,7 +684,7 @@
const num = parseInt(value)
if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
if (num.toString() !== value) return '鎵樻暟涓嶈兘涓哄皬鏁帮紒'
- if (num <= 0) return '鎵樻暟蹇呴』澶т簬0锛�'
+ if (num < 0) return '鎵樻暟蹇呴』澶т簬0锛�'
return true
}
}).then(({ value }) => {
@@ -811,11 +820,11 @@
this.totalNameList.push(item)
}
})
- if (data1.data[0].HPageSize == 0) {
- this.pageSize = 50
- } else {
- this.pageSize = data1.data[0].HPageSize
- }
+ // if (data1.data[0].HPageSize == 0) {
+ // this.pageSize = 50
+ // } else {
+ // this.pageSize = data1.data[0].HPageSize
+ // }
this.tableData = option.data
this.tableShow = true
this.loading = false
@@ -921,7 +930,7 @@
var result = false;
axios.get(this.$baseUrl + '/Xt_getInfo/getCompanyName').then(response => {
var data1 = response.data
- if (data1.count == 1) {
+ if (data1.list && data1.list.length > 0) {
if (data1.data == "姘村姟") {
result = true;
}
diff --git a/src/views/basic/gyCar/gyCarEdit.vue b/src/views/basic/gyCar/gyCarEdit.vue
index 3769c34..fb8bc03 100644
--- a/src/views/basic/gyCar/gyCarEdit.vue
+++ b/src/views/basic/gyCar/gyCarEdit.vue
@@ -7,9 +7,9 @@
<el-button type="primary" @click="submitForm" :disabled="subDisabled"
>淇� 瀛�</el-button
>
- <el-button type="primary" @click="set_CheckBill(0, form)" :disabled="checkDisabled"
+ <!-- <el-button type="primary" @click="set_CheckBill(0, form)" :disabled="checkDisabled"
>瀹� 鏍�</el-button
- >
+ > -->
<el-button type="primary" @click="close">閫� 鍑�</el-button>
<!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
</div>
@@ -64,7 +64,7 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="16">
+ <!-- <el-col :span="16">
<el-form-item label="杞﹁締琛岄┒璇佺収鐗�" prop="HCarCardIDPic" label-width="8em">
<div
class="image-input-outer"
@@ -104,7 +104,7 @@
>
</el-upload>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="8">
<el-form-item label="杞﹁締骞存鏃ユ湡" prop="HCarCheckDate" label-width="7em">
<el-date-picker
@@ -116,7 +116,7 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="16">
+ <!-- <el-col :span="16">
<el-form-item label="杞﹁締鐓х墖" prop="HCarPric" label-width="8em">
<div class="image-input-outer" @click="openImagePreview('HCarPric')">
<el-input v-model="form.HCarPric"> </el-input>
@@ -153,7 +153,7 @@
>
</el-upload>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="8">
<el-form-item label="杞﹀瀷" prop="HCarTypeName">
<el-input v-model="form.HCarTypeName" placeholder="璇烽�夋嫨杞﹀瀷" disabled>
@@ -169,8 +169,8 @@
</el-row>
<el-row>
<el-col :span="6">
- <el-form-item label="鎵�灞炲叕鍙�" prop="HCompName">
- <el-input v-model="form.HCompName" placeholder="璇烽�夋嫨鎵�灞炲叕鍙�" disabled>
+ <el-form-item label="鎵�灞炰緵搴斿晢" prop="HCompName">
+ <el-input v-model="form.HCompName" placeholder="璇烽�夋嫨鎵�灞炰緵搴斿晢" disabled>
<el-button
slot="append"
icon="el-icon-search"
@@ -814,6 +814,8 @@
//鏂板鑾峰彇鍗曟嵁鍙�
// this.getHBillNo();
let date = new Date();
+ this.form.HCompID = sessionStorage["HSupID"];
+ this.form.HCompName = sessionStorage["HSupName"];
this.form.HDate = moment(date).format("YYYY-MM-DDTHH:mm:ss");
this.resetForm();
if (this.OperationType == 1) {
@@ -853,7 +855,7 @@
HCarPric: data.杞﹁締鐓х墖,
HCarCardIDPic: data.杞﹁締琛岄┒璇佺収鐗�,
HCompID: data.HCompID,
- HCompName: data.鎵�灞炲叕鍙�,
+ HCompName: data.鎵�灞炰緵搴斿晢,
HModel: data.杞﹁締鍨嬪彿,
HColor: data.杞﹁締棰滆壊,
HBuyDate: data.璐拱鏃ユ湡 ? dayjs(data.璐拱鏃ユ湡).format("YYYY-MM-DD") : "",
@@ -1093,6 +1095,9 @@
this.subDisabled = true; //璁剧疆淇濆瓨鎸夐挳涓嶅彲鐢�
this.$modal.msgSuccess(response.data.Message);
this.addBtnShow = true;
+ }else {
+ // 鏄剧ず鍚庣杩斿洖鐨勯敊璇紙杞︾墝鍙烽噸澶嶃�佷繚瀛樺け璐ョ瓑锛�
+ this.$modal.msgError(response.data.Message);
}
})
.catch((error) => {
@@ -1159,7 +1164,7 @@
// 鎵�灞炲叕鍙�
this.iframeUrl = "/iframe/GySupplier";
- this.dialogTitle = "鎵�灞炲叕鍙�";
+ this.dialogTitle = "鎵�灞炰緵搴斿晢";
// this.materialShow = true;
this.openData = true;
}
diff --git a/src/views/basic/gyCar/gyCarList.vue b/src/views/basic/gyCar/gyCarList.vue
index e34bf0b..788df3b 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">
@@ -138,10 +138,10 @@
<el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
@click="handleEdit((row = rowForm), (OperationType = 3))">缂栬緫</el-button>
</el-col>
- <el-col :span="1.5">
+ <!-- <el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
@click="handleEdit((row = rowForm), (OperationType = 2))">澶嶅埗</el-button>
- </el-col>
+ </el-col> -->
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
</el-button>
@@ -207,12 +207,12 @@
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-download" size="mini" @click="handleRowHide">闅愯棌鍒楄缃�</el-button>
</el-col>
- <el-col :span="1.5">
+ <!-- <el-col :span="1.5">
<el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch">鎼� 绱�</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery">閲� 缃�</el-button>
- </el-col>
+ </el-col> -->
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
</el-row>
<div class="tableBox" v-loading="loading">
@@ -513,6 +513,109 @@
return sums;
},
+ //#region 鏉冮檺鍒ゆ柇
+ async set_ModCheck(ModRightNameCheck)
+ {
+ var Permission = false;
+ const res=await axios.get(this.$baseUrl + '/LMES/getReportByModRightNameCheck', {
+ params: {
+ "ModRightNameCheck": ModRightNameCheck,
+ "user": sessionStorage["HUserName"],
+
+ },
+ }).then(result=>{
+ if (result.data.count != 1) {
+ Permission = true;
+ this.sWhere=this.sWhere+"and HCompID ="+sessionStorage["HSupID"]
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
+ //#endregion
+ //#region 蹇�熻繃婊�
+ async handleQuery() {
+ this.sWhere = ''
+ if (this.queryParams.ColName && this.queryParams.Comparator) {
+ var com = "";
+ switch (this.queryParams.Comparator) {
+ case "7":
+ com = "like'%" + this.queryParams.ColContent + "%'";
+ break;
+ case "8":
+ com = "like'%" + this.queryParams.ColContent + "'";
+ break;
+ case "9":
+ com = "like'" + this.queryParams.ColContent + "%'";
+ break;
+ case "10":
+ com = "not like'%" + this.queryParams.ColContent + "%'";
+ break;
+ default:
+ com = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+ break;
+ }
+ this.sWhere += " and " + this.queryParams.ColName + " " + com;
+ }
+ if (this.queryParams.ColName1 && this.queryParams.Comparator1) {
+ var com1 = "";
+ switch (this.queryParams.Comparator1) {
+ case "7":
+ com1 = "like'%" + this.queryParams.ColContent1 + "%'";
+ break;
+ case "8":
+ com1 = "like'%" + this.queryParams.ColContent1 + "'";
+ break;
+ case "9":
+ com1 = "like'" + this.queryParams.ColContent1 + "%'";
+ break;
+ case "10":
+ com1 = "not like'%" + this.queryParams.ColContent1 + "%'";
+ break;
+ default:
+ com1 = "" + this.queryParams.Comparator1 + "'" + this.queryParams.ColContent1 + "'";
+ break;
+ }
+ this.sWhere += " and " + this.queryParams.ColName1 + " " + com1;
+ }
+ if (this.queryParams.ColName2 && this.queryParams.Comparator2) {
+ var com2 = "";
+ switch (this.queryParams.Comparator2) {
+ case "7":
+ com2 = "like'%" + this.queryParams.ColContent2 + "%'";
+ break;
+ case "8":
+ com2 = "like'%" + this.queryParams.ColContent2 + "'";
+ break;
+ case "9":
+ com2 = "like'" + this.queryParams.ColContent2 + "%'";
+ break;
+ case "10":
+ com2 = "not like'%" + this.queryParams.ColContent2 + "%'";
+ break;
+ default:
+ com2 = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
+ break;
+ }
+ this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
+ }
+ if (this.queryParams.sTime) {
+ this.queryParams.sTime = moment(this.queryParams.sTime).format('YYYY-MM-DD')
+ this.queryParams.eTime = moment(this.queryParams.eTime).format('YYYY-MM-DD')
+ this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.queryParams.sTime + "'" + " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.queryParams.eTime + "'";
+ }
+ if (this.queryParams.HBillNo) {
+ this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
+ }
+ // if (this.queryParams.HOrgID) {
+ // this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
+ // }
+ console.log("swhere",this.sWhere)
+ this.clearData()
+ this.getList()
+ },
+ //#endregion
+
//#region 鑾峰彇鍏徃鍚嶏紝鏍规嵁鍏徃杩涜瀹氬埗鍖栧紑鍙�
defaintOperationByCompanyName() {
var result = false;
@@ -607,6 +710,7 @@
this.deptform = {};
},
async getList() {
+ await this.set_ModCheck("Gy_Car_SUBQuery");
this.tableShow = false;
this.loading = true;
if (this.pageSize == 0) {
@@ -865,6 +969,7 @@
document.body.removeChild(span);
return h(span, column.label);
},
+
//鐐瑰嚮琛�
handleRowClick(row, column, event) {
this.lastSelectedRow = this.selectedRow; // 璁板綍涓婁竴娆￠�変腑鐨勮
@@ -1111,9 +1216,9 @@
.then(() => {
if (!this.rowForm.瀹℃牳浜�) {
axios
- .get(this.$baseUrl + "Xs_SeOrderBill/DropXs_SeOrderBill", {
+ .get(this.$baseUrl + "Gy_CarController/DropGy_Car", {
params: {
- HInterID: this.rowForm.hmainid.toString(),
+ HItemID: this.rowForm.hmainid.toString(),
user: sessionStorage["HUserName"],
},
})
diff --git a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue
index 0946f36..2f9be03 100644
--- a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue
+++ b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue
@@ -374,6 +374,10 @@
label: '寰�杩�',
value: '寰�杩�',
},
+ {
+ label: '闆舵媴',
+ value: '闆舵媴',
+ },
]"
:key="index"
:label="item.label"
diff --git a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
index f8b804e..fa7b0c9 100644
--- a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
+++ b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
@@ -588,7 +588,8 @@
},
//閫変腑琛岄珮浜牱寮�
rowStyle({ row, rowIndex }) {
- if (this.ids.includes(row.hmainid)) {
+ // 浣跨敤 HInterID 鍒ゆ柇
+ if (this.ids.includes(row.HInterID)) {
return { "background": "#ecf5ff" }
}
},
@@ -603,8 +604,7 @@
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
- // this.rowForm = {}
- this.ids = selection.map(item => item.hmainid)
+ this.ids = selection.map(item => item.HInterID)
this.single = selection.length != 1
this.multiple = !selection.length
if (!this.single) {
diff --git a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
index 5a43663..4cd5adf 100644
--- a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -257,15 +257,15 @@
<el-col :span="6">
<el-form-item label="鐗╂祦鐘舵��" prop="HCarryStatus">
<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>
- <el-option label="寰呮彁璐�" value="4"></el-option>
- <el-option label="宸插埌鍘�" value="5"></el-option>
- <el-option label="宸叉彁璐�" value="6"></el-option>
- <el-option label="杩愯緭涓�" value="7"></el-option>
- <el-option label="宸茬鏀�" value="8"></el-option>
- <el-option label="宸叉牳绠�" value="9"></el-option>
+ <el-option label="鐢宠涓�" value="鐢宠涓�"></el-option>
+ <el-option label="寰呬緵搴斿晢纭" value="寰呬緵搴斿晢纭"></el-option>
+ <el-option label="鎸囧畾椹鹃┒鍛樸�佽溅杈嗕腑" value="鎸囧畾椹鹃┒鍛樸�佽溅杈嗕腑"></el-option>
+ <el-option label="姝ｅ湪鍓嶅線濮嬪彂鍦�" value="姝ｅ湪鍓嶅線濮嬪彂鍦�"></el-option>
+ <el-option label="鎻愯揣涓�" value="鎻愯揣涓�"></el-option>
+ <el-option label="鍑嗗绂诲巶" value="鍑嗗绂诲巶"></el-option>
+ <el-option label="閫佽揣涓�" value="閫佽揣涓�"></el-option>
+ <el-option label="宸茬鏀�" value="宸茬鏀�"></el-option>
+ <el-option label="宸叉牳绠�" value="宸叉牳绠�"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -860,7 +860,7 @@
this.form.HEndAddr = data.鐩殑鍦�
this.form.HEndAddrName = data.鐩殑鍦板悕绉�
this.form.HPickAddr = data.鎻愯揣鍦板潃
- this.form.HArriverAddr = data.鍒拌揣鏂瑰紡
+ this.form.HArriverAddr = data.鍒拌揣鍦板潃
this.form.HTransType = data.杩愯緭鏂瑰紡
this.form.HCarTypeID = data.杞﹀瀷ID
this.form.HCarTypeName = data.杞﹀瀷鍚嶇О
diff --git a/src/views/logistics/transportGPS/WL_YayBill.vue b/src/views/logistics/transportGPS/WL_YayBill.vue
index 399c9f1..57b12f2 100644
--- a/src/views/logistics/transportGPS/WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/WL_YayBill.vue
@@ -143,8 +143,24 @@
</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(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(1, form = rowForm)">鍙嶅鏍�</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
+ @click="handleVolume(rowForm)">缁存姢闆跺崟鍗犵敤浣撶Н</el-button>
+ </el-col>
+ <el-col :span="1.5">
<el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
@click="set_ConfirmBill">渚涘簲鍟嗙‘璁�</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-circle-check" size="mini" :disabled="single"
@@ -162,29 +178,9 @@
<el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
@click="set_ConfirmOtherBill(4)">鍒拌揣绛炬敹纭</el-button>
</el-col>
- <!-- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
- @click="set_CheckBill(0, form = rowForm)">鍒嗛厤鍙告満</el-button>
- </el-col> -->
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
- @click="handleVolume(rowForm)">缁存姢闆跺崟鍗犵敤浣撶Н</el-button>
- </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>
- </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"
- @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(1, form = rowForm)">鍙嶅鏍�</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
@@ -208,17 +204,6 @@
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-date" size="mini" @click="handleRowHide">闅愯棌鍒楄缃�</el-button>
</el-col>
- <!-- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-printer" size="mini" @click="get_PrintReport">鎵撳嵃</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single"
- @click="get_BarCodeDetail">鏉＄爜鏄庣粏</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-printer" size="mini" :disabled="single"
- @click="get_PackStockDetail">鍖呰瀹瑰櫒鍑哄叆搴撴槑缁�</el-button>
- </el-col>-->
</el-row>
<div class="tableBox" v-loading="loading">
<el-table :data="tableData" ref="tableData" max-height="710" :summary-method="getSummaries"
@@ -530,7 +515,7 @@
}).then(result=>{
if (result.data.count != 1) {
Permission = true;
- this.sWhere=this.sWhere+"and 鎵胯繍鍟咺D ="+sessionStorage["HSupID"]
+ this.sWhere=this.sWhere+" and 鎵胯繍鍟咺D ="+sessionStorage["HSupID"]
}
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
@@ -734,8 +719,8 @@
//#region 鍒犻櫎
handleDelete() {
this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
- axios.get(this.$baseUrl + "/Cg_ContractTransportBillListController/DeleteBill", {
- params: { 'HInterID': this.rowForm.HInterID.toString(), 'user': sessionStorage["HUserName"] }
+ axios.get(this.$baseUrl + "/WLYayBillController/deleteBill", {
+ params: { 'HItemID': this.rowForm.HInterID.toString(), 'user': sessionStorage["HUserName"] }
}).then(response => {
if (response.data.count == 1) {
this.handleQuery()
diff --git a/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue b/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
index 4b508cc..f9ea0f3 100644
--- a/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
+++ b/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
@@ -886,7 +886,7 @@
},
set_CheckBill(num) {
//閫昏緫瀹℃牳鏂规硶
- axios.get(this.$baseUrl + "/Sc_MouldinventoryBill/CheckGy_MaterialMouldBillMain", {
+ axios.get(this.$baseUrl + "/Gy_MaterialPackingRelation/AuditGy_MaterialPackingRelation", {
params: { "HInterID": this.rowForm.hmainid, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
}).then(response => {
let result = response.data
diff --git a/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue
index 170e854..a94ea86 100644
--- a/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue
@@ -889,7 +889,7 @@
const num = parseInt(value)
if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
if (num.toString() !== value) return '鎵樻暟涓嶈兘涓哄皬鏁帮紒'
- if (num <= 0) return '鎵樻暟蹇呴』澶т簬0锛�'
+ if (num <0) return '鎵樻暟蹇呴』澶т簬0锛�'
return true
}
}).then(({ value }) => {
diff --git a/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
index 6aeeacd..a60fcac 100644
--- a/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
@@ -890,7 +890,7 @@
const num = parseInt(value)
if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
if (num.toString() !== value) return '鎵樻暟涓嶈兘涓哄皬鏁帮紒'
- if (num <= 0) return '鎵樻暟蹇呴』澶т簬0锛�'
+ if (num <0) return '鎵樻暟蹇呴』澶т簬0锛�'
return true
}
}).then(({ value }) => {
diff --git a/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
index cc3c590..0c12431 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
@@ -799,7 +799,7 @@
const num = parseInt(value)
if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
if (num.toString() !== value) return '鎵樻暟涓嶈兘涓哄皬鏁帮紒'
- if (num <= 0) return '鎵樻暟蹇呴』澶т簬0锛�'
+ if (num <0) return '鎵樻暟蹇呴』澶т簬0锛�'
return true
}
}).then(({ value }) => {
diff --git a/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
index a3499aa..8874e31 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
@@ -831,7 +831,7 @@
const num = parseInt(value)
if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
if (num.toString() !== value) return '鎵樻暟涓嶈兘涓哄皬鏁帮紒'
- if (num <= 0) return '鎵樻暟蹇呴』澶т簬0锛�'
+ if (num < 0) return '鎵樻暟蹇呴』澶т簬0锛�'
return true
}
}).then(({ value }) => {
diff --git a/src/views/sell/XsSeOutStockBill.vue b/src/views/sell/XsSeOutStockBill.vue
index 82ff637..51a8e45 100644
--- a/src/views/sell/XsSeOutStockBill.vue
+++ b/src/views/sell/XsSeOutStockBill.vue
@@ -88,9 +88,8 @@
<el-col :span="6" style="padding: 0 10px">
<el-select v-model="queryParams.Comparator2" placeholder="璇烽�夋嫨" @change="riqiChange"
class="ForFilteringSchemes">
- <span v-for="(item, index) in btList" :key="index">
- <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
- </span>
+ <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+ :value="item.value"></el-option>
</el-select>
</el-col>
<el-col :span="11">
@@ -104,8 +103,9 @@
<el-col :span="7">
<el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" @change="riqiChange"
class="ForFilteringSchemes">
- <el-option v-for="(item, index) in btList" :key="index" :label="item.field"
- :value="item.field"></el-option>
+ <span v-for="(item, index) in btList" :key="index">
+ <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
+ </span>
</el-select>
</el-col>
<el-col :span="6" style="padding: 0 10px">
@@ -707,6 +707,9 @@
this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.sTime + "'";
this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.eTime + "'";
}
+ if (this.queryParams.HOrgID) {
+ this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
+ }
let Organization = this.organizationList.find(
(e) => e.ID == this.queryParams.HOrgID
)?.Name;
@@ -1070,9 +1073,8 @@
}
if (this.queryParams.HBillNo) {
- this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HNumber + "%'";
+ this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
}
-
if (this.queryParams.HProjectNumber) {
this.sWhere += " and 椤圭洰缂栫爜 like '%" + this.queryParams.HProjectNumber + "%'";
}
diff --git a/src/views/sell/sellOut/sellOutBill.vue b/src/views/sell/sellOut/sellOutBill.vue
index 9ec8708..3e02408 100644
--- a/src/views/sell/sellOut/sellOutBill.vue
+++ b/src/views/sell/sellOut/sellOutBill.vue
@@ -1040,7 +1040,7 @@
const num = parseInt(value)
if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
if (num.toString() !== value) return '璐存爣绛炬暟涓嶈兘涓哄皬鏁帮紒'
- if (num <= 0) return '璐存爣绛炬暟蹇呴』澶т簬0锛�'
+ if (num < 0) return '璐存爣绛炬暟蹇呴』澶т簬0锛�'
return true
}
}).then(({ value }) => {
@@ -1093,7 +1093,7 @@
const num = parseInt(value)
if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
if (num.toString() !== value) return '鎵樻暟涓嶈兘涓哄皬鏁帮紒'
- if (num <= 0) return '鎵樻暟蹇呴』澶т簬0锛�'
+ if (num < 0) return '鎵樻暟蹇呴』澶т簬0锛�'
return true
}
}).then(({ value }) => {
diff --git a/src/views/system/user/GyDriver.vue b/src/views/system/user/GyDriver.vue
index d8b9a4a..c51a9cd 100644
--- a/src/views/system/user/GyDriver.vue
+++ b/src/views/system/user/GyDriver.vue
@@ -437,9 +437,11 @@
);
if (userRes.data.data && userRes.data.data[0]) {
const userData = userRes.data.data[0];
- this.user = userData.Czymc || "admin";
+ this.user = sessionStorage["HUserName"] ;
this.Organization = userData.HUSEORGID;
- this.queryParams.HUSEORGID = userData.HUSEORGID;
+ const orgId = sessionStorage["OrganizationID"];
+ this.queryParams.HUSEORGID = orgId ? Number(orgId) : null;
+ this.$forceUpdate();
}
const orgRes = await axios.get(`${this.$baseUrl}/Web/GetOrganizations`);
@@ -460,7 +462,8 @@
async getList() {
this.tableShow = false;
this.loading = true;
- console.log("鑾峰彇鍒楄〃鏁版嵁...", this.sWhere);
+ this.sWhere=this.sWhere+"and 浣跨敤缁勭粐 ="+sessionStorage["OrganizationID"]
+ await this.set_ModCheck("GyDriver_SUPQuery")
try {
const params = {
sWhere: this.sWhere || "",
@@ -617,8 +620,27 @@
console.error("鍔犺浇鍒楅厤缃け璐�:", error);
}
},
+ async set_ModCheck(ModRightNameCheck)
+ {
+ var Permission = false;
+ const res=await axios.get(this.$baseUrl + '/LMES/getReportByModRightNameCheck', {
+ params: {
+ "ModRightNameCheck": ModRightNameCheck,
+ "user": sessionStorage["HUserName"],
+
+ },
+ }).then(result=>{
+ if (result.data.count != 1) {
+ Permission = true;
+ this.sWhere=this.sWhere+"and 鎵�灞炲叕鍙窱D ="+sessionStorage["HSupID"]
+ }
+ }).catch(error => {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ },
- handleQuery() {
+ async handleQuery() {
+
this.sWhere = "";
const conditions = [];
@@ -628,9 +650,9 @@
if (this.queryParams.HName) {
conditions.push(`椹鹃┒鍛樺悕绉� like '%${this.queryParams.HName}%'`);
}
- // if (this.queryParams.HUSEORGID) {
- // conditions.push(`HUSEORGID = '${this.queryParams.HUSEORGID}'`);
- // }
+ if (this.queryParams.HUSEORGID) {
+ conditions.push(`浣跨敤缁勭粐 = '${this.queryParams.HUSEORGID}'`);
+ }
if (this.queryParams.ColName !== "0" && this.queryParams.Comparator !== "0") {
@@ -707,7 +729,7 @@
resetQuery() {
this.queryParams = {
- HUSEORGID: this.Organization,
+ HUSEORGID: sessionStorage["OrganizationID"],
HName: "",
HNumber: "",
HSyncNumber: "",
diff --git a/src/views/system/user/GyDriverEdit.vue b/src/views/system/user/GyDriverEdit.vue
index 925035d..341729c 100644
--- a/src/views/system/user/GyDriverEdit.vue
+++ b/src/views/system/user/GyDriverEdit.vue
@@ -67,18 +67,17 @@
/>
</el-form-item>
- <el-form-item label="鎵�灞炲叕鍙�" prop="HDeptID">
+ <el-form-item label="鎵�灞炴壙杩愬晢" prop="HCompID">
<div class="dept-select">
<el-input
v-model="formData.HDeptName"
- placeholder="璇烽�夋嫨鎵�灞炲叕鍙�"
+ placeholder="璇烽�夋嫨鎵�灞炴壙杩愬晢"
readonly
clearable
- :disabled="isViewMode"
/>
<el-input
type="hidden"
- v-model="formData.HDeptID"
+ v-model="formData.HCompID"
style="display: none"
/>
<el-button
@@ -87,6 +86,7 @@
@click="openDeptDialog"
:disabled="isViewMode"
style="margin-left: 10px"
+ disabled
>
</el-button>
</div>
@@ -99,7 +99,7 @@
v-model="formData.checkboxHStopflag"
:true-label="1"
:false-label="0"
- :disabled="!canEditStopFlag"
+ disabled
@change="handleStopFlagChange"
>
鏄惁绂佺敤
@@ -253,13 +253,14 @@
<!-- 閮ㄩ棬閫夋嫨寮圭獥 -->
<el-dialog
- title="dialogTitle"
+ title="鎵胯繍鍟�"
:visible.sync="openData"
width="90%"
top="5vh"
append-to-body
+ disabled
>
- <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
+ <GySupplier ref="supplierRef"@deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
@@ -272,10 +273,10 @@
<script>
import axios from "axios";
-import Dept from "@/views/component/dept";
+import GySupplier from '@/views/basic/gy/gySupplier.vue'
export default {
name: "GyDriverEdit",
- components: { Dept},
+ components: { GySupplier},
props: {
OperationType: {
type: Number,
@@ -313,14 +314,14 @@
HNumber: "",
HName: "",
HHelpCode: "",
- HDeptName: "",
- HDeptID: "0",
+ HDeptName:sessionStorage["HSupName"],
+ HCompID: sessionStorage["HSupID"],
HDepNumber: "",
HIDCard: "",
HPhone: "",
HDriverCardType: "A1",
HEmpType: "鍥哄畾",
- HStopflag: "0",
+ HStopflag: 0,
checkboxHStopflag: 0,
HRemark: "",
HUSEORGID: "",
@@ -399,14 +400,19 @@
this.openData = false;
},
deptClickSub() {
- if (this.deptform && this.deptform.HItemID) {
- this.formData.HDeptName = this.deptform.閮ㄩ棬鍚嶇О;
- this.formData.HDeptID = this.deptform.HItemID;
- this.openData = false;
- this.deptShow = false;
- } else {
- this.$modal.msgWarning("璇峰厛閫夋嫨涓�涓儴闂�");
- }
+ // 鐩存帴浠庡瓙缁勪欢鑾峰彇褰撳墠閫変腑鐨勮鏁版嵁
+ const selectedRow = this.$refs.supplierRef?.rowForm;
+ if (selectedRow && selectedRow.HItemID) {
+ // 璁剧疆琛ㄥ崟鏁版嵁
+ this.formData.HDeptName = selectedRow.渚涘簲鍟嗗悕绉� || selectedRow.HName;
+ this.formData.HCompID = selectedRow.HItemID;
+ this.openData = false;
+ this.deptShow = false;
+
+ this.$modal.msgSuccess("宸查�夋嫨鎵胯繍鍟嗭細" + this.formData.HDeptName);
+ } else {
+ this.$modal.msgWarning("璇峰厛閫夋嫨涓�涓壙杩愬晢");
+ }
},
deptDialogVisible() {
this.deptform = {};
@@ -438,6 +444,8 @@
case 1: // 鏂板
this.orgDisabled = true;
this.formData.HItemID = "0";
+ this.formData.HDeptName =sessionStorage["HSupName"];
+ this.formData.HCompID = sessionStorage["HSupID"];
break;
case 2: // 澶嶅埗
@@ -529,10 +537,10 @@
if (data.绂佺敤鏍囪瘑) {
this.formData.checkboxHStopflag = 1;
- this.formData.HStopflag = "1";
+ this.formData.HStopflag = 1;
} else {
this.formData.checkboxHStopflag = 0;
- this.formData.HStopflag = "0";
+ this.formData.HStopflag = 0;
}
},
@@ -573,7 +581,7 @@
const sMainStr = JSON.stringify(saveData);
const res = await axios.post(`${this.$baseUrl}/Gy_Driver/AddBill1`, {
oMain: `${sMainStr};${sessionStorage.getItem("HUserName")};${
- sessionStorage.getItem("OrganizationID") || 100038
+ sessionStorage.getItem("OrganizationID")
}`,
});
@@ -631,14 +639,14 @@
handleStopFlagChange(value) {
- this.formData.HStopflag = value ? "1" : "0";
+ this.formData.HStopflag = value ? 1 : 0;
},
openDeptDialog() {
this.deptShow = false;
- this.dialogTitle = "閮ㄩ棬鍒楄〃";
- this.deptShow = true;
+ this.dialogTitle = "鎵胯繍鍟嗗垪琛�";
+ this.deptShow = false;
this.openData = true;
},
--
Gitblit v1.9.1