Browse Source

bug修复

iZaiZaiA 2 years ago
parent
commit
39daae8ea0

+ 1 - 1
src/config/index.js

@@ -17,7 +17,7 @@ export default {
     statusWhiteList: [],    //http的status默认放行列表
     ossUrl: 'https://bladex-test-info.oss-cn-chengdu.aliyuncs.com', //oss地址
     smsPhone: '',  //测试接受短信验证码的手机号
-    dev_version: '202209281045',    //开发版本号
+    dev_version: '202209281118',    //开发版本号
     prod_host: 'http://47.110.251.215:8090',  //线上
     dev_host: 'http://192.168.4.6', //黄键楠
     //dev_host: 'http://192.168.3.13', //祝炜

+ 6 - 1
src/global/components/hc-dialog/index.vue

@@ -1,5 +1,6 @@
 <template>
-    <el-dialog v-model="isShow" :title="title" :width="isWidth" class="hc-modal-border" :class="ui" :style="isBgColor?'--el-dialog-bg-color:' + isBgColor:''" draggable destroy-on-close @closed="dialogClosed">
+    <el-dialog v-model="isShow" class="hc-modal-border" :class="[isTable?'hc-modal-table':'',ui]" :style="isBgColor?'--el-dialog-bg-color:' + isBgColor:''"
+               :title="title" :width="isWidth" draggable destroy-on-close @closed="dialogClosed">
         <template #header v-if="isSlotHeader">
             <slot name='header'/>
         </template>
@@ -55,6 +56,10 @@ const props = defineProps({
         type: [String,Number],
         default: ''
     },
+    isTable: {
+        type: Boolean,
+        default: false
+    },
 })
 
 //变量

+ 2 - 2
src/views/data-fill/components/ListItem.vue

@@ -272,13 +272,13 @@ const setTableFormBlurReg = (pkeyId, event, key, reg, val, msg, item, index) =>
         let regx = new RegExp(reg);
         let state = regx.test(val);
         if (state) {
+            delete formRegExpJson.value[pkeyId]
             dom.style = ''
         } else {
+            formRegExpJson.value[pkeyId] = {key, reg, val, msg, state, nodeName: item.nodeName, itemId: `item-${index}-${item?.pkeyId}`}
             dom.style = '--el-input-border-color: #fe0000'
             window?.$message?.warning(msg)
         }
-        //暂存
-        formRegExpJson.value[pkeyId] = {key, reg, val, msg, state, nodeName: item.nodeName, itemId: `item-${index}-${item?.pkeyId}`}
     } else {
         delete formRegExpJson.value[pkeyId]
         dom.style = ''

+ 22 - 1
src/views/tentative/material/approach.vue

@@ -15,7 +15,7 @@
                     </el-button>
                 </HcTooltip>
                 <HcTooltip keys="tentative_material_approach_copy">
-                    <el-button hc-btn>
+                    <el-button hc-btn @click="copyTableModalClick">
                         <HcIcon name="file-copy-2"/>
                         <span>复制</span>
                     </el-button>
@@ -138,6 +138,11 @@
             </el-form>
         </HcDialog>
 
+        <!--复制材料登记信息-->
+        <HcDialog :show="copyTableModal" title="复制材料登记信息" widths="60rem" isTable :loading="copyTableLoading" @close="copyTableModalClose" @save="copyTableClick">
+            123456
+        </HcDialog>
+
     </div>
 </template>
 
@@ -256,6 +261,22 @@ const addEditFormClick = () => {
 
 }
 
+//复制
+const copyTableModal = ref(false)
+
+const copyTableModalClick = () => {
+    copyTableModal.value = true
+}
+const copyTableModalClose = () => {
+    copyTableModal.value = false
+}
+
+//复制 保存
+const copyTableLoading = ref(false)
+const copyTableClick = () => {
+
+}
+
 </script>
 
 <style lang="scss" scoped>