代码同步 02.19 -3

src/views/basic/businessInfo/index.vue

@@ -28,7 +28,7 @@
           </template>
         </el-table-column>
         <el-table-column label="商户名称" align="center" prop="businessName" />
-        <el-table-column label="商户标识码" align="center" prop="businessId" />
+        <el-table-column label="商户编码" align="center" prop="businessId" />
         <!-- <el-table-column label="子系统" align="center" prop="codeRuleId" /> -->
         <!-- 用户暂无认证状态修改功能 -->
         <!-- <el-table-column label="认证状态" align="center" prop="verifyState" >

src/views/configure/traceTemplate/index.vue

@@ -179,11 +179,11 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        templateName: [{ required: true, message: "模板名称不能为空", trigger: "change" }],
+        templateName: [{ required: true, message: "请填写模板名称", trigger: "change" }],
-        belongBusinessId: [{ required: true, message: "所属商户id不能为空", trigger: "change" }],
+        belongBusinessId: [{ required: true, message: "请选择所属商户", trigger: "change" }],
-        belongBusinessName: [{ required: true, message: "所属商户名称不能为空", trigger: "change" }],
+        belongBusinessName: [{ required: true, message: "请选择所属商户", trigger: "change" }],
-        goodsId: [{ required: true, message: "商品id不能为空", trigger: "change" }],
+        goodsId: [{ required: true, message: "请选择商品", trigger: "change" }],
-        goodsName: [{ required: true, message: "商品名称不能为空", trigger: "change" }],
+        goodsName: [{ required: true, message: "请选择商品", trigger: "change" }],
       },
       // 所属商户列表
       businessNameList: [],

src/views/identity/businessRule/index.vue

@@ -34,16 +34,6 @@
           </el-tooltip>
         </template>
       </el-table-column>
-      <el-table-column label="码规则" align="center" prop="codeRuleFormat" >
-        <template slot-scope="{ row }">
-          <el-tooltip class="item" effect="dark" :content="row.codeRuleFormat" placement="top">
-            <div class="flex-allcenter">
-              <span class="more-width-20">{{row.codeRuleFormat}}</span>
-              <el-button type="text" icon="el-icon-copy-document" @click.stop="copyContent(row.codeRuleFormat)"></el-button>
-            </div>
-          </el-tooltip>
-        </template>
-      </el-table-column>
       <el-table-column label="所属商户" align="center" prop="belongBusinessName" />
       <el-table-column label="生成时间" align="center" prop="createTime" >
         <template v-slot="{ row }">
@@ -113,8 +103,8 @@
 <script>
 import Bound from '@/components/Customer/SearchForm'
 import EmptyBound from '@/components/EmptyTable'
-import { createBusinessRule, updateBusinessRule, deleteBusinessRule, getBusinessRule, getBusinessRulePage, exportBusinessRuleExcel } from "@/api/identity/businessRule";
+import { createBusinessRule, updateBusinessRule, deleteBusinessRule } from "@/api/identity/businessRule";
-import { getCodeList , getCodesByBelongBusinessId , getCodesByIdentityCode , getCodePage , getCodesByGenerateRecordId } from '@/api/identity/code';
+import { getCodesByIdentityCode, getCodesByGenerateRecordId } from '@/api/identity/code';
 import { getGenerateRecordPage } from "@/api/identity/generateRecord";
 
 export default {
@@ -162,13 +152,6 @@ export default {
           placeholder: '请输入',
           onEnterKeyUp: this.handleQuery,
         },
-        {
-          key: 'codeRuleFormat', //码规则
-          itemType: 'input',
-          label: '码规则',
-          placeholder: '请输入',
-          onEnterKeyUp: this.handleQuery,
-        },
         {
           key: 'belongBusinessName', //所属商户
           itemType: 'input',
@@ -284,24 +267,11 @@ export default {
           this.$modal.msgSuccess("删除成功");
         }).catch(() => {});
     },
-    /** 导出按钮操作 */
-    handleExport() {
-      // 处理查询参数
-      let params = {...this.queryParams};
-      params.pageNo = undefined;
-      params.pageSize = undefined;
-      this.$modal.confirm('是否确认导出所有码规则数据项?').then(() => {
-          this.exportLoading = true;
-          return exportBusinessRuleExcel(params);
-        }).then(response => {
-          this.$download.excel(response, '码规则.xls');
-          this.exportLoading = false;
-        }).catch(() => {});
-    },
     resetFormDialog(){
       this.formDialog = {
         identityCode: undefined,
       };
+      this.searchFormDialog();
     },
     async searchFormDialog(){
       let form = {

src/views/identity/identityCode/index.vue

@@ -31,7 +31,7 @@
         </el-table-column>
         <el-table-column label="商品名称" align="center" prop="goodsName" />
         <!-- 码值 目前默认编码 -->
-        <el-table-column label="码值" align="center" prop="identityCode" >
+        <el-table-column label="完整码值" align="center" prop="identityCode" >
           <template slot-scope="{ row }">
             <el-tooltip class="item" effect="dark" :content="row.identityCode" placement="top">
               <div class="table-column">