From 1b8098b7f79b66a80e5ca49d8765606cb5fa0408 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 30 十一月 2023 19:11:00 +0800
Subject: [PATCH] 操作日志完善

---
 Source/UBCS-WEB/src/views/code/code.vue |   38 ++++++++++++++++++++++----------------
 1 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index 3bb59dd..4b0e705 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -669,12 +669,12 @@
                 :disabled="basicSecOnlyRead"
                 style="margin-right: 20px"
               ></el-switch>
-              <el-input-number
+              <!-- <el-input-number
                 v-show="form.serialDependFlag"
                 v-model="form.serialDependOrder"
                 :readonly="basicSecOnlyRead"
                 controls-position="right"
-              ></el-input-number>
+              ></el-input-number> -->
             </el-form-item>
 
             <el-form-item :label-width="leftFormLabelWidth" label="鏄惁涓虹┖:">
@@ -887,13 +887,9 @@
                         :display="true"
                         :value="form.customCodeSerialClass"
                         :text="form.customCodeSerialClassText"
+                        :serialType="form.serialType"
                         @setReferValue="setReferValue"
                       ></vciWebRefer>
-<!--                                    <el-input-->
-<!--                                      v-model="form.customCodeSerialClass"-->
-<!--                                      :readonly="basicSecOnlyRead"-->
-<!--                                      @focus="streamFocusHandler"-->
-<!--                                    ></el-input>-->
                   </template>
 
 
@@ -1369,13 +1365,15 @@
         title: '鑷畾涔夋祦姘村弬鐓�',
         showField: 'customCodeSerialClassText',
         field: 'customCodeSerialClass',
-        fieldMap:  {},
+        fieldMap:  {
+          serialType:"serialType"
+        },
         placeholder:'璇烽�夋嫨鑷畾涔夋祦姘�',
         options:   {
           // 璁剧疆榛樿鐨勫睘鎬�
           url: 'api/ubcs-code/codeSerialAlgorithmController/gridCodeSerialAlgorithm',
+          textField:'name',
           valueField:'classFullName',
-          textField:'classFullName',
           isMuti: false,
           type: "grid",
           method: 'get',
@@ -1388,6 +1386,7 @@
               {title: '绠楁硶缂栧彿', field: 'id', width: 200},
               {title: '绠楁硶鍚嶇О', field: 'name', width: 150},
               {title: '绫诲叏璺緞', field: 'classFullName', width: 300},
+              {title: '绫诲瀷', field: 'serialType', width: 300},
               {title: '鎻忚堪', field: 'description'}
             ],
             queryColumns: [
@@ -1620,7 +1619,7 @@
         secType: "codefixedsec", //鐮佹绫诲瀷
         description: "", //鎻忚堪
         serialDependFlag: false, //鏄惁娴佹按渚濊禆
-        serialDependOrder: "", //娴佹按渚濊禆椤哄簭
+        //serialDependOrder: "", //娴佹按渚濊禆椤哄簭
         nullableFlag: false, //鏄惁涓虹┖
         prefixCode: "", //鍓嶇紑
         suffixCode: "", //鍚庣紑
@@ -1717,7 +1716,12 @@
   methods: {
     //鑷畾涔夋祦姘村け鐒�
     setReferValue(data){
-      console.log(data)
+      if(data.field){
+        this.form[data.field] = data.value || "";
+        this.form[data.showField] = data.text || "";
+        this.form.serialType = data.rawData[0].serialType || "";
+
+      }
     },
     /** 杞Щ瑙勫垯鎵�鏈夎�呭璇濇 */
     escapeOwner() {
@@ -1777,7 +1781,7 @@
       //杞崲鎴怞SON瀛楃涓茶繘琛岀埗缁勪欢鍥炴樉
       let submitFormJson = JSON.stringify(content);
       this.form.referConfig = submitFormJson || "";
-      debugger;
+      // debugger;
     },
     /** 寮曠敤鐮佹涓恒�愬弬鐓у紩鐢ㄧ殑涓氬姟绫诲瀷銆戦�夊彇鍊间箣鍚庣殑鍐呭鍥炴樉鏃惰皟鐢� */
     echoReferBtmType(content) {
@@ -2522,8 +2526,7 @@
                 this.releadDisabled = false;
               });
             }
-          })
-          .catch((error) => {
+          }).catch((error) => {
             this.releadDisabled = false;
           });
         this.releadDisabled = false;
@@ -2798,6 +2801,7 @@
                 type: "success",
                 message: "鎿嶄綔鎴愬姛!",
               });
+              console.log(this.form)
               // 鍏抽棴瀵硅瘽妗�
               this.addBasicCodeSettingBox = false;
               // 鐐瑰嚮鏂板鍩虹鐮佹,鍏抽棴绐楀彛涔嬪悗瑙﹀彂閲嶆柊鍔犺浇
@@ -3284,6 +3288,7 @@
     },
     /** 鐮佹绫诲瀷鏀瑰彉鏃讹紝澧炲姞瀵瑰簲鐨刦orm琛ㄥ崟涓殑灞炴��*/
     changeSectypeFormItems(row) {
+      console.log(row)
       if (
         func.isEmpty(this.enumParam.secTypeList) ||
         this.enumParam.secTypeList.length == 0
@@ -3297,13 +3302,14 @@
         secType: row != null ? row.secType : this.form.secType, //鐮佹绫诲瀷
         description: row != null ? row.description : this.form.description, //鎻忚堪
         serialDependFlag: this.isNullJsonBoolean(row, this.form, 'serialDependFlag'), //鏄惁娴佹按渚濊禆
-        serialDependOrder: row != null ? row.serialDependOrder : this.form.serialDependOrder, //娴佹按渚濊禆椤哄簭
+        //serialDependOrder: row != null ? row.serialDependOrder : this.form.serialDependOrder, //娴佹按渚濊禆椤哄簭
         nullableFlag: this.isNullJsonBoolean(row, this.form, 'nullableFlag'), //鏄惁涓虹┖
         displayFlag: this.isNullJsonBoolean(row, this.form, 'displayFlag'),
         componentCodeFlag: this.isNullJsonBoolean(row, this.form, 'componentCodeFlag'), //鏄惁鍙備笌缂栫爜
         pkCodeRule: row != null ? row.pkCodeRule : this.form.pkCodeRule, //鎵�灞炵紪鐮佽鍒�
         prefixCode: row != null ? row.prefixCode : this.form.prefixCode, //鍓嶇紑
         suffixCode: row != null ? row.suffixCode : this.form.suffixCode, //鍚庣紑
+        // customCodeSerialClass: row != null ? row.customCodeSerialClass : this.form.customCodeSerialClass
       };
       if (this.form.secType === "codefixedsec") {
         //鍥哄畾鐮佹
@@ -3664,7 +3670,7 @@
 
 .right {
   /* float: right; */
-  margin-right: 2vw;
+  /* margin-right: 1vw; */
   height: 100%;
   width: auto;
 }

--
Gitblit v1.9.3