From 6cd23d79545071411d3fd63c357262aec5cc59f4 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 19 三月 2025 13:53:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/eam/base/modules/EamPrecisionParametersModal.vue |  171 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 87 insertions(+), 84 deletions(-)

diff --git a/src/views/eam/base/modules/EamPrecisionParametersModal.vue b/src/views/eam/base/modules/EamPrecisionParametersModal.vue
index 4ce96f6..1965539 100644
--- a/src/views/eam/base/modules/EamPrecisionParametersModal.vue
+++ b/src/views/eam/base/modules/EamPrecisionParametersModal.vue
@@ -8,108 +8,111 @@
     @ok="handleOk"
     @cancel="handleCancel"
     cancelText="鍏抽棴">
-    
+
     <a-spin :spinning="confirmLoading">
       <a-form-model ref="form" :model="model" :rules="validatorRules">
-      
-        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="delFlag" label="鍒犻櫎鏍囪">
-          <a-input-number v-model="model.delFlag"/>
-        </a-form-model-item>
         <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="parameterCode" label="鍙傛暟缂栫爜">
-          <a-input placeholder="璇疯緭鍏ュ弬鏁扮紪鐮�" v-model="model.parameterCode" />
+          <a-input placeholder="鍙傛暟缂栫爜鑷姩鐢熸垚" v-model="model.parameterCode" disabled />
         </a-form-model-item>
         <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="parameterName" label="妫�娴嬮」鐩�">
           <a-input placeholder="璇疯緭鍏ユ娴嬮」鐩�" v-model="model.parameterName" />
         </a-form-model-item>
-		
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="parameterCategory" label="鍙傛暟鍒嗙被">
+          <j-dict-select-tag dict-code="precision_parameters_category" placeholder="璇烽�夋嫨鍙傛暟鍒嗙被"
+                             v-model="model.parameterCategory"></j-dict-select-tag>
+        </a-form-model-item>
       </a-form-model>
     </a-spin>
   </j-modal>
 </template>
 
 <script>
-  import { httpAction } from '@/api/manage'
-  import moment from "moment"
+import { httpAction } from '@/api/manage'
 
-  export default {
-    name: "EamPrecisionParametersModal",
-    data () {
-      return {
-        title:"鎿嶄綔",
-        visible: false,
-        model: {},
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
+export default {
+  name: 'EamPrecisionParametersModal',
+  data() {
+    return {
+      title: '鎿嶄綔',
+      visible: false,
+      model: {},
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 5 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 }
+      },
 
-        confirmLoading: false,
-        validatorRules:{
-        },
-        url: {
-          add: "/eam/eamPrecisionParameters/add",
-          edit: "/eam/eamPrecisionParameters/edit",
-        },
+      confirmLoading: false,
+      validatorRules: {
+        parameterName:[
+          { required: true, message: '璇疯緭鍏ュ弬鏁板悕绉�!' }
+        ],
+        parameterCategory: [
+          { required: true, message: '璇烽�夋嫨鍙傛暟鍒嗙被!' }
+        ],
+      },
+      url: {
+        add: '/eam/precisionParameters/add',
+        edit: '/eam/precisionParameters/edit'
       }
-    },
-    created () {
-    },
-    methods: {
-      add () {
-        //鍒濆鍖栭粯璁ゅ��
-        this.edit({});
-      },
-      edit (record) {
-        this.model = Object.assign({}, record);
-        this.visible = true;
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-        this.$refs.form.clearValidate();
-      },
-      handleOk () {
-        const that = this;
-        // 瑙﹀彂琛ㄥ崟楠岃瘉
-         this.$refs.form.validate(valid => {
-          if (valid) {
-            that.confirmLoading = true;
-            let httpurl = '';
-            let method = '';
-            if(!this.model.id){
-              httpurl+=this.url.add;
-              method = 'post';
-            }else{
-              httpurl+=this.url.edit;
-               method = 'put';
-            }
-            httpAction(httpurl,this.model,method).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.$emit('ok');
-              }else{
-                that.$message.warning(res.message);
-              }
-            }).finally(() => {
-              that.confirmLoading = false;
-              that.close();
-            })
-          }else{
-             return false;
-          }
-        })
-      },
-      handleCancel () {
-        this.close()
-      },
-
-
     }
+  },
+  created() {
+  },
+  methods: {
+    add() {
+      //鍒濆鍖栭粯璁ゅ��
+      this.edit({})
+    },
+    edit(record) {
+      this.model = Object.assign({}, record)
+      this.visible = true
+    },
+    close() {
+      this.$emit('close')
+      this.visible = false
+      this.$refs.form.clearValidate()
+    },
+    handleOk() {
+      const that = this
+      // 瑙﹀彂琛ㄥ崟楠岃瘉
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          that.confirmLoading = true
+          let httpurl = ''
+          let method = ''
+          if (!this.model.id) {
+            httpurl += this.url.add
+            method = 'post'
+          } else {
+            httpurl += this.url.edit
+            method = 'put'
+          }
+          httpAction(httpurl, this.model, method).then((res) => {
+            if (res.success) {
+              that.$message.success(res.message)
+              that.$emit('ok')
+            } else {
+              that.$message.warning(res.message)
+            }
+          }).finally(() => {
+            that.confirmLoading = false
+            that.close()
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    handleCancel() {
+      this.close()
+    }
+
   }
+}
 </script>
 
 <style lang="less" scoped>

--
Gitblit v1.9.3