From 8af9599937d281a4dffcc4ac7cda1b81b4b8d6a7 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 04 九月 2023 16:22:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/docking/infoForm.vue |   65 ++++++++++++++++++++++++--------
 1 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/docking/infoForm.vue b/Source/UBCS-WEB/src/views/docking/infoForm.vue
index e5b83fa..10fb23c 100644
--- a/Source/UBCS-WEB/src/views/docking/infoForm.vue
+++ b/Source/UBCS-WEB/src/views/docking/infoForm.vue
@@ -92,7 +92,7 @@
                   field: 'sourceSystemOid',
                   fieldMap:{'sourceSystemId':'id'},
                   placeholder: '璇烽�夋嫨',
-                  options: {isMuti: false, type: 'default', url: 'api/ubcs-code/dockingManagement/gridDockingSystem'},
+                  options: {isMuti: false, type: 'default', url: referUrl},
                 }"
               :value="formData.sourceSystemOid"
               :text="formData.sourceSystemName"
@@ -203,7 +203,6 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitAttribute">纭畾</el-button>
-        <el-button @click="cancelSubmit">鍙栨秷</el-button>
       </div>
     </el-dialog>
 
@@ -386,16 +385,52 @@
           // 閫夊畾琛�
           selectRow: ''
         },
-        dictEnums: []
+        dictEnums: [],
+
       }
     }
   },
   watch:{
-    formData:{
-      handler(newval,oldval){
-        console.log('newval',newval.dataFlowTypeText)
+    formData: {
+      handler(newval, oldval) {
+        // console.log(newval)
+        if (newval && newval.type === 'edit') {
+          if (this.formData.dataFlowType == 'accept') {
+            this.pushTypeList = [
+              { value: '3', label: '缂栫爜鐢宠' },
+              { value: '4', label: '缂栫爜鏇存敼锛堢姸鎬併�佸洖鏀讹級' },
+              { value: '5', label: '鍒嗙被鏌ヨ' },
+              { value: '6', label: '鍚鍒欎俊鎭殑鍒嗙被鏌ヨ' },
+              { value: '7', label: '鏁版嵁鏌ヨ' }
+            ];
+            this.$nextTick(() => {
+              // this.formData.pushType = '';
+              this.formData.targetSystemName = '缂栫爜绯荤粺';
+              this.formData.targetSystemOid = 'code00000001';
+              this.formData.targetSystemId = 'CODE';
+
+              // this.formData.sourceSystemName = '';
+              // this.formData.sourceSystemOid = '';
+              // this.formData.sourceSystemId = '';
+            });
+          } else {
+            this.pushTypeList = [
+              { value: '1', label: '鏁版嵁鎺ㄩ��' },
+              { value: '2', label: '鍒嗙被鎺ㄩ��' }
+            ];
+            this.$nextTick(() => {
+              this.formData.pushType = '1';
+              this.formData.sourceSystemName = '缂栫爜绯荤粺';
+              this.formData.sourceSystemOid = 'code00000001';
+              this.formData.sourceSystemId = 'CODE';
+              // this.formData.targetSystemName = '';
+              // this.formData.targetSystemOid = '';
+              // this.formData.targetSystemId = '';
+            });
+          }
+        }
       }
-    }
+    },
   },
   created() {
     //this.geDictData('interfaceType', this.interfaceTypeList)
@@ -414,7 +449,7 @@
         {value: '5', label: '鍒嗙被鏌ヨ'},
         {value: '6', label: '鍚鍒欎俊鎭殑鍒嗙被鏌ヨ'},
         {value: '7', label: '鏁版嵁鏌ヨ'}]
-      this.formData.pushType=''
+      // this.formData.pushType=''
       this.formData.targetSystemName='缂栫爜绯荤粺';
       this.formData.targetSystemOid='code00000001';
       this.formData.targetSystemId='CODE';
@@ -436,15 +471,14 @@
   },
   methods: {
     closeSubmitDialog() {
-      this.resetForm();
+      // this.resetForm();
       this.showSubmitDialog = false;
     },
     resetForm() {
-      this.formData={}
-      // this.formData = {
-      //   sysIntParamVOs: [],
-      //   sysIntHeaderVOs: []
-      // };
+      this.formData = {
+        sysIntParamVOs: [],
+        sysIntHeaderVOs: []
+      };
       this.$refs.form.resetFields();
     },
     setReferValue(data) {
@@ -490,7 +524,6 @@
       }
     },
     submitAttribute() {
-      console.log()
       const that = this;
       let pass=true
       if(this.formData.dataFlowType=='push' && (validatenull(this.formData.classifyName)||validatenull(this.formData.targetSystemName))){
@@ -525,7 +558,7 @@
           })
           const apiCall = that.formData.type == 'edit' ? edit : add;
           const Message = that.formData.type == 'edit' ? "淇敼鎴愬姛" : "淇濆瓨鎴愬姛";
-          console.log( that.formData)
+          // console.log( that.formData)
           apiCall(that.formData).then(res => {
             that.$message.success(Message);
             that.showSubmitDialog = false;

--
Gitblit v1.9.3