Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/views/resumption/plan/dialog.edit.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="rule-type">
     <DialogCom
+      @colse="onHide"
       :title="id ? '编辑履职计划' : '新增履职计划'"
       :visible.sync="isShow"
       width="1500px"
@@ -76,7 +77,7 @@
             </el-col>
             <el-col :span="6">
               <el-form-item prop="planStatus" label="计划状态:">
-                <!-- <el-select 
+                <!-- <el-select
                   :disabled="getDistributePlanStatus()"
                   prop="planStatus"
                   label="计划状态"
@@ -84,7 +85,7 @@
                   placeholder="请选择计划状态"
                   clearable
                 >
-                  <el-option 
+                  <el-option
                     v-for="item in dict.type.resumption_plan_status"
                     :key="item.value"
                     :label="item.label"
@@ -330,14 +331,14 @@ export default {
       tableData: [],
       id: null,
       isShow: false,
-      formData: this.reset(),
+      formData: {},
       formDataRules: {
         planName: [{ required: true, message: "请输入计划名称" }],
         planType: [{ required: true, message: "请选择计划类型" }],
         planCycle: [{ required: true, message: "请选择履职周期" }],
         planStatus: [{ required: true, message: "请选择计划状态" }],
         execOrgType: [{ required: true, message: "请选择履职机构类型" }],
-        roleList: [{ required: true, message: "请选择履职角色" }],
+        roleList: [{ required: true, message: "请选择履职角色" ,trigger: "change"}],
         planExec: [{ required: true, message: "请选择履职时间" }],
         count: [{ required: true, message: "请选择履职次数" }],
       },
@@ -403,9 +404,9 @@ export default {
             }
             month3++;
           }
-          this.buildTime = `${year2}-${month3}-${day2}`; 
-        
-         
+          this.buildTime = `${year2}-${month3}-${day2}`;
+
+
           break;
       }
     },
