From 7242213a5bc6c85686cf434abdd42ae6f61782d4 Mon Sep 17 00:00:00 2001
From: zelian_wu <zelian.wu@xujiesoft.com>
Date: Mon, 29 Apr 2024 15:44:50 +0800
Subject: [PATCH] 2024-04-24

---
 src/views/modules/code/generation.vue     | 45 ++++++++++++++--------
 src/views/modules/code/item.vue           |  6 +--
 src/views/modules/code/item/itemValue.vue | 46 ++++++++++++-----------
 src/views/modules/code/list.vue           | 42 ++++++++++-----------
 4 files changed, 78 insertions(+), 61 deletions(-)

diff --git a/src/views/modules/code/generation.vue b/src/views/modules/code/generation.vue
index 6249302..1cbbee3 100644
--- a/src/views/modules/code/generation.vue
+++ b/src/views/modules/code/generation.vue
@@ -24,8 +24,11 @@ export default {
       saveCodeLoading: false,
     }
   },
-  activated() {
+  created() {
     this.searchCodeItemDefs();
+  },
+  beforeDestroy() {
+
   },
   methods:{
     searchCodeItemDefs(){
@@ -216,23 +219,33 @@ export default {
 
 <template>
 <div>
-  <el-form :model="searchModel" :inline="true" label-position="top">
-    <el-form-item label=" ">
-      <el-button type="primary" :loading="getCodeNoLoading" @click="getCodeNoBtn">获取编码</el-button>
-      <el-button type="primary" :loading="saveCodeLoading" @click="saveDrawing">占有编码</el-button>
-    </el-form-item>
-    <el-form-item label="编码:">
-      <el-input readonly style="width: 200px" v-model="searchModel.drawingNo"></el-input>
-    </el-form-item>
-    <el-form-item label="编码描述:">
-      <el-input readonly style="width: 300px" v-model="searchModel.drawingDesc"></el-input>
-    </el-form-item>
-    <el-form-item label="备注">
-      <el-input readonly style="width: 300px" v-model="searchModel.remark"></el-input>
-    </el-form-item>
+  <el-form :model="searchModel" label-position="top">
+    <el-row :gutter="20">
+      <el-col :span="6">
+        <el-form-item label="编码:">
+          <el-input readonly v-model="searchModel.drawingNo"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="6">
+        <el-form-item label=" ">
+          <el-button type="primary" :loading="getCodeNoLoading" @click="getCodeNoBtn">获取编码</el-button>
+          <el-button type="primary" :loading="saveCodeLoading" @click="saveDrawing">占有编码</el-button>
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
+        <el-form-item label="编码描述:">
+          <el-input readonly v-model="searchModel.drawingDesc"></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
+        <el-form-item label="备注">
+          <el-input readonly v-model="searchModel.remark"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
   </el-form>
 <!--  {{codeItemDefs}}-->
-  <div style="margin-top: 10px;border-top: 1px solid #ccc;padding-top: 10px;height: 780px;overflow-y: auto" :style="{width: `${width}px`}">
+  <div style="margin-top: 10px;border-top: 1px solid #ccc;padding-top: 10px;height: 680px;overflow-y: auto" :style="{width: `${width}px`}">
     <el-form label-position="left" label-width="100px">
       <el-form-item :label="`${item.itemDesc}:`" v-for="(item, index) in codeItemDefs" :key="index" style="margin-bottom: 10px">
         <div v-if="item.itemType.includes('或')" style="width: 240px;display: inline-block">
diff --git a/src/views/modules/code/item.vue b/src/views/modules/code/item.vue
index 7e36597..9533dfd 100644
--- a/src/views/modules/code/item.vue
+++ b/src/views/modules/code/item.vue
@@ -706,7 +706,7 @@ export default {
       <el-button :type="`${currentRow.itemType && currentRow.itemType.includes('选择')?'primary':'info'}`" :disabled="currentRow.itemType && !currentRow.itemType.includes('选择')" @click="defineOptionalValues" plain>定义可选值</el-button>
     </el-form-item>
     <el-form-item label=" ">
-      <el-button type="primary" :type="`${currentRow.itemType && currentRow.itemType.includes('流水号') && currentRow.seqNoType === '指定元素'?'primary':'info'}`" :disabled="currentRow.itemType && !currentRow.itemType.includes('流水号') && currentRow.seqNoType === '指定元素'" @click="clickSeqNoGenerateBtn" plain>流水号产生规则</el-button>
+      <el-button type="primary" :type="`${currentRow.itemType && currentRow.itemType.includes('流水号') && currentRow.seqNoType === '指定元素'?'primary':'info'}`" :disabled="!currentRow.itemType || !currentRow.itemType.includes('流水号') || currentRow.seqNoType !== '指定元素'" @click="clickSeqNoGenerateBtn" plain>流水号产生规则</el-button>
     </el-form-item>
     <el-form-item label=" ">
       <el-button type="primary" @click="clickSettingDesc" plain>设置描述/备注产生规则</el-button>
@@ -798,9 +798,9 @@ export default {
           <el-form-item label="流水号参数规则" prop="seqNoType" :show-message="false">
             <el-select v-model="saveCodeItemDef.seqNoType" :disabled="!saveCodeItemDef.itemType || !saveCodeItemDef.itemType.includes('流水号')" style="width: 100%;" placeholder="请选择">
               <el-option label="*" value="*"></el-option>
-              <el-option label="指定元素" value="指定元素"></el-option>
               <el-option label="所有元素" value="所有元素"></el-option>
-              <el-option label="全部元素" value="全部元素"></el-option>
+              <el-option label="指定元素" value="指定元素"></el-option>
+              <el-option label="全局" value="全局"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
diff --git a/src/views/modules/code/item/itemValue.vue b/src/views/modules/code/item/itemValue.vue
index 9637ac9..567e56c 100644
--- a/src/views/modules/code/item/itemValue.vue
+++ b/src/views/modules/code/item/itemValue.vue
@@ -253,7 +253,7 @@ export default {
             this.$message.error(`该"简码"位数超出了元素设置最大值${this.itemValue.bits}!`);
             return;
           }
-          if (this.itemValueList.some(item=>item.valueNo === this.itemValueModal.valueNo)){
+          if (this.itemValueList.some(item=>item.valueNo === this.itemValueModal.valueNo) && this.saveFlag === "新增"){
             this.$confirm(`该"简码"${this.itemValueModal.valueNo}已存在, 继续保存?`, '提示', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',
@@ -278,8 +278,9 @@ export default {
       if (this.saveFlag === "新增"){
         saveCodeItemValue(this.itemValueModal).then(({data})=>{
           if (data && data.code === 0){
-            this.saveItemValueFlag = false
-            this.$message.success(data.msg)
+            // this.saveItemValueFlag = false
+            this.$message.success(data.msg);
+            this.$refs.saveItemValueForm.resetFields();
             this.searchCodeItemValueListItem()
           }else {
             this.$message.warning(data.msg)
@@ -517,39 +518,42 @@ export default {
     <div>
       <div>可选值列举的条件:</div>
       <div style="border: 1px solid #ebeef5;padding: 5px 10px;box-shadow: 0 2px 12px 0 rgba(0,0,0,0.1)">
-        <span style="border-right: 1px solid #acacac;padding-right: 10px;">
           <el-button type="primary" icon="el-icon-plus" @click="clickSaveConditionHeaderBtn" :disabled="itemValue.itemByCondition === 'N'">新增</el-button>
           <el-button type="primary" icon="el-icon-edit" @click="editConditionHeaderBtn" :disabled="itemValue.itemByCondition === 'N'">编辑</el-button>
           <el-button type="primary" icon="el-icon-delete" @click="removeConditionHeaderBtn" :disabled="itemValue.itemByCondition === 'N'">删除</el-button>
-        </span>
-        <span style="border-right: 1px solid #acacac;padding-right: 10px;">
           <el-button type="primary" icon="el-icon-d-arrow-left" :disabled="itemValue.itemByCondition === 'N'" @click="conditionHeaderIndex = 0">首条</el-button>
           <el-button type="primary" icon="el-icon-arrow-left" :disabled="itemValue.itemByCondition === 'N' || conditionHeaderIndex === 0" @click="conditionHeaderIndex--">前条</el-button>
           <el-button type="primary" :disabled="itemValue.itemByCondition === 'N' || conditionHeaderIndex === conditionHeaders.length - 1" @click="conditionHeaderIndex++">后条<i class="el-icon-arrow-right el-icon--right"></i></el-button>
           <el-button type="primary" :disabled="itemValue.itemByCondition === 'N'" @click="conditionHeaderIndex = conditionHeaders.length - 1">末条<i class="el-icon-d-arrow-right el-icon--right"></i></el-button>
-        </span>
-        <span>
           <el-button type="primary" icon="el-icon-close" plain @click="$emit('close')">关闭</el-button>
           <el-button type="primary" icon="el-icon-refresh" plain @click="searchConditionHeader">刷新</el-button>
-        </span>
       </div>
       <div style="display: flex;margin-top: 2px;gap: 2px">
-        <el-card class="box-card" style="width: 80%;">
+        <el-card class="box-card" style="width: 84%;">
           <div slot="header" class="clearfix" style="padding: 10px 0">
             <el-form v-if="conditionHeaders.length > 0" :inline="true"  label-position="left" :model="conditionHeaders[conditionHeaderIndex]">
-              <el-form-item label="序号:">
-                <el-input-number disabled v-model="conditionHeaders[conditionHeaderIndex].conditionId" style="width: 100%" :min="1" :controls="false"></el-input-number>
-              </el-form-item>
-              <el-form-item label="条件描述:" label-width="70px">
-                <el-input readonly v-model="conditionHeaders[conditionHeaderIndex].conditionDesc" style="width: 100%"></el-input>
-              </el-form-item>
-              <el-form-item label="有效:">
-                <el-checkbox disabled v-model="conditionHeaders[conditionHeaderIndex].active" true-label="Y" false-label="N"></el-checkbox>
-              </el-form-item>
+              <el-row :gutter="10">
+                <el-col :span="6">
+                  <el-form-item label="序号:">
+                    <el-input-number disabled v-model="conditionHeaders[conditionHeaderIndex].conditionId" style="width: 100%;min-width: 60px;max-width: 80px" :min="1" :controls="false"></el-input-number>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="14">
+                  <el-form-item label="条件描述:" label-width="70px">
+                    <el-input readonly v-model="conditionHeaders[conditionHeaderIndex].conditionDesc" style="width: 100%;min-width: 180px;max-width: 200px"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="4">
+                  <el-form-item label="有效:">
+                    <el-checkbox disabled v-model="conditionHeaders[conditionHeaderIndex].active" true-label="Y" false-label="N"></el-checkbox>
+                  </el-form-item>
+                </el-col>
+              </el-row>
             </el-form>
           </div>
           <div style="height: 200px;overflow-y: auto;">
-            <div v-for="(o, index) in conditionDetails" :key="o.seqNo" @click="selectionDetailIndex = index" :style="{backgroundColor: selectionDetailIndex === index? '#E8F7F6' : '#FFF'}" style="padding: 5px 0;cursor:pointer;border-bottom: 1px solid #ebeef5;color: #606266">
+            <div v-for="(o, index) in conditionDetails" :key="o.seqNo" @click="selectionDetailIndex = index" :style="{backgroundColor: selectionDetailIndex === index? '#E8F7F6' : '#FFF'}"
+                 style="padding: 5px 0;cursor:pointer;border-bottom: 1px solid #ebeef5;color: #606266;font-size: 12px;line-height: 14px;">
               {{ `${o.SQLStatementExecuteCalculate === '1' ? '并且' : '或者' }(${o.itemDesc}=${o.itemValue})` }}
             </div>
           </div>
@@ -613,7 +617,7 @@ export default {
         </el-form-item>
       </el-form>
       <el-footer style="height:30px;text-align:center;margin-top: 8px">
-        <el-button type="primary" @click="saveItemValue">保存</el-button>
+        <el-button type="primary" @click="saveItemValue">{{saveFlag==='新增'?'应用':'保存'}}</el-button>
         <el-button type="primary" @click="saveItemValueFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
diff --git a/src/views/modules/code/list.vue b/src/views/modules/code/list.vue
index bf92ac5..e952429 100644
--- a/src/views/modules/code/list.vue
+++ b/src/views/modules/code/list.vue
@@ -121,36 +121,36 @@ export default {
     </el-table-column>
   </el-table>
   <el-dialog title="编辑编码" :visible.sync="saveDialogVisible">
-    <fieldset
-      style="margin-top: 2px;border-color: rgb(255,255,255);">
-      <legend>更改前信息</legend>
+<!--    <fieldset-->
+<!--      style="margin-top: 2px;border-color: rgb(255,255,255);">-->
+<!--      <legend>更改前信息</legend>-->
       <el-form label-position="top" :model="drawing" ref="drawingForm">
         <el-form-item label="编码:">
           <el-input readonly v-model="drawing.drawingNo" style="width: 200px"></el-input>
         </el-form-item>
         <el-form-item label="编码描述:">
-          <el-input readonly v-model="drawing.drawingDesc" ></el-input>
+          <el-input v-model="drawing.drawingDesc" ></el-input>
         </el-form-item>
         <el-form-item label="备注:">
-          <el-input readonly v-model="drawing.remark" ></el-input>
+          <el-input v-model="drawing.remark" ></el-input>
         </el-form-item>
       </el-form>
-    </fieldset>
-    <fieldset
-      style="margin-top: 2px;border-color: rgb(255,255,255);">
-      <legend>更改后信息</legend>
-      <el-form label-position="top" :model="drawing" ref="drawingForm">
-        <el-form-item label="编码:">
-          <el-input v-model="drawing.drawingNo" style="width: 200px"></el-input>
-        </el-form-item>
-        <el-form-item label="编码描述:">
-          <el-input readonly v-model="drawing.drawingDesc"></el-input>
-        </el-form-item>
-        <el-form-item label="备注:">
-          <el-input readonly v-model="drawing.remark"></el-input>
-        </el-form-item>
-      </el-form>
-    </fieldset>
+<!--    </fieldset>-->
+<!--    <fieldset-->
+<!--      style="margin-top: 2px;border-color: rgb(255,255,255);">-->
+<!--      <legend>更改后信息</legend>-->
+<!--      <el-form label-position="top" :model="drawing" ref="drawingForm">-->
+<!--        <el-form-item label="编码:">-->
+<!--          <el-input v-model="drawing.drawingNo" style="width: 200px"></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="编码描述:">-->
+<!--          <el-input readonly v-model="drawing.drawingDesc"></el-input>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="备注:">-->
+<!--          <el-input readonly v-model="drawing.remark"></el-input>-->
+<!--        </el-form-item>-->
+<!--      </el-form>-->
+<!--    </fieldset>-->
     <el-footer style="height:30px;margin-top: 20px;text-align:center">
       <el-button type="primary" @click="editDrawing">保存</el-button>
       <el-button type="primary" @click="saveDialogVisible = false">关闭</el-button>