Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

src/components/elDialog/dialog.vue

@@ -29,8 +29,8 @@ export default {
 }
 </style>
 <style lang="scss" scoped>
-  .centerDialog{
-    position: absolute;
-    top: 20%;
-  } 
+  //.centerDialog{
+  //  position: absolute;
+  //  top: 20%;
+  //}
 </style>

src/views/system/dept/extend.vue

@@ -167,7 +167,14 @@
             v-if="false"
           />
           <el-table-column type="index" label="序号" align="center" prop="id" />
-          <el-table-column label="标准" align="center" prop="standard" />
+          <el-table-column label="标准" align="center" prop="standard" >
+            <template slot-scope="r"
+              >{{
+                getLabel(dict.type.org_extend_standard, `${r.row.standard}`)
+              }}
+            </template>
+
+          </el-table-column>
           <el-table-column
             label="达标日期"
             align="center"
@@ -245,8 +252,8 @@
         <div></div>
         <el-row v-if="askari">
           <el-col :span="12" :xs="24">
-            <p style="font-size: 12px; color: #999">上传保安证正面</p>
-            <image-upload :fileSize="2" :type="'alone'"></image-upload>
+            <p style="font-size: 12px; color: #999">上传保安证</p>
+            <image-upload :value="askariCertificate" :fileSize="2" :type="'alone'" @input="getImgUrl"></image-upload>
 
             <!--            <el-image class="zoom-image border-color-change" :src="uploadp" fit="contain" @click="triggerFileInput"></el-image>-->
             <!--            <input type="file"-->
@@ -254,9 +261,11 @@
             <!--                   @change="handleFileChange"-->
             <!--                   style="display: none;"/>-->
           </el-col>
-          <el-col :span="12">
-            <p style="font-size: 12px; color: #999">上传保安证反面</p>
-            <image-upload :fileSize="2" :type="'alone'"></image-upload>
+          <el-col :span="12" :xs="24">
+            <p style="font-size: 12px; color: #999">示例图</p>
+            <div style="width: 350px;">
+                <el-image :src="uplp"></el-image>
+              </div>
             <!--            <el-image class="zoom-image border-color-change" :src="uplp" fit="contain"></el-image>-->
           </el-col>
         </el-row>
@@ -334,7 +343,14 @@
             align="center"
           />
           <el-table-column type="index" label="序号" align="center" prop="id" />
-          <el-table-column label="标准" align="center" prop="standard" />
+          <el-table-column label="标准" align="center" prop="standard" >
+            <template slot-scope="r"
+              >{{
+                getLabel(dict.type.org_extend_business_library_standard, `${r.row.standard}`)
+              }}
+            </template>
+
+          </el-table-column>
           <el-table-column
             label="达标日期"
             align="center"
@@ -468,7 +484,13 @@
             align="center"
           />
           <el-table-column type="index" label="序号" align="center" prop="id" />
-          <el-table-column label="标准" align="center" prop="standard" />
+          <el-table-column label="标准" align="center" prop="standard" >
+            <template slot-scope="r"
+              >{{
+                getLabel(dict.type.org_extend_self_service_bank_standard, `${r.row.standard}`)
+              }}
+            </template>
+          </el-table-column>
           <el-table-column
             label="达标日期"
             align="center"
@@ -586,7 +608,13 @@
             align="center"
           />
           <el-table-column type="index" label="序号" align="center" prop="id" />
-          <el-table-column label="标准" align="center" prop="standard" />
+          <el-table-column label="标准" align="center" prop="standard" >
+            <template slot-scope="r"
+              >{{
+                getLabel(dict.type.org_extend_detached_standard, `${r.row.standard}`)
+              }}
+            </template>
+          </el-table-column>
           <el-table-column
             label="达标日期"
             align="center"
@@ -677,7 +705,21 @@
         label-width="80px"
       >
         <el-form-item label="标准" prop="standard">
-          <el-input v-model="Businessform.standard" placeholder="请输入标准" />
+          <!-- <el-input v-model="Businessform.standard" placeholder="请输入标准" /> -->
+          <el-select
+              prop="planType"
+              label="标准"
+              v-model="Businessform.standard"
+              placeholder="请选择标准"
+              clearable
+            >
+              <el-option
+                v-for="dict in dict.type.org_extend_business_library_standard"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
         </el-form-item>
         <el-form-item label="达标日期" prop="dateOfCompliance">
           <el-date-picker
@@ -720,6 +762,7 @@
             ></image-upload>
           </div>
           <a :href="Businessform.certificate">点击查看</a>
