修复关联销售合同

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractLEntity.java

@@ -48,7 +48,7 @@ public class ContractLEntity  {
     @TableField(value = "BUSINESS_ID" , updateStrategy = FieldStrategy.IGNORED)
     private String businessId;
     @TableField(value = "RELATED_CONTRACT_ID" , updateStrategy = FieldStrategy.IGNORED)
-    private Long relatedContractId;
+    private String relatedContractId;
     @TableField("BUSINESS_TYPE")
     private String businessType;
     @TableField("DECLARATION_TIME")

jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/entity/ContractsEntity.java

@@ -46,7 +46,7 @@ public class ContractsEntity  {
     @TableField("BUSINESS_ID")
     private String businessId;
     @TableField("RELATED_CONTRACT_ID")
-    private Long relatedContractId;
+    private String relatedContractId;
     @TableField("BUSINESS_TYPE")
     private String businessType;
     @TableField("DECLARATION_TIME")

jnpf-java-boot/jnpf-web/src/components/Jnpf/PopupSelect/index.vue

@@ -1,114 +1,220 @@
 <template>
   <div class="popupSelect-container">
     <div class="el-select" @click="openDialog">
-      <el-input :placeholder="placeholder" v-model="innerValue" readonly :validate-event="false"
+      <el-input
-        @mouseenter.native="inputHovering = true" @mouseleave.native="inputHovering = false"
+        :placeholder="placeholder"
-        :disabled="disabled">
+        v-model="innerValue"
+        readonly
+        :validate-event="false"
+        @mouseenter.native="inputHovering = true"
+        @mouseleave.native="inputHovering = false"
+        :disabled="disabled"
+      >
         <template slot="suffix">
-          <i v-show="!showClose"
+          <i
-            :class="['el-select__caret', 'el-input__icon', 'el-icon-arrow-up']"></i>
+            v-show="!showClose"
-          <i v-if="showClose" class="el-select__caret el-input__icon el-icon-circle-close"
+            :class="['el-select__caret', 'el-input__icon', 'el-icon-arrow-up']"
-            @click="clear"></i>
+          ></i>
+          <i
+            v-if="showClose"
+            class="el-select__caret el-input__icon el-icon-circle-close"
+            @click="clear"
+          ></i>
         </template>
       </el-input>
     </div>
     <template v-if="popupType === 'dialog'">
-      <el-dialog :title="popupTitle" :close-on-click-modal="false" :visible.sync="visible"
+      <el-dialog
-        v-if="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll append-to-body
+        :title="popupTitle"
-        :width='popupWidth'>
+        :close-on-click-modal="false"
+        :visible.sync="visible"
+        v-if="visible"
+        class="JNPF-dialog JNPF-dialog_center"
+        lock-scroll
+        append-to-body
+        :width="popupWidth"
+      >
         <el-row class="JNPF-common-search-box" :gutter="16">
           <el-form @submit.native.prevent>
             <el-col :span="10">
               <el-form-item label="关键词">
-                <el-input v-model="listQuery.keyword" placeholder="请输入关键词查询" clearable
+                <el-input
-                  @keyup.enter.native="search()" class="search-input" />
+                  v-model="listQuery.keyword"
+                  placeholder="请输入关键词查询"
+                  clearable
+                  @keyup.enter.native="search()"
+                  class="search-input"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item>
-                <el-button type="primary" icon="el-icon-search" @click="search()">
+                <el-button
-                  {{ $t('common.search') }}
+                  type="primary"
+                  icon="el-icon-search"
+                  @click="search()"
+                >
+                  {{ $t("common.search") }}
                 </el-button>
-                <el-button icon="el-icon-refresh-right" @click="reset()">{{ $t('common.reset') }}
+                <el-button icon="el-icon-refresh-right" @click="reset()"
+                  >{{ $t("common.reset") }}
                 </el-button>
               </el-form-item>
             </el-col>
           </el-form>
           <div class="JNPF-common-search-box-right">
-            <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
+            <el-tooltip
-              <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+              effect="dark"
-                @click="initData()" />
+              :content="$t('common.refresh')"
+              placement="top"
+            >
+              <el-link
+                icon="icon-ym icon-ym-Refresh JNPF-common-head-icon"
+                :underline="false"
+                @click="initData()"
+              />
             </el-tooltip>
           </div>
         </el-row>
-        <JNPF-table v-loading="listLoading" :data="list" :border="false" highlight-current-row
+        <JNPF-table
-          @row-click="rowClick" :hasNO="false">
+          v-loading="listLoading"
+          :data="list"
+          :border="false"
+          highlight-current-row
+          @row-click="rowClick"
+          :hasNO="false"
+        >
           <el-table-column width="35">
             <template slot-scope="scope">
-              <el-radio :label="scope.row[propsValue]" v-model="checked">&nbsp;</el-radio>
+              <el-radio :label="scope.row[propsValue]" v-model="checked"
+                >&nbsp;</el-radio
+              >
             </template>
           </el-table-column>
-          <el-table-column type="index" width="50" label="序号" align="center" />
+          <el-table-column
-          <el-table-column :prop="item.value" :label="item.label" v-for="(item, i) in columnOptions"
+            type="index"
-            :key="i" />
+            width="50"
+            label="序号"
+            align="center"
+          />
+          <el-table-column
+            :prop="item.value"
+            :label="item.label"
+            v-for="(item, i) in columnOptions"
+            :key="i"
+          />
         </JNPF-table>
-        <pagination :total="total" :page.sync="listQuery.currentPage"
+        <pagination
-          :limit.sync="listQuery.pageSize" @pagination="initData" v-if="hasPage" />
+          :total="total"
+          :page.sync="listQuery.currentPage"
+          :limit.sync="listQuery.pageSize"
+          @pagination="initData"
+          v-if="hasPage"
+        />
         <span slot="footer" class="dialog-footer">
-          <el-button @click="visible = false"
+          <el-button @click="visible = false" size="small">{{
-            size="small">{{ $t('common.cancelButton') }}</el-button>
+            $t("common.cancelButton")
-          <el-button type="primary" @click="select()" size="small">{{ $t('common.confirmButton') }}
+          }}</el-button>
+          <el-button type="primary" @click="select()" size="small"
+            >{{ $t("common.confirmButton") }}
           </el-button>
         </span>
       </el-dialog>
     </template>
     <template v-if="popupType === 'drawer'">
-      <el-drawer :title="popupTitle" :visible.sync="visible" :wrapperClosable="false" ref="drawer"
+      <el-drawer
-        :size='popupWidth' append-to-body class="JNPF-common-drawer">
+        :title="popupTitle"
+        :visible.sync="visible"
+        :wrapperClosable="false"
+        ref="drawer"
+        :size="popupWidth"
+        append-to-body
+        class="JNPF-common-drawer"
+      >
         <div class="JNPF-flex-main">
           <el-row class="JNPF-common-search-box" :gutter="16">
             <el-form @submit.native.prevent>
               <el-col :span="10">
                 <el-form-item label="关键词">
-                  <el-input v-model="listQuery.keyword" placeholder="请输入关键词查询" clearable
+                  <el-input
-                    @keyup.enter.native="search()" class="search-input" />
+                    v-model="listQuery.keyword"
+                    placeholder="请输入关键词查询"
+                    clearable
+                    @keyup.enter.native="search()"
+                    class="search-input"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
                 <el-form-item>
-                  <el-button type="primary" icon="el-icon-search" @click="search()">
+                  <el-button
-                    {{ $t('common.search') }}
+                    type="primary"
+                    icon="el-icon-search"
+                    @click="search()"
+                  >
+                    {{ $t("common.search") }}
                   </el-button>
-                  <el-button icon="el-icon-refresh-right" @click="reset()">{{ $t('common.reset') }}
+                  <el-button icon="el-icon-refresh-right" @click="reset()"
+                    >{{ $t("common.reset") }}
                   </el-button>
                 </el-form-item>
               </el-col>
             </el-form>
             <div class="JNPF-common-search-box-right">
-              <el-tooltip effect="dark" :content="$t('common.refresh')" placement="top">
+              <el-tooltip
-                <el-link icon="icon-ym icon-ym-Refresh JNPF-common-head-icon" :underline="false"
+                effect="dark"
-                  @click="initData()" />
+                :content="$t('common.refresh')"
+                placement="top"
+              >
+                <el-link
+                  icon="icon-ym icon-ym-Refresh JNPF-common-head-icon"
+                  :underline="false"
+                  @click="initData()"
+                />
               </el-tooltip>
             </div>
           </el-row>
-          <JNPF-table v-loading="listLoading" :data="list" :border="false" highlight-current-row
+          <JNPF-table
-            @row-click="rowClick" :hasNO="false">
+            v-loading="listLoading"
+            :data="list"
+            :border="false"
+            highlight-current-row
+            @row-click="rowClick"
+            :hasNO="false"
+          >
             <el-table-column width="35">
               <template slot-scope="scope">
-                <el-radio :label="scope.row[propsValue]" v-model="checked">&nbsp;</el-radio>
+                <el-radio :label="scope.row[propsValue]" v-model="checked"
+                  >&nbsp;</el-radio
+                >
               </template>
             </el-table-column>
-            <el-table-column type="index" width="50" label="序号" align="center" />
+            <el-table-column
-            <el-table-column :prop="item.value" :label="item.label"
+              type="index"
-              v-for="(item, i) in columnOptions" :key="i" />
+              width="50"
+              label="序号"
+              align="center"
+            />
+            <el-table-column
+              :prop="item.value"
+              :label="item.label"
+              v-for="(item, i) in columnOptions"
+              :key="i"
+            />
           </JNPF-table>
-          <pagination :total="total" :page.sync="listQuery.currentPage"
+          <pagination
-            :limit.sync="listQuery.pageSize" @pagination="initData" v-if="hasPage" />
+            :total="total"
+            :page.sync="listQuery.currentPage"
+            :limit.sync="listQuery.pageSize"
+            @pagination="initData"
+            v-if="hasPage"
+          />
           <div class="drawer-footer">
-            <el-button @click="visible = false" size="small">{{ $t('common.cancelButton') }}
+            <el-button @click="visible = false" size="small"
+              >{{ $t("common.cancelButton") }}
             </el-button>
-            <el-button type="primary" @click="select()"
+            <el-button type="primary" @click="select()" size="small"
-              size="small">{{ $t('common.confirmButton') }}
+              >{{ $t("common.confirmButton") }}
             </el-button>
           </div>
         </div>
@@ -118,14 +224,19 @@
 </template>
 
 <script>
-import { getDataInterfaceDataSelect, getDataInterfaceDataInfoByIds } from '@/api/systemData/dataInterface'
+import {
-import emitter from 'element-ui/src/mixins/emitter'
+  getDataInterfaceDataSelect,
-let { methods: { dispatch } } = emitter
+  getDataInterfaceDataInfoByIds
+} from "@/api/systemData/dataInterface";
+import emitter from "element-ui/src/mixins/emitter";
+let {
+  methods: { dispatch }
+} = emitter;
 export default {
-  name: 'JnpfPopupSelect',
+  name: "JnpfPopupSelect",
   props: {
     value: {
-      default: ''
+      default: ""
     },
     rowIndex: {
       default: null
@@ -139,39 +250,39 @@ export default {
     },
     interfaceId: {
       type: String,
-      default: ''
+      default: ""
     },
     innerName: {
       type: String,
-      default: ''
+      default: ""
     },
     placeholder: {
       type: String,
-      default: '请选择'
+      default: "请选择"
     },
     propsValue: {
       type: String,
-      default: 'id'
+      default: "id"
     },
     relationField: {
       type: String,
-      default: 'fullName'
+      default: "fullName"
     },
     popupType: {
       type: String,
-      default: 'dialog'
+      default: "dialog"
     },
     popupTitle: {
       type: String,
-      default: '选择数据'
+      default: "选择数据"
     },
     popupWidth: {
       type: String,
-      default: '800px'
+      default: "800px"
     },
     field: {
       type: String,
-      default: ''
+      default: ""
     },
     columnOptions: {
       type: Array,
@@ -199,168 +310,177 @@ export default {
     }
   },
   model: {
-    prop: 'value',
+    prop: "value",
-    event: 'input'
+    event: "input"
   },
   data() {
     return {
       list: [],
-      innerValue: '',
+      innerValue: "",
       listQuery: {
-        keyword: '',
+        keyword: "",
         currentPage: 1,
         pageSize: 20
       },
       total: 0,
-      checked: '',
+      checked: "",
-      checkedTxt: '',
+      checkedTxt: "",
       checkedRow: {},
       listLoading: false,
       visible: false,
-      inputHovering: false,
+      inputHovering: false
-    }
+    };
   },
   watch: {
     value(val) {
-      this.setDefault()
+      this.setDefault();
     }
   },
   computed: {
     showClose() {
       let hasValue = this.multiple
         ? Array.isArray(this.value) && this.value.length > 0
-        : this.value !== undefined && this.value !== null && this.value !== '';
+        : this.value !== undefined && this.value !== null && this.value !== "";
-      let criteria = this.clearable &&
+      let criteria =
-        !this.disabled &&
+        this.clearable && !this.disabled && this.inputHovering && hasValue;
-        this.inputHovering &&
-        hasValue;
       return criteria;
     },
     propsLabel() {
-      return this.columnOptions[0].value
+      return this.columnOptions[0].value;
     }
   },
   created() {
-    this.listQuery.pageSize = this.hasPage ? this.pageSize : 100000
+    this.listQuery.pageSize = this.hasPage ? this.pageSize : 100000;
-    this.setDefault()
+    this.setDefault();
   },
   methods: {
     initData() {
-      if (!this.interfaceId) return
+      if (!this.interfaceId) return;
-      this.listLoading = true
+      this.listLoading = true;
-      const paramList = this.getParamList()
+      const paramList = this.getParamList();
-      const columnOptions = this.columnOptions.map(o => o.value)
+      const columnOptions = this.columnOptions.map(o => o.value);
       let query = {
         ...this.listQuery,
         interfaceId: this.interfaceId,
         propsValue: this.propsValue,
         relationField: this.relationField,
-        columnOptions: columnOptions.join(','),
+        columnOptions: columnOptions.join(","),
         paramList
-      }
+      };
-      getDataInterfaceDataSelect(this.interfaceId, query).then(res => {
+      getDataInterfaceDataSelect(this.interfaceId, query)
-        this.list = res.data.list
+        .then(res => {
-        this.total = res.data.pagination.total
+          this.list = res.data.list;
-        this.listLoading = false
+          this.total = res.data.pagination.total;
-      }).catch(() => { this.listLoading = false })
+          this.listLoading = false;
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
     },
     getParamList() {
-      let templateJson = this.templateJson
+      let templateJson = this.templateJson;
-      if (!this.formData) return templateJson
+      if (!this.formData) return templateJson;
       for (let i = 0; i < templateJson.length; i++) {
         if (templateJson[i].relationField) {
-          if (templateJson[i].relationField.includes('-')) {
+          if (templateJson[i].relationField.includes("-")) {
-            let tableVModel = templateJson[i].relationField.split('-')[0]
+            let tableVModel = templateJson[i].relationField.split("-")[0];
-            let childVModel = templateJson[i].relationField.split('-')[1]
+            let childVModel = templateJson[i].relationField.split("-")[1];
-            templateJson[i].defaultValue = this.formData[tableVModel] && this.formData[tableVModel][this.rowIndex] && this.formData[tableVModel][this.rowIndex][childVModel] || ''
+            templateJson[i].defaultValue =
+              (this.formData[tableVModel] &&
+                this.formData[tableVModel][this.rowIndex] &&
+                this.formData[tableVModel][this.rowIndex][childVModel]) ||
+              "";
           } else {
-            templateJson[i].defaultValue = this.formData[templateJson[i].relationField] || ''
+            templateJson[i].defaultValue =
+              this.formData[templateJson[i].relationField] || "";
           }
         }
       }
-      return templateJson
+      return templateJson;
     },
     interfaceDataHandler(data) {
-      if (!data.dataProcessing) return data.list
+      if (!data.dataProcessing) return data.list;
-      const dataHandler = this.jnpf.getScriptFunc.call(this, data.dataProcessing)
+      const dataHandler = this.jnpf.getScriptFunc.call(
-      if (!dataHandler) return data.list
+        this,
-      return dataHandler(data.list)
+        data.dataProcessing
+      );
+      if (!dataHandler) return data.list;
+      return dataHandler(data.list);
     },
     search() {
-      this.initData()
+      this.initData();
-      this.listQuery.currentPage = 1
+      this.listQuery.currentPage = 1;
-      this.listQuery.pageSize = this.hasPage ? this.pageSize : 10000
+      this.listQuery.pageSize = this.hasPage ? this.pageSize : 10000;
     },
     reset() {
-      this.listQuery.keyword = ''
+      this.listQuery.keyword = "";
-      this.listQuery.currentPage = 1
+      this.listQuery.currentPage = 1;
-      this.listQuery.pageSize = this.hasPage ? this.pageSize : 10000
+      this.listQuery.pageSize = this.hasPage ? this.pageSize : 10000;
-      this.initData()
+      this.initData();
     },
     openDialog() {
-      if (this.disabled) return
+      if (this.disabled) return;
-      this.checked = this.value
+      this.checked = this.value;
-      this.visible = true
+      this.visible = true;
-      this.reset()
+      this.reset();
     },
     clear(event) {
-      this.checked = ''
+      this.checked = "";
-      this.innerValue = ''
+      this.innerValue = "";
-      this.checkedRow = {}
+      this.checkedRow = {};
-      this.$emit('input', this.checked)
+      this.$emit("input", this.checked);
-      this.$emit('change', this.checked, this.checkedRow, this.rowIndex)
+      this.$emit("change", this.checked, this.checkedRow, this.rowIndex);
-      dispatch.call(this, 'ElFormItem', 'el.form.change', this.checked)
+      dispatch.call(this, "ElFormItem", "el.form.change", this.checked);
       event.stopPropagation();
     },
     select() {
-      if (!this.checked) return
+      if (!this.checked) return;
-      this.innerValue = this.checkedTxt
+      this.innerValue = this.checkedTxt;
-      this.$emit('input', this.checked)
+      this.$emit("input", this.checked);
-      this.$emit('change', this.checked, this.checkedRow, this.rowIndex)
+      this.$emit("change", this.checked, this.checkedRow, this.rowIndex);
-      dispatch.call(this, 'ElFormItem', 'el.form.change', this.checked)
+      dispatch.call(this, "ElFormItem", "el.form.change", this.checked);
-      this.visible = false
+      this.visible = false;
     },
     rowClick(row) {
-      this.checked = row[this.propsValue]
+      this.checked = row[this.propsValue];
-      this.checkedTxt = row[this.relationField]
+      this.checkedTxt = row[this.relationField];
-      this.checkedRow = row
+      this.checkedRow = row;
     },
     setDefault() {
       if (this.value) {
-        if (!this.interfaceId) return
+        if (!this.interfaceId) return;
-        const paramList = this.getParamList()
+        const paramList = this.getParamList();
         let query = {
           ids: [this.value],
           interfaceId: this.interfaceId,
           propsValue: this.propsValue,
           relationField: this.relationField,
           paramList
-        }
+        };
         let that = this;
         getDataInterfaceDataInfoByIds(this.interfaceId, query).then(res => {
           const data = res.data && res.data.length ? res.data[0] : {};
-          this.innerValue = data[this.relationField]
+          this.innerValue = data[this.relationField];
-          debugger
           if (!this.innerValue) {
             this.innerValue = this.innerName;
           }
-          if (!this.field) return
+          if (!this.field) return;
-          let relationData = this.$store.state.generator.relationData
+          let relationData = this.$store.state.generator.relationData;
-          this.$set(relationData, this.field, data)
+          this.$set(relationData, this.field, data);
-          this.$eventBus.$emit('popupAttrEventBus', relationData, this.field)
+          this.$eventBus.$emit("popupAttrEventBus", relationData, this.field);
-          this.$store.commit('generator/UPDATE_RELATION_DATA', relationData)
+          this.$store.commit("generator/UPDATE_RELATION_DATA", relationData);
-        })
+        });
       } else {
-        this.innerValue = ''
+        this.innerValue = "";
-        if (!this.field) return
+        if (!this.field) return;
-        let relationData = this.$store.state.generator.relationData
+        let relationData = this.$store.state.generator.relationData;
-        this.$set(relationData, this.field, {})
+        this.$set(relationData, this.field, {});
-        this.$eventBus.$emit('popupAttrEventBus', relationData, this.field)
+        this.$eventBus.$emit("popupAttrEventBus", relationData, this.field);
-        this.$store.commit('generator/UPDATE_RELATION_DATA', relationData)
+        this.$store.commit("generator/UPDATE_RELATION_DATA", relationData);
       }
     }
   }
-}
+};
 </script>
 <style lang="scss" scoped>
 >>> .el-dialog__body {