From a742877cef30e16c5a96c7d7906e6e509364bcb0 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 30 八月 2023 11:33:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/docking/infoForm.vue |   26 ++++++++++++++++++++++----
 1 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/docking/infoForm.vue b/Source/UBCS-WEB/src/views/docking/infoForm.vue
index a40ebb4..cb35816 100644
--- a/Source/UBCS-WEB/src/views/docking/infoForm.vue
+++ b/Source/UBCS-WEB/src/views/docking/infoForm.vue
@@ -10,7 +10,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="formData.dataFlowType=='push'?'鎺ㄩ�佺被鍨�':'鎺ュ彈绫诲瀷'" prop="pushType">
+        <el-form-item :label="formData.dataFlowType=='push'?'鎺ㄩ�佺被鍨�':'鎺ユ敹绫诲瀷'" prop="pushType">
           <el-select v-model="formData.pushType" placeholder="璇烽�夋嫨" @change="pushTypeChange">
             <el-option v-for="item in pushTypeList" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
@@ -28,7 +28,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <div v-if="formData.pushType !='5' && formData.pushType !='6'">
+        <div v-if="formData.dataFlowType=='push'">
           <el-form-item  label="鍒嗙被閫夋嫨" prop="classifyName">
             <vciWebRefer
               :referConfig="{
@@ -65,7 +65,24 @@
           </el-form-item>
         </div>
         <div v-else>
-          <el-form-item  label="鍒嗙被閫夋嫨" prop="classifyName" style="display: none">
+<!--          <el-form-item  label="鍒嗙被閫夋嫨" prop="classifyName" style="display: none">-->
+<!--          </el-form-item>-->
+          <el-form-item  label="鍒嗙被閫夋嫨" prop="classifyName" v-if="formData.pushType !='5' && formData.pushType !='6'">
+            <vciWebRefer
+              :referConfig="{
+                  title: '鍒嗙被閫夋嫨',
+                  showField: 'classifyName',
+                  field: 'classifyOid',
+                  fieldMap:{'classifyId':'id'},
+                  placeholder: '璇烽�夋嫨鍒嗙被閫夋嫨',
+                  options: {isMuti: false, type: 'tree', url: 'api/ubcs-code/codeClassify/treeCodeClassify'},
+                }"
+              :value="formData.classifyOid"
+              :text="formData.classifyName"
+              :disabled="false"
+              :display="true"
+              @setReferValue="setReferValue"
+            ></vciWebRefer>
           </el-form-item>
           <el-form-item label="闆嗘垚绯荤粺" prop="sourceSystemName">
             <vciWebRefer
@@ -237,7 +254,7 @@
       dataFlowTypeList: [{
         label: '鎺ㄩ��', value: 'push'
       }, {
-        label: '鎺ュ彈', value: 'accept'
+        label: '鎺ユ敹', value: 'accept'
       }],
       //鎺ㄩ�佺被鍨�
       pushTypeList: [{value: '1', label: '鏁版嵁鎺ㄩ��'},
@@ -508,6 +525,7 @@
           add(that.formData).then(res => {
             that.$message.success("淇濆瓨鎴愬姛");
             that.showSubmitDialog = false;
+            this.$refs.form.resetFields();
             this.formData = {
               sysIntParamVOs: [],
               sysIntHeaderVOs: []

--
Gitblit v1.9.3