+          <!-- <el-button type="primary" @click="resetimg(Businessform.certificate)">重新上传</el-button> -->
         </el-form-item>
         <el-form-item v-if="false" label="佐证" prop="evidence">
           <el-input v-model="Businessform.evidence" placeholder="请输入佐证" />
@@ -747,7 +790,21 @@
         :rules="rules"
       >
         <el-form-item label="标准" prop="standard">
-          <el-input v-model="Bankform.standard" placeholder="请输入标准" />
+          <!-- <el-input v-model="Bankform.standard" placeholder="请输入标准" /> -->
+          <el-select
+              prop="planType"
+              label="标准"
+              v-model="Bankform.standard"
+              placeholder="请选择标准"
+              clearable
+            >
+              <el-option
+                v-for="dict in dict.type.org_extend_self_service_bank_standard"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
         </el-form-item>
         <el-form-item label="达标日期" prop="dateOfCompliance">
           <el-date-picker
@@ -816,7 +873,21 @@
     >
       <el-form ref="orgform" :model="orgform" label-width="80px" :rules="rules">
         <el-form-item label="标准" prop="standard">
-          <el-input v-model="orgform.standard" placeholder="请输入标准" />
+          <!-- <el-input v-model="orgform.standard" placeholder="请输入标准" /> -->
+          <el-select
+              prop="planType"
+              label="标准"
+              v-model="orgform.standard"
+              placeholder="请选择标准"
+              clearable
+            >
+              <el-option
+                v-for="dict in dict.type.org_extend_standard"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
         </el-form-item>
         <el-form-item label="达标日期" prop="dateOfCompliance">
           <el-date-picker
@@ -887,7 +958,21 @@
         :rules="rules"
       >
         <el-form-item label="标准" prop="standard">
-          <el-input v-model="detachedform.standard" placeholder="请输入标准" />
+          <!-- <el-input v-model="detachedform.standard" placeholder="请输入标准" /> -->
+          <el-select
+              prop="planType"
+              label="标准"
+              v-model="detachedform.standard"
+              placeholder="请选择标准"
+              clearable
+            >
+              <el-option
+                v-for="dict in dict.type.org_extend_detached_standard"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
         </el-form-item>
         <el-form-item label="达标日期" prop="dateOfCompliance">
           <el-date-picker
@@ -990,6 +1075,10 @@ export default {
     "org_extend_type",
     "business_library_type",
     "reality_org_type",
+    "org_extend_standard",
+    "org_extend_business_library_standard",
+    "org_extend_self_service_bank_standard",
+    "org_extend_detached_standard",
   ],
   props: [],
   components: {},
