From 5b8bf171b9afda52fa366a72e54eedbd9e6d4d17 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期六, 01 十一月 2025 19:54:25 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhiHuiQiCe/FangCangZhiNeng
---
新建文件夹/WMS/src/views/basic/materielInfo.vue | 462 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 224 insertions(+), 238 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/basic/materielInfo.vue" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/basic/materielInfo.vue"
index 2bd913a..0748ff0 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/basic/materielInfo.vue"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WMS/src/views/basic/materielInfo.vue"
@@ -8,13 +8,13 @@
:searchFormFields="searchFormFields"
:searchFormOptions="searchFormOptions"
:table="table"
- :extend="extend"
+ :extend="extend"
>
</view-grid>
</template>
<script>
-import extend from "@/extension/medicine/Dt_MaterielInfo.js";
+import extend from "@/extension/basic/Dt_MaterielInfo.js";
import { ref, defineComponent } from "vue";
export default defineComponent({
setup() {
@@ -54,194 +54,172 @@
remark: "",
});
- const editFormOptions = ref([
- [
+const editFormOptions = ref([
+ // 绗竴琛岋細鍏抽敭淇℃伅
+ [
+ // {
+ // title: "鐗╂枡缂栧彿",
+ // field: "materielCode",
+ // type: "string",
+ // span: 12,
+ // required: true,
+ // },
+ {
+ title: "鐗╂枡鍚嶇О",
+ field: "materielName",
+ type: "string",
+ span: 12,
+ required: true,
+ }
+ ],
+ // 绗簩琛岋細鍒嗙被淇℃伅
+ [
+ {
+ title: "鐗╂枡鍩烘湰鍒嗙被",
+ field: "materielType",
+ type: "select",
+ dataKey: "materielType",
+ data: [],
+ span: 12,
+ required: true,
+ },
+ {
+ title: "鐗╂枡灞炴�у垎绫�",
+ field: "materielSourceType",
+ type: "select",
+ dataKey: "materialCode",
+ data: [],
+ span: 12,
+ required: true,
+ }
+ ],
+ // 绗笁琛岋細涓婃父淇℃伅
+ [
+ {
+ title: "涓婃父鐗╂枡绫诲瀷",
+ field: "materielErpType",
+ type: "string",
+ span: 12,
+ },
+ {
+ title: "鐢熶骇鍘傚",
+ field: "factory",
+ type: "string",
+ span: 12,
+ }
+ ],
+ // 绗洓琛岋細鍗曚綅淇℃伅
+ [
+ {
+ title: "鍩烘湰鍗曚綅",
+ field: "materielUnit",
+ type: "string",
+ span: 8,
+ required: true,
+ },
+ {
+ title: "绠辫",
+ field: "boxQty",
+ type: "number",
+ span: 8,
+ required: true,
+ validate: [
{
- title: "浠撳簱缂栧彿",
- field: "warehouseCode",
- type: "string",
- width: 120,
- },
- {
- title: "鐗╂枡缂栧彿",
- field: "materielCode",
- type: "string",
- width: 120,
required: true,
- },
- ],
- [
- {
- title: "鐗╂枡鍚嶇О",
- field: "materielName",
- type: "string",
- width: 200,
- required: true,
+ message: "绠辫涓嶈兘涓虹┖"
},
{
- title: "鍝佸悕/閫氱敤鍚�",
- field: "item",
- type: "string",
- width: 150,
- },
- ],
- [
- {
- title: "鐗╂枡瑙勬牸",
- field: "materielSpec",
- type: "string",
- width: 200,
- required: true,
- },
- // {
- // title: "鐗╂枡鍨嬪彿",
- // field: "materielModel",
- // type: "string",
- // width: 150,
- // },
- ],
- [
- {
- title: "鐗╂枡鍩烘湰鍒嗙被",
- field: "materielType",
- type: "select",
- dataKey: "materielType",
- data: [],
- required: true,
- },
- {
- title: "鐗╂枡灞炴�у垎绫�",
- field: "materielSourceType",
- type: "select",
- dataKey: "materialCode",
- data: [],
- required: true,
- },
- ],
- [
- {
- title: "涓婃父鐗╂枡绫诲瀷",
- field: "materielErpType",
- type: "string",
- width: 150,
- },
- {
- title: "鐢熶骇鍘傚",
- field: "factory",
- type: "string",
- width: 200,
- },
- ],
- [
- {
- title: "鍩烘湰鍗曚綅",
- field: "materielUnit",
- type: "string",
- width: 100,
- required: true,
- },
- {
- title: "绠辫",
- field: "boxQty",
- type: "number",
- width: 100,
- required: true,
- },
- ],
- [
- {
- title: "绔嬪簱鏈�浣庡簱瀛樻暟",
- field: "minQty",
- type: "number",
- width: 120,
- required: true,
- },
- // {
- // title: "绔嬪簱涓氬姟搴撳瓨鏁�",
- // field: "business_qty",
- // type: "number",
- // width: 120,
- // required: true,
- // },
- ],
- [
- {
- title: "绔嬪簱鏈�楂樺簱瀛樻暟",
- field: "maxQty",
- type: "number",
- width: 120,
- },
- {
- title: "鐗╂枡鐘舵��",
- field: "materielState",
- type: "select",
- dataKey: "materielState",
- data: [],
- required: true,
+ validator: (value) => value > 0,
+ message: "绠辫蹇呴』澶т簬0"
}
- ],
- [
- {
- title: "涓嬪彂鐘舵��",
- field: "goodStatusState",
- type: "select",
- dataKey: "goodStatusState",
- data: [],
- required: true,
- }
- ],
- [
- {
- title: "鐗╂枡闀垮害(mm)",
- field: "materielLength",
- type: "number",
- width: 100,
- },
- {
- title: "鐗╂枡瀹藉害(mm)",
- field: "materielWide",
- type: "number",
- width: 100,
- },
- {
- title: "鐗╂枡楂樺害(mm)",
- field: "materielHeight",
- type: "number",
- width: 100,
- },
- ],
- [
- {
- title: "鐗╂枡浣撶Н(mm鲁)",
- field: "materielVolume",
- type: "number",
- width: 120,
- },
- {
- title: "鐗╂枡閲嶉噺(g)",
- field: "materielWeight",
- type: "number",
- width: 100,
- },
- ],
- [
- {
- title: "瀛樺偍鏉′欢",
- field: "materielStoragecondition",
- type: "textarea",
- width: 300,
- },
- ],
- [
- {
- title: "澶囨敞",
- field: "remark",
- type: "textarea",
- width: 300,
- },
- ],
- ]);
-
+ ]
+ },
+ // {
+ // title: "鐗╂枡鐘舵��",
+ // field: "materielState",
+ // type: "select",
+ // dataKey: "materielState",
+ // data: [],
+ // span: 8,
+ // required: true,
+ // }
+ ],
+ // 绗簲琛岋細搴撳瓨淇℃伅
+ [
+ {
+ title: "绔嬪簱鏈�浣庡簱瀛樻暟",
+ field: "minQty",
+ type: "number",
+ span: 12,
+ required: true,
+ },
+ {
+ title: "绔嬪簱鏈�楂樺簱瀛樻暟",
+ field: "maxQty",
+ type: "number",
+ align: "right",
+ span: 12,
+ }
+ ],
+ // 绗叚琛岋細灏哄淇℃伅
+ [
+ {
+ title: "闀垮害(mm)",
+ field: "materielLength",
+ type: "number",
+ span: 8,
+ },
+ {
+ title: "瀹藉害(mm)",
+ field: "materielWide",
+ type: "number",
+ span: 8,
+ },
+ {
+ title: "楂樺害(mm)",
+ field: "materielHeight",
+ type: "number",
+ span: 8,
+ }
+ ],
+ // 绗竷琛岋細鐗╃悊灞炴��
+ [
+ {
+ title: "浣撶Н(mm鲁)",
+ field: "materielVolume",
+ type: "number",
+ span: 12,
+ },
+ {
+ title: "閲嶉噺(g)",
+ field: "materielWeight",
+ type: "number",
+ span: 12,
+ }
+ ],
+ // 绗叓琛岋細瀛樺偍鏉′欢锛堝崟鐙竴琛岋級
+ [
+ {
+ title: "瀛樺偍鏉′欢",
+ field: "materielStoragecondition",
+ type: "textarea",
+ span: 24,
+ rows: 2,
+ placeholder: "璇疯緭鍏ュ瓨鍌ㄦ潯浠�"
+ }
+ ],
+ // 绗節琛岋細澶囨敞锛堝崟鐙竴琛岋級
+ [
+ {
+ title: "澶囨敞",
+ field: "remark",
+ type: "textarea",
+ span: 24,
+ rows: 2,
+ placeholder: "璇疯緭鍏ュ娉ㄤ俊鎭�"
+ }
+ ],
+]);
const searchFormFields = ref({
warehouseCode: "",
materielCode: "",
@@ -252,31 +230,32 @@
materielSourceType: "",
materielState: "",
goodStatusState: "",
+ Dosage_form:''
});
const searchFormOptions = ref([
[
- {
- title: "浠撳簱缂栧彿",
- field: "warehouseCode",
- type: "string"
- },
+ // {
+ // title: "浠撳簱缂栧彿",
+ // field: "warehouseCode",
+ // type: "string"
+ // },
{
title: "鐗╂枡缂栧彿",
field: "materielCode",
type: "like"
},
- ],
- [
- {
+ {
title: "鐗╂枡鍚嶇О",
field: "materielName",
type: "like"
},
{
- title: "鍝佸悕/閫氱敤鍚�",
- field: "item",
- type: "like",
+ title: "鑽墏",
+ field: "Dosage_form",
+ type: "string",
+ width: 200,
+ required: true,
},
],
[
@@ -292,32 +271,32 @@
dataKey: "materielType",
data: [],
},
- ],
- [
- {
+ {
title: "鐗╂枡灞炴�у垎绫�",
field: "materielSourceType",
type: "select",
dataKey: "materialCode",
data: [],
},
- {
- title: "鐗╂枡鐘舵��",
- field: "materielState",
- type: "select",
- dataKey: "materielState",
- data: [],
- },
],
[
- {
- title: "涓嬪彂鐘舵��",
- field: "goodStatusState",
- type: "select",
- dataKey: "goodStatusState",
- data: [],
- },
+ // {
+ // title: "鐗╂枡鐘舵��",
+ // field: "materielState",
+ // type: "select",
+ // dataKey: "materielState",
+ // data: [],
+ // },
],
+ // [
+ // {
+ // title: "涓嬪彂鐘舵��",
+ // field: "goodStatusState",
+ // type: "select",
+ // dataKey: "goodStatusState",
+ // data: [],
+ // },
+ // ],
]);
const columns = ref([
@@ -370,6 +349,13 @@
align: "left",
require: true,
},
+ {
+ title: "鑽墏绫诲瀷",
+ field: "dosage_form",
+ type: "string",
+ width: 200,
+ required: true,
+ },
{
field: "materielModel",
title: "鐗╂枡鍨嬪彿",
@@ -432,7 +418,7 @@
type: "number",
width: 100,
align: "left",
- require: true,
+ // require: true,
},
{
field: "maxQty",
@@ -441,15 +427,15 @@
width: 100,
align: "left",
},
- {
- field: "materielState",
- title: "鐗╂枡鐘舵��",
- type: "string",
- width: 100,
- align: "left",
- bind: { key: "materielState", data: [] },
- require: true,
- },
+ // {
+ // field: "materielState",
+ // title: "鐗╂枡鐘舵��",
+ // type: "string",
+ // width: 100,
+ // align: "left",
+ // bind: { key: "materielState", data: [] },
+ // require: true,
+ // },
{
field: "goodStatusState",
title: "涓嬪彂鐘舵��",
@@ -457,7 +443,7 @@
width: 120,
align: "left",
bind: { key: "goodStatusState", data: [] },
- require: true,
+ // require: true,
},
{
field: "materielErpType",
@@ -466,13 +452,13 @@
width: 150,
align: "left",
},
- {
- field: "creater",
- title: "鍒涘缓浜�",
- type: "string",
- width: 90,
- align: "left",
- },
+ // {
+ // field: "creater",
+ // title: "鍒涘缓浜�",
+ // type: "string",
+ // width: 90,
+ // align: "left",
+ // },
{
field: "createDate",
title: "鍒涘缓鏃堕棿",
@@ -480,13 +466,13 @@
width: 160,
align: "left",
},
- {
- field: "modifier",
- title: "淇敼浜�",
- type: "string",
- width: 100,
- align: "left",
- },
+ // {
+ // field: "modifier",
+ // title: "淇敼浜�",
+ // type: "string",
+ // width: 100,
+ // align: "left",
+ // },
{
field: "modifyDate",
title: "淇敼鏃堕棿",
--
Gitblit v1.9.3