From 8fb8aecfb7635edea6f802d95a3e12f64da8bf87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 23 Jul 2021 00:18:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=9A=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/api/api.js                     |   9 ++
 .../views/material/MaterialAttributeList.vue  |   6 +-
 .../views/material/MaterialCategoryList.vue   |  27 +++-
 .../modules/MaterialAttributeModal.vue        | 137 ++++++++++++++++++
 .../modules/MaterialCategoryModal.vue         |  26 +++-
 5 files changed, 199 insertions(+), 6 deletions(-)
 create mode 100644 jshERP-web/src/views/material/modules/MaterialAttributeModal.vue

diff --git a/jshERP-web/src/api/api.js b/jshERP-web/src/api/api.js
index 039b3532..84c2d1d8 100644
--- a/jshERP-web/src/api/api.js
+++ b/jshERP-web/src/api/api.js
@@ -122,6 +122,7 @@ const editMaterialProperty = (params)=>putAction("/materialProperty/update",para
 //商品类型
 const queryMaterialCategoryTreeList = (params)=>getAction("/materialCategory/getMaterialCategoryTree",params);
 const queryMaterialCategoryById = (params)=>getAction("/materialCategory/findById",params);
+const checkMaterialCategory = (params)=>getAction("/materialCategory/checkIsNameExist",params);
 //商品管理
 const addMaterial = (params)=>postAction("/material/add",params);
 const editMaterial = (params)=>putAction("/material/update",params);
@@ -135,6 +136,10 @@ const addSerialNumber = (params)=>postAction("/serialNumber/add",params);
 const editSerialNumber = (params)=>putAction("/serialNumber/update",params);
 const checkSerialNumber = (params)=>getAction("/serialNumber/checkIsNameExist",params);
 const batAddSerialNumber = (params)=>postAction("/serialNumber/batAddSerialNumber",params);
+//多属性
+const addMaterialAttribute = (params)=>postAction("/materialAttribute/add",params);
+const editMaterialAttribute = (params)=>putAction("/materialAttribute/update",params);
+const checkMaterialAttribute = (params)=>getAction("/materialAttribute/checkIsNameExist",params);
 //功能管理
 const addFunction = (params)=>postAction("/function/add",params);
 const editFunction = (params)=>putAction("/function/update",params);
@@ -243,6 +248,7 @@ export {
   editMaterialProperty,
   queryMaterialCategoryTreeList,
   queryMaterialCategoryById,
+  checkMaterialCategory,
   addMaterial,
   editMaterial,
   checkMaterial,
@@ -254,6 +260,9 @@ export {
   editSerialNumber,
   checkSerialNumber,
   batAddSerialNumber,
+  addMaterialAttribute,
+  editMaterialAttribute,
+  checkMaterialAttribute,
   addFunction,
   editFunction,
   checkFunction,
diff --git a/jshERP-web/src/views/material/MaterialAttributeList.vue b/jshERP-web/src/views/material/MaterialAttributeList.vue
index ca3af23f..ad1b673f 100644
--- a/jshERP-web/src/views/material/MaterialAttributeList.vue
+++ b/jshERP-web/src/views/material/MaterialAttributeList.vue
@@ -20,17 +20,21 @@
           </a-table>
         </div>
         <!-- table区域-end -->
+        <!-- 表单区域 -->
+        <material-attribute-modal ref="modalForm" @ok="modalFormOk"></material-attribute-modal>
       </a-card>
     </a-col>
   </a-row>
 </template>
 <script>
+  import MaterialAttributeModal from './modules/MaterialAttributeModal'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import JDate from '@/components/jeecg/JDate'
   export default {
     name: "MaterialAttributeList",
     mixins:[JeecgListMixin],
     components: {
+      MaterialAttributeModal,
       JDate
     },
     data () {
@@ -57,7 +61,7 @@
             }
           },
           {title: '属性名', dataIndex: 'attributeName', width: 100},
-          {title: '属性值', dataIndex: 'attributeValue', width: 400},
+          {title: '属性值（用竖线隔开）', dataIndex: 'attributeValue', width: 400},
           {
             title: '操作',
             dataIndex: 'action',
diff --git a/jshERP-web/src/views/material/MaterialCategoryList.vue b/jshERP-web/src/views/material/MaterialCategoryList.vue
index d26fb6b4..cf509522 100644
--- a/jshERP-web/src/views/material/MaterialCategoryList.vue
+++ b/jshERP-web/src/views/material/MaterialCategoryList.vue
@@ -97,7 +97,7 @@
 <script>
 import MaterialCategoryModal from '../material/modules/MaterialCategoryModal'
 import pick from 'lodash.pick'
-import {queryMaterialCategoryTreeList,queryMaterialCategoryById} from '@/api/api'
+import {queryMaterialCategoryTreeList,queryMaterialCategoryById,checkMaterialCategory} from '@/api/api'
 import {httpAction, deleteAction} from '@/api/manage'
 import {JeecgListMixin} from '@/mixins/JeecgListMixin'
 export default {
@@ -143,7 +143,12 @@ export default {
         edges: []
       },
       validatorRules:{
-        name: {rules: [{required: true, message: '请输入名称!'}]},
+        name: {
+          rules: [
+            {required: true, message: '请输入名称!'},
+            { validator: this.validateName}
+          ]
+        },
         serialNo: {rules: [{required: true, message: '请输入编号!'}]}
       },
       url: {
@@ -259,7 +264,6 @@ export default {
     nodeModalClose() {
     },
     hide() {
-      console.log(111)
       this.visible = false
     },
     onCheck(checkedKeys, info) {
@@ -357,6 +361,23 @@ export default {
     openSelect() {
       this.$refs.sysDirectiveModal.show()
     },
+    validateName(rule, value, callback){
+      let params = {
+        name: value,
+        id: this.model.id?this.model.id:0
+      };
+      checkMaterialCategory(params).then((res)=>{
+        if(res && res.code===200) {
+          if(!res.data.status){
+            callback();
+          } else {
+            callback("名称已经存在");
+          }
+        } else {
+          callback(res.data);
+        }
+      });
+    },
     handleAdd() {
       this.$refs.materialCategoryModal.add()
       this.$refs.materialCategoryModal.title = '新增'
diff --git a/jshERP-web/src/views/material/modules/MaterialAttributeModal.vue b/jshERP-web/src/views/material/modules/MaterialAttributeModal.vue
new file mode 100644
index 00000000..d653d47c
--- /dev/null
+++ b/jshERP-web/src/views/material/modules/MaterialAttributeModal.vue
@@ -0,0 +1,137 @@
+<template>
+  <a-modal
+    :title="title"
+    :width="800"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @ok="handleOk"
+    @cancel="handleCancel"
+    cancelText="关闭"
+    wrapClassName="ant-modal-cust-warp"
+    style="top:20%;height: 50%;overflow-y: hidden">
+    <template slot="footer">
+      <a-button key="back" v-if="isReadOnly" @click="handleCancel">
+        关闭
+      </a-button>
+    </template>
+    <a-spin :spinning="confirmLoading">
+      <a-form :form="form">
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="属性名">
+          <a-input placeholder="请输入属性名" v-decorator.trim="[ 'attributeName', validatorRules.attributeName]" />
+        </a-form-item>
+      </a-form>
+      <a-form :form="form">
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="属性值">
+          <a-textarea :rows="2" placeholder="请输入属性值（用竖线隔开）" v-decorator.trim="[ 'attributeValue', validatorRules.attributeValue]" />
+        </a-form-item>
+      </a-form>
+    </a-spin>
+  </a-modal>
+</template>
+<script>
+  import pick from 'lodash.pick'
+  import {addMaterialAttribute,editMaterialAttribute,checkMaterialAttribute } from '@/api/api'
+    export default {
+    name: "MaterialAttributeModal",
+    data () {
+      return {
+        title:"操作",
+        visible: false,
+        model: {},
+        isReadOnly: false,
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        form: this.$form.createForm(this),
+        validatorRules:{
+          attributeName:{
+            rules: [
+              { required: true, message: '请输入属性名!' },
+              { min: 1, max: 10, message: '长度在 1 到 10 个字符', trigger: 'blur' },
+              { validator: this.validateAttributeName}
+            ]
+          },
+          attributeValue:{
+            rules: [
+              { required: true, message: '请输入属性值（用竖线隔开）!' }
+            ]
+          }
+        }
+      }
+    },
+    created () {
+    },
+    methods: {
+      add () {
+        this.edit({});
+      },
+      edit (record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, record);
+        this.visible = true;
+        this.$nextTick(() => {
+          this.form.setFieldsValue(pick(this.model, 'attributeName', 'attributeValue'))
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        const that = this;
+        // 触发表单验证
+        this.form.validateFields((err, values) => {
+          if (!err) {
+            that.confirmLoading = true;
+            let formData = Object.assign(this.model, values);
+            let obj;
+            if(!this.model.id){
+              obj=addMaterialAttribute(formData);
+            }else{
+              obj=editMaterialAttribute(formData);
+            }
+            obj.then((res)=>{
+              if(res.code === 200){
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.data.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+              that.close();
+            })
+          }
+        })
+      },
+      handleCancel () {
+        this.close()
+      },
+      validateAttributeName(rule, value, callback){
+        let params = {
+          name: value,
+          id: this.model.id?this.model.id:0
+        };
+        checkMaterialAttribute(params).then((res)=>{
+          if(res && res.code===200) {
+            if(!res.data.status){
+              callback();
+            } else {
+              callback("名称已经存在");
+            }
+          } else {
+            callback(res.data);
+          }
+        });
+      }
+    }
+  }
+</script>
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/jshERP-web/src/views/material/modules/MaterialCategoryModal.vue b/jshERP-web/src/views/material/modules/MaterialCategoryModal.vue
index 4171613a..a64cfb70 100644
--- a/jshERP-web/src/views/material/modules/MaterialCategoryModal.vue
+++ b/jshERP-web/src/views/material/modules/MaterialCategoryModal.vue
@@ -37,7 +37,7 @@
 
 <script>
   import { httpAction } from '@/api/manage'
-  import { queryMaterialCategoryTreeList } from '@/api/api'
+  import { queryMaterialCategoryTreeList, checkMaterialCategory } from '@/api/api'
   import pick from 'lodash.pick'
   import ATextarea from 'ant-design-vue/es/input/TextArea'
   export default {
@@ -67,7 +67,12 @@
         confirmLoading: false,
         form: this.$form.createForm(this),
         validatorRules:{
-          name: {rules: [{required: true, message: '请输入名称!'}]},
+          name: {
+            rules: [
+              {required: true, message: '请输入名称!'},
+              { validator: this.validateName}
+            ]
+          },
           serialNo: {rules: [{required: true, message: '请输入编号!'}]}
         },
         url: {
@@ -135,6 +140,23 @@
       },
       handleCancel () {
         this.close()
+      },
+      validateName(rule, value, callback){
+        let params = {
+          name: value,
+          id: this.model.id?this.model.id:0
+        };
+        checkMaterialCategory(params).then((res)=>{
+          if(res && res.code===200) {
+            if(!res.data.status){
+              callback();
+            } else {
+              callback("名称已经存在");
+            }
+          } else {
+            callback(res.data);
+          }
+        });
       }
     }
   }