@@ -571,7 +572,6 @@ export default {
         planStatus: null,
         execOrgType: null,
         roleNames: null,
-        count: null,
         description: null,
         tableData: null,
         itemList: null,
@@ -580,7 +580,7 @@ export default {
         note: null,
         planCreateOrgId: null,
         planCreateOrgName: null,
-        roleList: null,
+        roleList: [],
         distributePlanStatus: null,
         planCreateOrgType: null,
         buildTaskNow: false,
@@ -666,6 +666,8 @@ export default {
     // 事件
     onHide() {
       this.isShow = false;
+      this.formData = this.reset();
+      this.$refs.form.resetFields();
     },
     getIteamF() {
       // if(this.id==null){

src/views/system/bind/index.vue

@@ -104,12 +104,12 @@
             :props="{ checkStrictly: true, label: 'name' }" placeholder="请选择机构" @select="changeSelectArea" />
         </el-form-item>
         <el-form-item label="区域名称" v-if="form.orgId != null" prop="areaId">
-          <el-select mode="multiple" style="width: 100%;" v-model="form.areaId" placeholder="请选择区域名称">
+          <el-select mode="multiple" style="width: 100%;" v-model="form.areaId" :popper-append-to-body="false" placeholder="请选择区域名称">
             <el-option v-for="item in roleOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="NFC点位" v-if="form.orgId != null" prop="checkId">
-          <el-select style="width: 100%;" v-model="form.checkId" placeholder="请选择NFC点位名称">
+          <el-select style="width: 100%;" v-model="form.checkId" :popper-append-to-body="false" placeholder="请选择NFC点位名称">
             <el-option v-for="item in checkList" :key="item.id" :label="item.checkName" :value="item.id"></el-option>
           </el-select>
         </el-form-item>
@@ -121,7 +121,7 @@
         </el-form-item>
 
         <el-form-item label="状态" prop="enable">
-          <el-select style="width: 100%" v-model="form.enable" placeholder="请选择状态">
+          <el-select style="width: 100%" v-model="form.enable" :popper-append-to-body="false" placeholder="请选择状态">
             <el-option v-for="dict in dict.type.plan_status" :key="dict.value" :label="dict.label"
               :value="`${dict.value}`"></el-option>
           </el-select>
@@ -441,3 +441,9 @@ export default {
   }
 };
 </script>
+
+<style lang="scss">
+.vue-treeselect__menu-container{
+  z-index: 3000 !important;
+}
+</style>

src/views/system/dept/index.vue

@@ -59,7 +59,7 @@
                 placeholder="请输入机构名称"
                 clearable
                 @keyup.enter.native="handleQuery"
-                :maxlength="50" @input="inputRestriction"
+                maxlength="50" @input="inputRestriction"
               />
             </el-form-item>
             <el-form-item label="机构编码" prop="code">

src/views/system/user/index.vue

@@ -188,12 +188,12 @@
         <el-row>
           <el-col :span="10">
             <el-form-item label="手机号码" prop="phone">
-              <el-input v-model="form.phone" placeholder="请输入手机号码" maxlength="11" :readonly="form.source == 1" />
+              <el-input v-model="form.phone" placeholder="请输入手机号码" autocomplete="off"  maxlength="11" :readonly="form.source == 1" />
             </el-form-item>
           </el-col>
           <el-col :span="10">
             <el-form-item v-if="!form.id" label="用户密码" prop="password">
-              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />
+              <el-input v-model="form.password" placeholder="请输入用户密码" autocomplete="off" type="password" maxlength="20" show-password />
             </el-form-item>
           </el-col>
         </el-row>

src/views/system/workTimeSet/dialog.edit.vue

@@ -24,8 +24,8 @@
               <el-form-item prop="isEnable" label="状态：">
                 <template >
                   <el-radio-group v-model="formData.isEnable" @change="onEnableChange(formData)">
-                    <el-radio text-color="#48bb78" :label="1">营业</el-radio>
-                    <el-radio text-color="#f56565" :label="0">歇业</el-radio>
+                    <el-radio text-color="#48bb78" label="1">营业</el-radio>
+                    <el-radio text-color="#f56565" label="0">歇业</el-radio>
                   </el-radio-group>
                 </template>
               </el-form-item>
@@ -77,7 +77,7 @@
                   <el-time-select
                     :picker-options="pickerOptions"
                     v-model="formData.openTime"
-                    :disabled="!formData.isEnable || formData.isEnable === false"/>
+                    :disabled="formData.isEnable != '1'"/>
                 </template>
               </el-form-item>
             </el-col>
@@ -87,7 +87,7 @@
                   <el-time-select
                     :picker-options="pickerOptions"
                     v-model="formData.closeTime"
-                    :disabled="!formData.isEnable || formData.isEnable === false"/>
+                    :disabled="formData.isEnable != '1'"/>
                 </template>
               </el-form-item>
             </el-col>

src/views/system/workTimeSet/dialog.template.vue

@@ -5,7 +5,7 @@
 <!--      <div class="p-5 work-time-modify">-->
         <el-form
             :disabled="title === '查看作息模版'"
-            label-width="140px"
+            label-width="100px"
             label-suffix=":"
             label-position="left">
           <el-form-item>
@@ -47,8 +47,8 @@
                     <el-radio-group
                         v-model="r.row.isWorkday"
                         @change="onEnableChange(r.row)">
-                      <el-radio text-color="#48bb78" label="1">营业</el-radio>
-                      <el-radio text-color="#f56565" label="0">歇业</el-radio>
+                      <el-radio text-color="#48bb78" :label="1">营业</el-radio>
+                      <el-radio text-color="#f56565" :label="0">歇业</el-radio>
                     </el-radio-group>
                   </template>
                 </el-table-column>

src/views/system/workTimeSet/workTime.vue

@@ -84,7 +84,7 @@
               <span slot-scope="scope">{{scope.row.ymdDate}}</span>
             </el-table-column>
             <el-table-column v-if="columns[2].visible" label="营业状态">
-              <template slot-scope="r">{{r.row.isEnable?'营业':'歇业'}}</template>
+              <template slot-scope="r">{{r.row.isEnable=='1'?'营业':'歇业'}}</template>
             </el-table-column>
   <!--          <el-table-column v-if="columns[3].visible" label="上下班时间段">-->
   <!--            <template slot-scope="r">-->