From 9906e6b188bf2c36dddc0d5adadbf02e69ea3e4b Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期五, 25 十月 2024 09:17:29 +0800
Subject: [PATCH] add -sap

---
 jcdm-ui/src/views/main/bs/material/index.vue |   69 +++++++++++++++++++++-------------
 1 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/jcdm-ui/src/views/main/bs/material/index.vue b/jcdm-ui/src/views/main/bs/material/index.vue
index f32dc96..5f15e55 100644
--- a/jcdm-ui/src/views/main/bs/material/index.vue
+++ b/jcdm-ui/src/views/main/bs/material/index.vue
@@ -85,19 +85,23 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="鐗╂枡缂栧彿"  align="center" prop="materialCode" width="180">
       </el-table-column>
-      <el-table-column label="鐗╂枡鍚嶇О" align="center" prop="materialName" width="250">
+      <el-table-column label="鐗╂枡鍚嶇О" align="center" prop="materialName" width="220">
       </el-table-column>
-      <el-table-column label="瑙嗗浘" align="center" prop="materialView" width="180">
-      </el-table-column>
-      <el-table-column label="绫诲瀷" align="center" prop="typeL">
+<!--      <el-table-column label="瑙嗗浘" align="center" prop="materialView" width="180">
+      </el-table-column>-->
+
+<!--      <el-table-column label="杞﹀瀷" align="center" prop="carType" width="120">-->
+<!--      </el-table-column>-->
+      <el-table-column label="鐗╂枡绫诲瀷" align="center" prop="typeL">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.material_type" :value="scope.row.typeL"/>
         </template>
       </el-table-column>
 
-      <el-table-column label="鍨嬪彿" align="center" prop="typeZ" width="180">
+      <el-table-column label="鏈哄瀷" align="center" prop="typeZ" width="150">
       </el-table-column>
-
+      <el-table-column label="鐗规畩浠g爜" align="center" prop="mark" width="120">
+      </el-table-column>
       <el-table-column label="鍗曚綅" align="center" prop="unit" width="80">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.unit" :value="scope.row.unit"/>
@@ -120,12 +124,12 @@
       </el-table-column>
       <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="170">
       </el-table-column>
-      <el-table-column label="鏇存柊浜�" align="center" prop="updateUser" width="150">
-      </el-table-column>
-      <el-table-column label="鏇存柊鏃堕棿" align="center" prop="updateTime" width="170">
-      </el-table-column>
-      <el-table-column label="鏁版嵁鏉ユ簮" align="center" prop="dataSource">
-      </el-table-column>
+<!--      <el-table-column label="鏇存柊浜�" align="center" prop="updateUser" width="150">-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="鏇存柊鏃堕棿" align="center" prop="updateTime" width="170">-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="鏁版嵁鏉ユ簮" align="center" prop="dataSource">-->
+<!--      </el-table-column>-->
       <el-table-column fixed="right" label="鎿嶄綔" width="200" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -171,20 +175,26 @@
         <el-form-item label="鐗╂枡缂栧彿" prop="materialCode">
           <el-input v-model="form.materialCode" placeholder="璇疯緭鍏ョ墿鏂欑紪鍙�" />
         </el-form-item>
+        <el-form-item label="鐗规畩浠g爜" prop="mark">
+          <el-input v-model="form.mark" placeholder="璇疯緭鍏ョ壒娈婁唬鐮�" />
+        </el-form-item>
+        <el-form-item label="杞﹀瀷" prop="carType">
+          <el-input v-model="form.carType" placeholder="璇疯緭鍏ョ壒娈婁唬鐮�" />
+        </el-form-item>
         <el-form-item label="鐗╂枡鍚嶇О" prop="materialName">
           <el-input v-model="form.materialName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" />
         </el-form-item>
-        <el-form-item label="鐗╂枡绫诲瀷" prop="typeL">
-          <!--          <el-input v-model="form.typeL" placeholder="璇疯緭鍏ョ被鍨�" />-->
-          <el-select v-model="form.typeL" style="width: 204px;" placeholder="璇烽�夋嫨鍗曚綅" clearable>
-            <el-option
-              v-for="dict in dict.type.material_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            />
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="鐗╂枡绫诲瀷" prop="typeL">-->
+<!--          &lt;!&ndash;          <el-input v-model="form.typeL" placeholder="璇疯緭鍏ョ被鍨�" />&ndash;&gt;-->
+<!--          <el-select v-model="form.typeL"  placeholder="璇烽�夋嫨鍗曚綅" >-->
+<!--            <el-option-->
+<!--              v-for="dict in dict.type.material_type"-->
+<!--              :key="dict.value"-->
+<!--              :label="dict.label"-->
+<!--              :value="dict.value"-->
+<!--            />-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="鐗╂枡鍨嬪彿" prop="typeZ">
           <el-input v-model="form.typeZ" placeholder="璇疯緭鍏ョ绫�" />
         </el-form-item>
@@ -262,6 +272,7 @@
         pageNum: 1,
         pageSize: 10,
         materialCode: null,
+        carType:null,
         materialName: null,
         materialView: null,
         typeZ: null,
@@ -276,6 +287,7 @@
         dataSource: null,
         version: null,
         status: null,
+        mark: null,
         supplier: null
       },
       // 琛ㄥ崟鍙傛暟
@@ -288,12 +300,15 @@
         materialCode: [
           { required: true, message: "鐗╂枡缂栫爜涓嶈兘涓虹┖", trigger: "blur" }
         ],
+        mark: [
+          { required: true, message: "鐗规畩浠g爜涓嶈兘涓虹┖", trigger: "blur" }
+        ],
         materialName: [
           { required: true, message: "鐗╂枡鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
         ],
-        typeL: [
-          { required: true, message: "绫诲瀷涓嶈兘涓虹┖", trigger: "blur" }
-        ],
+        // typeL: [
+        //   { required: true, message: "绫诲瀷涓嶈兘涓虹┖", trigger: "blur" }
+        // ],
       }
     };
   },
@@ -323,6 +338,7 @@
         materialName: null,
         materialView: null,
         typeZ: null,
+        carType:null,
         typeL: null,
         unit: null,
         matterVersion: null,
@@ -335,6 +351,7 @@
         dataSource: null,
         version: null,
         status: '0',
+        mark: null,
         supplier: null
       };
       this.resetForm("form");

--
Gitblit v1.9.3