@@ -1040,6 +1129,7 @@ export default {
       detachedWallPenetratingEquipment: null,
       cashAddingRoomRemoteControl: null,
       source: null,
+      askariCertificate:null,
       //机构建设数据
 
       // 遮罩层
@@ -1132,6 +1222,16 @@ export default {
   },
   mounted() {},
   methods: {
+    getImgUrl(fileList){
+      let matchResult = fileList.match(/\/statics(.*)/);
+      if (matchResult) {
+        let result = matchResult[0];
+        this.askariCertificate = result;
+      } else {
+      }
+      // this.askariCertificate=img;
+      console.log(this.askariCertificate,'imgs')
+    },
     downBusiness(file) {
       window.open(file);
     },
@@ -1210,6 +1310,7 @@ export default {
           this.businessLibrary=data.data.businessLibrary;
           this.lobbyEquipment = data.data.lobbyEquipment;
           this.wallPenetratingEquipment = data.data.wallPenetratingEquipment;
+          this.askariCertificate=data.data.askariCertificate;
           this.extendId = data.data.id;
           this.constructionTime = data.data.constructionTime;
           this.lastUpdateTime = data.data.lastUpdateTime;
@@ -1361,7 +1462,9 @@ export default {
         })
         .catch(() => {});
     },
-
+    // resetimg(certificate){
+    //   this.Bankform.certificate=0;
+    // },
     // 取消按钮
     Bankcancel() {
       this.Bankopen = false;
@@ -1648,6 +1751,7 @@ export default {
       let dat = {
         orgType: this.orgType,
         weatherAreaCode: this.weatherAreaCode,
+        askariCertificate:this.askariCertificate,
         premisesArea: this.premisesArea,
         ownership: this.ownership ? 1 : 0,
         outsideArea: this.outsideArea ? 1 : 0,

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

@@ -63,7 +63,7 @@
 <!--                    v-model="r.row.workTime"/>-->
 <!--                </template>-->
 <!--              </el-table-column>-->
-              <el-table-column label="营业时间" width="120">
+              <el-table-column label="营业开始" width="120">
                 <template slot-scope="r">
                   <el-time-select
                     style="width: 100%;"
@@ -93,7 +93,7 @@
 <!--                    v-model="r.row.noonbreakEnd"/>-->
 <!--                </template>-->
 <!--              </el-table-column>-->
-              <el-table-column label="营业终了" width="120">
+              <el-table-column label="营业结束" width="120">
                 <template slot-scope="r">
                   <el-time-select
                     style="width: 100%"
@@ -241,7 +241,7 @@ export default {
           return;
         }
         if(!timeCheck([other.openTime,other.closeTime])){
-          this.$message.error(`${ds}：营业时间应在营业终了之前`);
+          this.$message.error(`${ds}：营业开始时间应在营业结束之前`);
           return false;
         }
       }

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

@@ -1,6 +1,6 @@
 <template>
   <div class="question-infos">
-    <DialogCom title="编辑作息" @close="handleClose" :visible="show" width="800px">
+    <DialogCom title="编辑作息" @close="handleClose" :visible="show" width="800px"  append-to-body>
       <div class="page-body">
         <el-form :model="formData" :rules="formData.isEnable?formDataRules:{}" size="small" ref="form" label-position="right"
                  label-width="120px" label-prefix=":">
@@ -30,47 +30,47 @@
                 </template>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item prop="workTime" label="上班时间：">
-                <template >
-                  <el-time-select
-                      :picker-options="pickerOptions"
-                      v-model="formData.workTime"
-                      :disabled="!formData.isEnable || formData.isEnable === false"/>
-                </template>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item prop="workOffTime" label="下班时间：">
-                <template >
-                  <el-time-select
-                    :picker-options="pickerOptions"
-                    v-model="formData.workOffTime"
-                    :disabled="!formData.isEnable || formData.isEnable === false"/>
-                </template>
-              </el-form-item>
-            </el-col>
-              <el-col :span="12">
+<!--            <el-col :span="12">-->
+<!--              <el-form-item prop="workTime" label="上班时间：">-->
+<!--                <template >-->
+<!--                  <el-time-select-->
+<!--                      :picker-options="pickerOptions"-->
+<!--                      v-model="formData.workTime"-->
+<!--                      :disabled="!formData.isEnable || formData.isEnable === false"/>-->
+<!--                </template>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="12">-->
+<!--              <el-form-item prop="workOffTime" label="下班时间：">-->
+<!--                <template >-->
+<!--                  <el-time-select-->
+<!--                    :picker-options="pickerOptions"-->
+<!--                    v-model="formData.workOffTime"-->
+<!--                    :disabled="!formData.isEnable || formData.isEnable === false"/>-->
+<!--                </template>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--              <el-col :span="12">-->
 
-              <el-form-item prop="noonbreakStart" label="午休开始：">
-                <template>
-                  <el-time-select
-                      :picker-options="pickerOptions"
-                      v-model="formData.noonbreakStart"
-                      :disabled="!formData.isEnable || formData.isEnable === false"/>
-                </template>
-              </el-form-item>
-              </el-col>
-            <el-col :span="12">
-              <el-form-item prop="noonbreakEnd" label="午休结束：">
-                <template >
-                  <el-time-select
-                      :picker-options="pickerOptions"
-                      v-model="formData.noonbreakEnd"
-                      :disabled="!formData.isEnable || formData.isEnable === false"/>
-                </template>
-              </el-form-item>
-            </el-col>
+<!--              <el-form-item prop="noonbreakStart" label="午休开始：">-->
+<!--                <template>-->
+<!--                  <el-time-select-->
+<!--                      :picker-options="pickerOptions"-->
+<!--                      v-model="formData.noonbreakStart"-->
+<!--                      :disabled="!formData.isEnable || formData.isEnable === false"/>-->
+<!--                </template>-->
+<!--              </el-form-item>-->
+<!--              </el-col>-->
+<!--            <el-col :span="12">-->
+<!--              <el-form-item prop="noonbreakEnd" label="午休结束：">-->
+<!--                <template >-->
+<!--                  <el-time-select-->
+<!--                      :picker-options="pickerOptions"-->
+<!--                      v-model="formData.noonbreakEnd"-->
+<!--                      :disabled="!formData.isEnable || formData.isEnable === false"/>-->
+<!--                </template>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
             <el-col :span="12">
               <el-form-item prop="openTime" label="营业开始：">
                 <template >
@@ -121,10 +121,10 @@ export default {
       //表单验证
       formDataRules: {
         isEnable: [{ required: true, message: "请选择状态" }],
-        workTime: [{ required: true, message: "请输入上班时间" }],
-        workOffTime: [{ required: true, message: "请输入下班时间" }],
-        noonbreakStart: [{ required: true, message: "请输入午休开始时间" }],
-        noonbreakEnd: [{ required: true, message: "请输入午休结束时间" }],
+        // workTime: [{ required: true, message: "请输入上班时间" }],
+        // workOffTime: [{ required: true, message: "请输入下班时间" }],
+        // noonbreakStart: [{ required: true, message: "请输入午休开始时间" }],
+        // noonbreakEnd: [{ required: true, message: "请输入午休结束时间" }],
         openTime: [{ required: true, message: "请输入营业时间" }],
         closeTime: [{ required: true, message: "请输入营业终了时间" }],
       },
@@ -138,7 +138,7 @@ export default {
       return {
         start: "00:00",
         end: "24:00",
-        step: "00:10",
+        step: "00:05",
       };
     },
   },
@@ -156,20 +156,20 @@ export default {
         isEnable: 1,
         openTime: null,
         closeTime: null,
-        noonbreakStart: null,
-        noonbreakEnd: null,
-        workTime: null,
-        workOffTime: null,
+        // noonbreakStart: null,
+        // noonbreakEnd: null,
+        // workTime: null,
+        // workOffTime: null,
       };
     },
     onEnableChange(workTime) {
       if (workTime.isEnable === false) {
         workTime.openTime = null;
         workTime.closeTime = null;
-        workTime.noonbreakStart = null;
-        workTime.noonbreakEnd = null;
-        workTime.workTime = null;
-        workTime.workOffTime = null;
+        // workTime.noonbreakStart = null;
+        // workTime.noonbreakEnd = null;
+        // workTime.workTime = null;
+        // workTime.workOffTime = null;
       }
     },
     handleClose() {
@@ -182,23 +182,13 @@ export default {
     onSubmit() {
       this.$refs.form.validate((isValidate) => {
         if (!isValidate) return;
-        if (!this.formData.noonbreakStart ^ !this.formData.noonbreakEnd) {
-          this.$message.warning(`午休开始及结束时间必须同时配置`);
-          return;
-        }
         if (
             !timeCheck([
-              this.formData.workTime,
               this.formData.openTime,
-              this.formData.noonbreakStart,
-              this.formData.noonbreakEnd,
               this.formData.closeTime,
-              this.formData.workOffTime,
             ])
         ) {
-          this.$message.warning(
-              `时间配置规则：上班时间<=午休开始<=午休结束<=下班时间`
-          );
+          this.$message.warning(`营业开始时间应在营业结束之前`);
           return false;
         }
         editWorkTime(this.formData).then(res=>{

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

@@ -63,7 +63,7 @@
 <!--                      v-model="r.row.workTime"/>-->
 <!--                  </template>-->
 <!--                </el-table-column>-->
-                <el-table-column label="营业时间">
+                <el-table-column label="营业开始">
                   <template slot-scope="r">
                     <el-time-select
                       style="width: 100%"
@@ -93,7 +93,7 @@
 <!--                      v-model="r.row.noonbreakEnd"/>-->
 <!--                  </template>-->
 <!--                </el-table-column>-->
-                <el-table-column label="营业终了">
+                <el-table-column label="营业结束">
                   <template slot-scope="r">
                     <el-time-select
                       style="width: 100%"
@@ -279,7 +279,7 @@ export default {
       // }
       let arr = [dayOfWeek.openTime,dayOfWeek.closeTime];
       if (!timeCheck(arr)) {
-        this.$message.error(`${dayOfWeek.dayOfWeekText}的营业时间应在营业终了之前`);
+        this.$message.error(`${dayOfWeek.dayOfWeekText}的营业开始时间应在营业结束之前`);
         return false;
       }
       return true;
@@ -323,10 +323,10 @@ export default {
       if (!workTime.isWorkday) {
         workTime.openTime = null;
         workTime.closeTime = null;
-        workTime.noonbreakStart = null;
-        workTime.noonbreakEnd = null;
-        workTime.workTime = null;
-        workTime.workOffTime = null;
+        // workTime.noonbreakStart = null;
+        // workTime.noonbreakEnd = null;
+        // workTime.workTime = null;
+        // workTime.workOffTime = null;
       }
     },
     handleClose() {