修复bug

src/utils/validate.js

+/*
+ * @Author: luofu
+ * @Date: 2023-06-19 09:08:55
+ * @Descripttion: 
+ */
 /**
  * 邮箱
  * @param {*} s
@@ -32,5 +37,5 @@ export function isURL (s) {
 
 /* 校验社会统一证信号*/
 export function validateCreditCode(s) {
-  return /[0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}/.test(s)
+  return /^[^_IOZSVa-z\W]{2}\d{6}[^_IOZSVa-z\W]{10}$/g.test(s)
 }

src/views/advertisement/adsLlist.vue

@@ -70,10 +70,10 @@
               <a-menu-item>
                 <a @click="handleDetail(record)">详情</a>
               </a-menu-item>
-              <a-menu-item v-if="record.onshelfStatus == 'offShelf'">
+              <a-menu-item v-if="record.onshelfStatus == 'offShelf' && record.status !='expire'">
                 <a @click="handleAShelves(record.id,1)">上架</a>
               </a-menu-item>
-              <a-menu-item v-if="record.onshelfStatus == 'onShelf'">
+              <a-menu-item v-if="record.onshelfStatus == 'onShelf' && record.status !='expire'">
                 <a @click="handleAShelves(record.id,2)">下架</a>
               </a-menu-item>
               <a-menu-item v-if="record.onshelfStatus == 'offShelf'">

src/views/advertisement/modules/PropertyAdvForm.vue

@@ -5,7 +5,7 @@
         <a-row>
           <a-col :span="24">
             <a-form-model-item label="广告名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="advName">
-              <a-input v-model="model.advName" placeholder="请输入广告名称"  ></a-input>
+              <a-input v-model="model.advName" placeholder="请输入广告名称"  maxLength="50"></a-input>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

src/views/cost/CostList.vue

@@ -6,7 +6,7 @@
         <a-row :gutter="24">
           <a-col :md="6" :sm="8">
             <a-form-item label="收费名称">
-              <a-input placeholder="请输入收费名称" v-model="queryParam.chargingName"></a-input>
+              <j-input placeholder="请输入收费名称" v-model="queryParam.chargingName"></j-input>
             </a-form-item>
           </a-col>
 

src/views/system/RoleUserList.vue

@@ -116,7 +116,7 @@
         </div>
         <!-- 操作按钮区域 -->
         <div class="table-operator" :md="24" :sm="24">
-          <a-button @click="handleAdd2" type="primary" icon="plus" style="margin-top: 16px">新增用户</a-button>
+          <!-- <a-button @click="handleAdd2" type="primary" icon="plus" style="margin-top: 16px">新增用户</a-button> -->
           <!--<a-button @click="handleEdit2" type="primary" icon="edit" style="margin-top: 16px">用户编辑</a-button>-->
           <a-button @click="handleAddUserRole" type="primary" icon="plus" style="margin-top: 16px">已有用户</a-button>
 

src/views/system/modules/SelectUserModal.vue

@@ -108,7 +108,7 @@
             title: '部门',
             align: "center",
             width: 150,
-            dataIndex: 'orgCode'
+            dataIndex: 'orgCodeTxt'
           }
         ],
         columns2: [

src/views/system/modules/UserModal.vue

@@ -23,7 +23,7 @@
       <a-form-model ref="form" :model="model" :rules="validatorRules">
 
         <a-form-model-item label="用户账号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="username">
-          <a-input placeholder="请输入用户账号" v-model="model.username" :readOnly="!!model.id"/>
+          <a-input placeholder="请输入用户账号" v-model="model.username" :readOnly="!!model.id" :disabled="disableSubmit"/>
         </a-form-model-item>
 
         <template v-if="!model.id">
@@ -37,7 +37,7 @@
         </template>
 
         <a-form-model-item label="用户姓名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="realname">
-          <a-input placeholder="请输入用户姓名" v-model="model.realname" />
+          <a-input placeholder="请输入用户姓名" v-model="model.realname" :disabled="disableSubmit"/>
         </a-form-model-item>
 
         <!-- <a-form-model-item label="工号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="workNo">
@@ -45,7 +45,7 @@
         </a-form-model-item> -->
 
         <a-form-model-item label="手机号码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="phone">
-          <a-input placeholder="请输入手机号码" v-model="model.phone" />
+          <a-input placeholder="请输入手机号码" v-model="model.phone" :disabled="disableSubmit"/>
         </a-form-model-item>
 
         <!-- <a-form-model-item label="职务" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -63,7 +63,7 @@
 
         <!--部门分配-->
         <a-form-model-item label="部门分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
-          <j-select-depart v-model="model.selecteddeparts" :multi="true" @back="backDepartInfo" :backDepart="true" :treeOpera="true">></j-select-depart>
+          <j-select-depart :disabled="disableSubmit" v-model="model.selecteddeparts" :multi="true" @back="backDepartInfo" :backDepart="true" :treeOpera="true">></j-select-depart>
         </a-form-model-item>
 
         <!--租户分配-->
@@ -92,7 +92,7 @@
         </a-form-model-item>
 
         <a-form-model-item label="头像" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <j-image-upload class="avatar-uploader" text="上传" v-model="model.avatar" ></j-image-upload>
+          <j-image-upload class="avatar-uploader" text="上传" v-model="model.avatar" :disabled="disableSubmit"></j-image-upload>
         </a-form-model-item>
 
         <a-form-model-item label="生日" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -101,22 +101,22 @@
                   placeholder="请选择生日"
                   v-model="model.birthday"
                   :format="dateFormat"
-                  :getCalendarContainer="node => node.parentNode"/>
+                  :getCalendarContainer="node => node.parentNode" :disabled="disableSubmit"/>
         </a-form-model-item>
 
         <a-form-model-item label="性别" :labelCol="labelCol" :wrapperCol="wrapperCol">
-          <a-select  v-model="model.sex"  placeholder="请选择性别" :getPopupContainer= "(target) => target.parentNode">
+          <a-select  v-model="model.sex"  placeholder="请选择性别" :getPopupContainer= "(target) => target.parentNode" :disabled="disableSubmit">
             <a-select-option :value="1">男</a-select-option>
             <a-select-option :value="2">女</a-select-option>
           </a-select>
         </a-form-model-item>
 
         <a-form-model-item label="邮箱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="email">
-          <a-input placeholder="请输入邮箱" v-model="model.email" />
+          <a-input placeholder="请输入邮箱" v-model="model.email" :disabled="disableSubmit"/>
         </a-form-model-item>
 
         <a-form-model-item label="座机" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="telephone">
-          <a-input placeholder="请输入座机" v-model="model.telephone" />
+          <a-input placeholder="请输入座机" v-model="model.telephone" :disabled="disableSubmit"/>
         </a-form-model-item>
 
         <!-- <a-form-model-item label="工作流引擎" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -173,7 +173,7 @@
           roles:{},
           // workNo:[ { required: true, message: '请输入工号' },
           //   { validator: this.validateWorkNo }],
-          telephone: [{ pattern: /^0\d{2,3}-[1-9]\d{6,7}$/, message: '请输入正确的座机号码' },]
+          //telephone: [{ pattern: /^0\d{2,3}-[1-9]\d{6,7}$/, message: '请输入正确的座机号码' },]
         },
         departIdShow:false,
         title:"操作",
@@ -231,8 +231,7 @@
         }else{
           this.departIdShow=false;
         }
-
-        if(record.hasOwnProperty("id")){
+        if(record.id){
           that.getUserRoles(record.id);
           that.getUserDeparts(record.id);
         }