Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/views/docking/info.vue

@@ -251,6 +251,14 @@
      return oids.join(",");
    }
  },
  watch:{
    // editAttribute:{
    //   immediate: true,
    //   handler(newData) {
    //     this.$refs.infoForm.formData  = Object.assign({}, newData);
    //   }
    // }
  },
  methods: {
    //单元格样式
    cellStyle(row,column,rowIndex,columnIndex){
@@ -299,11 +307,11 @@
    addSave() {
      this.$refs.infoForm.showSubmitDialog = true;
      this.$refs.infoForm.formData = {
        dataFlowType: 'push',
        pushType: '1',
        sourceSystemName: '编码系统',
        sourceSystemOid: 'code00000001',
        sourceSystemId: 'CODE',
        dataFlowType: '',
        pushType: '',
        sourceSystemName: '',
        sourceSystemOid: '',
        sourceSystemId: '',
        targetSystemName: '',
        targetSystemOid: '',
        targetSystemId: '',

 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: []