From 69cfc999a274c66b7335aa02fc75892d91f1ef0f Mon Sep 17 00:00:00 2001 From: wangpeng Date: Wed, 28 Feb 2024 16:45:10 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/enterprise_management/information/info.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/enterprise_management/information/info.vue b/src/views/enterprise_management/information/info.vue index cd5071c..24abff1 100644 --- a/src/views/enterprise_management/information/info.vue +++ b/src/views/enterprise_management/information/info.vue @@ -186,7 +186,7 @@ 修改 From a11e809c8c35d9292142ffddbeadc04db23d925b Mon Sep 17 00:00:00 2001 From: WenShiJun Date: Wed, 28 Feb 2024 19:30:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=89=E5=85=A8=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=BF=90=E5=8D=95=E7=99=BB=E8=AE=B0=E5=88=97=E8=A1=A8=E9=A1=B5?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- node_modules/vue-esign/src/index.vue | 2 +- src/request/waybill_registration.js | 0 .../customer_management/add.vue | 0 .../customer_management/index.vue | 177 ++++++++++++++++++ .../waybill_registration/add.vue | 0 .../waybill_registration/index.vue | 177 ++++++++++++++++++ .../security_notice/add.vue | 136 ++++++++++---- .../things_check/add.vue | 0 .../things_check/index.vue | 0 9 files changed, 450 insertions(+), 42 deletions(-) create mode 100644 src/request/waybill_registration.js create mode 100644 src/views/electronic_waybill_management/customer_management/add.vue create mode 100644 src/views/electronic_waybill_management/customer_management/index.vue create mode 100644 src/views/electronic_waybill_management/waybill_registration/add.vue create mode 100644 src/views/electronic_waybill_management/waybill_registration/index.vue create mode 100644 src/views/safety_production_related/things_check/add.vue create mode 100644 src/views/safety_production_related/things_check/index.vue diff --git a/node_modules/vue-esign/src/index.vue b/node_modules/vue-esign/src/index.vue index b44b00c..b6d2596 100644 --- a/node_modules/vue-esign/src/index.vue +++ b/node_modules/vue-esign/src/index.vue @@ -24,7 +24,7 @@ export default { }, bgColor: { type: String, - default: '#FFFFFF' + default: '' }, isCrop: { type: Boolean, diff --git a/src/request/waybill_registration.js b/src/request/waybill_registration.js new file mode 100644 index 0000000..e69de29 diff --git a/src/views/electronic_waybill_management/customer_management/add.vue b/src/views/electronic_waybill_management/customer_management/add.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/electronic_waybill_management/customer_management/index.vue b/src/views/electronic_waybill_management/customer_management/index.vue new file mode 100644 index 0000000..03b2890 --- /dev/null +++ b/src/views/electronic_waybill_management/customer_management/index.vue @@ -0,0 +1,177 @@ + + + + + diff --git a/src/views/electronic_waybill_management/waybill_registration/add.vue b/src/views/electronic_waybill_management/waybill_registration/add.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/electronic_waybill_management/waybill_registration/index.vue b/src/views/electronic_waybill_management/waybill_registration/index.vue new file mode 100644 index 0000000..03b2890 --- /dev/null +++ b/src/views/electronic_waybill_management/waybill_registration/index.vue @@ -0,0 +1,177 @@ + + + + + diff --git a/src/views/safety_production_related/security_notice/add.vue b/src/views/safety_production_related/security_notice/add.vue index 2b0b69f..03bee51 100644 --- a/src/views/safety_production_related/security_notice/add.vue +++ b/src/views/safety_production_related/security_notice/add.vue @@ -13,6 +13,21 @@ + + + + + + + @@ -42,32 +57,41 @@ 选择 - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + { const resData = await getUserListAll({}); data.unitsList = resData.varList; @@ -126,11 +153,14 @@ JSON.parse(relatedClassificationTempList.value.zTreeNodes).forEach((e) => { const data = reactive({ form: { TITLE: "", + TRANSPORTATIONCOMPANY: "", LEVEL: "", PERSON: "", fileList: [], + videoList: [], NOTIFICATIONCONTENT: "", allStatus: 0, // 是否全选 + REPLYSTATUS: "", }, }); @@ -139,27 +169,51 @@ const fnSubmit = async () => { const formData = new FormData(); Object.keys(data.form).forEach((key) => { - formData.append(key, data.form[key]); + if (key !== "fileList" && key !== "videoList" && key !== "PERSON") { + formData.append(key, data.form[key]); + } + }); + formData.append("PERSON_ID", data.form.PERSON_ID); + data.form.fileList.forEach((file) => { + if (file.raw) { + formData.append("fileList", file.raw); + } }); - formData.delete("fileList"); + data.form.videoList.forEach((file) => { + if (file.raw) { + formData.append("videoList", file.raw); + } + }); - for (let i = 0; i < data.form.fileList.length; i++) { - if (data.form.fileList[i].raw) - formData.append("FFILE", data.form.fileList[i].raw); + try { + await addSecurityNotice(formData); + ElMessage({ + message: "添加成功", + type: "success", + duration: 3000, + }); + // 清空表单 + Object.keys(data.form).forEach((key) => { + if (Array.isArray(data.form[key])) { + data.form[key] = []; // 如果是数组，重置为空数组 + } else { + data.form[key] = ""; // 否则重置为空字符串 + } + }); + } catch (error) { + ElMessage.error("添加失败"); + console.error(error); } - - await addSecurityNotice(formData); }; -const fnSelectRiskSubmit = (list) => { - console.log(list); - const nameList = list.map((val) => { - return val.USERNAME; - }); - data.form.PERSON = nameList.join(","); - data.form.allStatus = 0; - console.log(data.PERSON, 19); - console.log("是否全选", data.form.allStatus); + +const fnSelectRiskSubmit = (selectionData) => { + // const names = list.map((item) => item.NAME).join(", "); + // const userIds = list.map((item) => item.USER_ID).join(", "); + const userIds = selectionData.map((item) => item.USER_ID).join(", "); + const names = selectionData.map((item) => item.NAME).join(", "); + data.form.PERSON_ID = userIds; + data.form.PERSON = names; }; const fnSelectAllRiskSubmit = () => { diff --git a/src/views/safety_production_related/things_check/add.vue b/src/views/safety_production_related/things_check/add.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/safety_production_related/things_check/index.vue b/src/views/safety_production_related/things_check/index.vue new file mode 100644 index 0000000..e69de29 From 2a719a791e58bc441960ed0f34df156b736cd1de Mon Sep 17 00:00:00 2001 From: WenShiJun Date: Thu, 29 Feb 2024 18:28:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=A8=A1=E5=9D=97->=E6=96=B0=E5=A2=9E=E5=88=97=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E9=A1=B5=E9=9D=A2=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=20=E5=9C=B0=E7=82=B9=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97->?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=97=E8=A1=A8=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 2 +- src/assets/js/constant.js | 65 +++ src/request/customer_management.js | 7 + src/request/location_management.js | 7 + src/request/safety_production_related.js | 4 +- src/request/waybill_registration.js | 10 + .../customer_management/add.vue | 156 +++++++ .../customer_management/index.vue | 153 +++---- .../location_managemen/add.vue | 198 +++++++++ .../location_managemen/index.vue | 118 ++++++ .../waybill_registration/add.vue | 385 ++++++++++++++++++ .../waybill_registration/index.vue | 170 ++++---- .../information/components/map.vue | 8 +- .../safety_meeting/index.vue | 28 +- .../security_notice/add.vue | 33 +- .../{select_risk.vue => select_person.vue} | 13 +- .../security_notice/index.vue | 149 +++---- .../security_notice/notice_info.vue | 2 +- .../things_check/add.vue | 229 +++++++++++ .../things_check/index.vue | 272 +++++++++++++ 20 files changed, 1698 insertions(+), 311 deletions(-) create mode 100644 src/request/customer_management.js create mode 100644 src/request/location_management.js create mode 100644 src/views/electronic_waybill_management/location_managemen/add.vue create mode 100644 src/views/electronic_waybill_management/location_managemen/index.vue rename src/views/safety_production_related/security_notice/components/{select_risk.vue => select_person.vue} (91%) diff --git a/.env b/.env index ab2a573..d2d76c3 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -VITE_BASE_URL=http://192.168.0.42:8099/ +VITE_BASE_URL=http://192.168.0.49:8093/ VITE_PROXY=/api/ VITE_PROXY_QAAQ=/qaaq_api/ VITE_QAAQ_URL=https://gateway.qhdsafety.com/ diff --git a/src/assets/js/constant.js b/src/assets/js/constant.js index 618d584..3d53f6e 100644 --- a/src/assets/js/constant.js +++ b/src/assets/js/constant.js @@ -18,6 +18,71 @@ export const MENU = [ { title: "综合管理", model: MODEL["5"] }, { title: "定位管理", model: MODEL["6"] }, ]; +// 安全生成及电子运单管理 +export const VEHICLEMENU = [ + { title: "鄂A35373", model: MODEL["1"] }, + { title: "渝B73752", model: MODEL["2"] }, + { title: "川C87376", model: MODEL["3"] }, +]; +export const PRACTITIONERMENU = [ + { title: "李某某", model: MODEL["1"] }, + { title: "张某某", model: MODEL["2"] }, + { title: "刘某某", model: MODEL["3"] }, +]; +export const TRUCKMENU = [ + { title: "货AA35373", model: MODEL["1"] }, + { title: "货B73752", model: MODEL["2"] }, + { title: "货C87376", model: MODEL["3"] }, +]; +export const PERSONTYPEMENU = [ + { title: "其他", model: MODEL["1"] }, + { title: "驾驶员", model: MODEL["2"] }, + { title: "监控员", model: MODEL["3"] }, + { title: "押运员", model: MODEL["4"] }, + { title: "安全负责人", model: MODEL["5"] }, +]; +export const CLIENTMENU = [ + { title: "李某某", model: MODEL["1"] }, + { title: "程某某", model: MODEL["2"] }, + { title: "方某某", model: MODEL["3"] }, +]; +export const CONFIRMMENU = [ + { title: "薛某某", model: MODEL["1"] }, + { title: "马某某", model: MODEL["2"] }, + { title: "林某某", model: MODEL["3"] }, +]; +export const STARTINGMENU = [ + { title: "河北", model: MODEL["1"] }, + { title: "河南", model: MODEL["2"] }, + { title: "山东", model: MODEL["3"] }, + { title: "山西", model: MODEL["4"] }, +]; +export const ENDMENU = [ + { title: "广东", model: MODEL["1"] }, + { title: "广西", model: MODEL["2"] }, + { title: "湖南", model: MODEL["3"] }, + { title: "湖北", model: MODEL["4"] }, +]; +export const CUSTOMERTYPEMENU = [ + { title: "委托方", model: MODEL["1"] }, + { title: "确认方", model: MODEL["2"] }, +]; +export const LOCATIONTYPEMENU = [ + { title: "公司", model: MODEL["1"] }, + { title: "仓库", model: MODEL["2"] }, + { title: "中转站", model: MODEL["3"] }, +]; +export const LOCATIONNAMEMENU = [ + { title: "中科", model: MODEL["1"] }, + { title: "中软", model: MODEL["2"] }, + { title: "中天", model: MODEL["3"] }, +]; +export const BOROUGHMENU = [ + { title: "湖北", model: MODEL["1"] }, + { title: "湖南", model: MODEL["2"] }, + { title: "四川", model: MODEL["3"] }, +]; + export const PRINT_STYLE = ' diff --git a/src/views/electronic_waybill_management/customer_management/index.vue b/src/views/electronic_waybill_management/customer_management/index.vue index 03b2890..159881a 100644 --- a/src/views/electronic_waybill_management/customer_management/index.vue +++ b/src/views/electronic_waybill_management/customer_management/index.vue @@ -8,28 +8,25 @@ > - - - - - - - - - - - + + + - - + + @@ -47,86 +44,41 @@ + - - - - - - - - + + + + + - - - - + width="150" + /> + + + { - await ElMessageBox.confirm(`确定要删除吗？`, { - type: "warning", - }); - await dateteSecurityNotice({ NOTIFICATION_ID: value }); - ElMessage.success("删除成功"); - fnGetData(); -}; -const relatedClassificationList = ref(null); - onMounted(async () => { - const data = await layoutFnGetNotificationsClassification(); - relatedClassificationList.value = JSON.parse(data.value.zTreeNodes); + await fnPerson(); }); +const fnPerson = async () => { + const resData = await getSecurityPerson({}); + data.unitsList = [resData.pd]; +}; diff --git a/src/views/electronic_waybill_management/location_managemen/add.vue b/src/views/electronic_waybill_management/location_managemen/add.vue new file mode 100644 index 0000000..9da42b9 --- /dev/null +++ b/src/views/electronic_waybill_management/location_managemen/add.vue @@ -0,0 +1,198 @@ + + + + + diff --git a/src/views/electronic_waybill_management/location_managemen/index.vue b/src/views/electronic_waybill_management/location_managemen/index.vue new file mode 100644 index 0000000..5893a8b --- /dev/null +++ b/src/views/electronic_waybill_management/location_managemen/index.vue @@ -0,0 +1,118 @@ + + + + + diff --git a/src/views/electronic_waybill_management/waybill_registration/add.vue b/src/views/electronic_waybill_management/waybill_registration/add.vue index e69de29..c29b3ff 100644 --- a/src/views/electronic_waybill_management/waybill_registration/add.vue +++ b/src/views/electronic_waybill_management/waybill_registration/add.vue @@ -0,0 +1,385 @@ + + + + + diff --git a/src/views/electronic_waybill_management/waybill_registration/index.vue b/src/views/electronic_waybill_management/waybill_registration/index.vue index 03b2890..0d69d28 100644 --- a/src/views/electronic_waybill_management/waybill_registration/index.vue +++ b/src/views/electronic_waybill_management/waybill_registration/index.vue @@ -8,29 +8,15 @@ > - - + + - - - - - - - - - - - - - + + + + @@ -47,86 +33,56 @@ + - - + + - + + + - - - + - - + + + + + + + + + diff --git a/src/views/safety_production_related/things_check/index.vue b/src/views/safety_production_related/things_check/index.vue index e69de29..802785d 100644 --- a/src/views/safety_production_related/things_check/index.vue +++ b/src/views/safety_production_related/things_check/index.vue @@ -0,0 +1,272 @@ + + + + + + + +