update: 合并

src/components/app/app-detail.vue

@@ -96,17 +96,13 @@
               <template slot-scope="scope">{{ scope.row.isRealTime == 1 ? '是' : '否' }}</template>
             </el-table-column>
             <el-table-column prop="" label="更新频率" show-overflow-tooltip>
-              <template slot-scope="scope"
-                >{{ scope.row.updateType == 1 ? '每日' : scope.row.updateType == 2 ? '每周' : scope.row.updateType == 3 ? '每月' : '-' }} {{ scope.row.updateType == 1 ? '一次' : scope.row.updateType == 2 ? '周' + scope.row.updateDay : scope.row.updateType == 3 ? scope.row.updateDay + '号' : '-' }}
-              </template>
+              <template slot-scope="scope">{{ scope.row.updateType == 1 ? '每日' : scope.row.updateType == 2 ? '每周' : scope.row.updateType == 3 ? '每月' : '-' }} {{ scope.row.updateType == 1 ? '一次' : scope.row.updateType == 2 ? '周' + scope.row.updateDay : scope.row.updateType == 3 ? scope.row.updateDay + '号' : '-' }} </template>
             </el-table-column>
             <el-table-column prop="" label="状态" show-overflow-tooltip>
               <template slot-scope="scope">{{ scope.row.effectiveStatus == '1' ? '有效' : '失效' }}</template>
             </el-table-column>
             <el-table-column prop="" label="覆盖人数" show-overflow-tooltip>
-              <template slot-scope="scope"
-                >{{ scope.row.memberCount || 0 }}人</template
-              >
+              <template slot-scope="scope">{{ scope.row.memberCount || 0 }}人</template>
             </el-table-column>
             <el-table-column prop="" label="到期时间" show-overflow-tooltip>
               <template slot-scope="scope">

src/components/app/dailyAttendance/create-work-class.vue

@@ -45,9 +45,7 @@ import createWorkClass from '@/components/app/dailyAttendance/create-work-class.
               <div v-if="formData.clockType">
                 <el-table :data="formData.classessTimesJson" style="width: 100%">
                   <el-table-column prop="" label="" width="70">
-                    <template slot-scope="scope">
-                      第{{ scope.$index + 1 }}次
-                    </template>
+                    <template slot-scope="scope"> 第{{ scope.$index + 1 }}次 </template>
                   </el-table-column>
                   <el-table-column prop="name" label="上下班时间" width="226">
                     <template slot-scope="scope">

src/components/contacts/staffInfoTemplate.js

@@ -48,7 +48,11 @@ let defineInfo = [
     fieldDescription: '请选择',
     fieldOperations: {
       ruleContent: [],
-      fieldContent: [{ type: 'radio', name: '选项1' }, { type: 'radio', name: '选项2' }, { type: 'radio', name: '选项3' }]
+      fieldContent: [
+        { type: 'radio', name: '选项1' },
+        { type: 'radio', name: '选项2' },
+        { type: 'radio', name: '选项3' }
+      ]
     },
     isMust: false,
     staffRecordsIds: {
@@ -67,7 +71,11 @@ let defineInfo = [
     fieldDescription: '请选择',
     fieldOperations: {
       ruleContent: [],
-      fieldContent: [{ type: 'checkbox', name: '选项1' }, { type: 'checkbox', name: '选项2' }, { type: 'checkbox', name: '选项3' }]
+      fieldContent: [
+        { type: 'checkbox', name: '选项1' },
+        { type: 'checkbox', name: '选项2' },
+        { type: 'checkbox', name: '选项3' }
+      ]
     },
     isMust: false,
     staffRecordsIds: {
@@ -86,7 +94,10 @@ let defineInfo = [
     fieldDescription: '请选择',
     fieldOperations: {
       typeValue: 'yyyy-MM-dd',
-      ruleContent: [{ type: 'radio', name: '年-月-日', key: 'yyyy-MM-dd', isEdit: 1 }, { type: 'radio', name: '年-月', key: 'yyyy-MM', isEdit: 1 }],
+      ruleContent: [
+        { type: 'radio', name: '年-月-日', key: 'yyyy-MM-dd', isEdit: 1 },
+        { type: 'radio', name: '年-月', key: 'yyyy-MM', isEdit: 1 }
+      ],
       fieldContent: [] // 选项
     },
     isMust: false,
@@ -109,7 +120,10 @@ let defineInfo = [
       startDescription: '请选择开始时间',
       endDescription: '请选择结束时间',
       typeValue: 'yyyy-MM-dd',
-      ruleContent: [{ type: 'radio', name: '年-月-日', key: 'yyyy-MM-dd', isEdit: 1 }, { type: 'radio', name: '年-月', key: 'yyyy-MM', isEdit: 1 }],
+      ruleContent: [
+        { type: 'radio', name: '年-月-日', key: 'yyyy-MM-dd', isEdit: 1 },
+        { type: 'radio', name: '年-月', key: 'yyyy-MM', isEdit: 1 }
+      ],
       fieldContent: [] // 选项
     },
     isMust: false,

src/components/set/set-permiss.vue

@@ -126,7 +126,7 @@ export default {
             radio: that.ruleForm.radio
           };
 
-          if (that.ruleForm.radio == 3 && (!that.ruleForm.visibleAll.length && !that.ruleForm.visibleStoreAll.length)) {
+          if (that.ruleForm.radio == 3 && !that.ruleForm.visibleAll.length && !that.ruleForm.visibleStoreAll.length) {
             that.$message.error({
               duration: 1000,
               message: '请选择指定部门/人员'

src/views/contacts/addDepartment.vue

@@ -130,7 +130,10 @@ export default {
         isSingle: true // 是否单选
       },
       rules: {
-        name: [{ required: true, message: '请输入部门名称', trigger: 'blur' }, { min: 1, max: 20, message: '长度在 1 到 20 个字符', trigger: 'blur' }],
+        name: [
+          { required: true, message: '请输入部门名称', trigger: 'blur' },
+          { min: 1, max: 20, message: '长度在 1 到 20 个字符', trigger: 'blur' }
+        ],
         chainName: [{ required: true, message: '请选择父级部门', trigger: 'blur' }]
       },
       treeData: {},

src/views/contacts/addGroup.vue

@@ -58,7 +58,10 @@ export default {
         parentId: ''
       },
       rules: {
-        name: [{ required: true, message: '请输入部门名称', trigger: 'blur' }, { min: 1, max: 20, message: '长度在 1 到 20 个字符', trigger: 'blur' }],
+        name: [
+          { required: true, message: '请输入部门名称', trigger: 'blur' },
+          { min: 1, max: 20, message: '长度在 1 到 20 个字符', trigger: 'blur' }
+        ],
         parentId: [{ required: true, message: '请选择父级部门', trigger: 'change' }]
       },
       disabled: true,

src/views/contacts/shareAddDepartment.vue

@@ -46,7 +46,10 @@ export default {
         isSingle: true // 是否单选
       },
       rules: {
-        name: [{ required: true, message: '请输入部门名称', trigger: 'blur' }, { min: 1, max: 20, message: '长度在 1 到 20 个字符', trigger: 'blur' }],
+        name: [
+          { required: true, message: '请输入部门名称', trigger: 'blur' },
+          { min: 1, max: 20, message: '长度在 1 到 20 个字符', trigger: 'blur' }
+        ],
         parentId: [{ required: true, message: '请选择父级部门', trigger: 'change' }]
       },
       treeData: {},

src/views/enterpriseApp/cloudDaily/template.vue

@@ -190,7 +190,7 @@
                       </div>
                     </template>
                     <!-- 提示 组块 日期，图片没有-->
-                    <template v-if="currentIndex == index && !item.systemFlag && (item.type != 11 && item.type != 5 && item.type != 7)">
+                    <template v-if="currentIndex == index && !item.systemFlag && item.type != 11 && item.type != 5 && item.type != 7">
                       <div class="edit-item test-title limit-w-340" :key="'child1' + index">
                         <div class="edit-item-title">提示文字最多20个字</div>
                         <limitInput :inputWidth="340" :limitClass="'limit-color'" :inputValue.sync="item.placeholder" :holder="''" :disflag="false" :getByType="'word'" :maxLength="20"> </limitInput>

src/views/enterpriseApp/dailyAttendance/workGroupSet.vue

@@ -365,7 +365,15 @@ export default {
         mustJson: [],
         noMustJson: [],
         //特殊考勤日期sperialType 1必须打卡0无须打卡
-        attenceWorkJson: [{ weekDay: '1', workType: false, classesName: '', classesId: '-1', classessTimesJson: [] }, { weekDay: '2', workType: false, classesName: '', classesId: '-1', classessTimesJson: [] }, { weekDay: '3', workType: false, classesName: '', classesId: '-1', classessTimesJson: [] }, { weekDay: '4', workType: false, classesName: '', classesId: '-1', classessTimesJson: [] }, { weekDay: '5', workType: false, classesName: '', classesId: '-1', classessTimesJson: [] }, { weekDay: '6', workType: false, classesName: '', classesId: '-1', classessTimesJson: [] }, { weekDay: '0', workType: false, classesName: '', classesId: '-1', classessTimesJson: [] }],
+        attenceWorkJson: [
+          { weekDay: '1', workType: false, classesName: '', classesId: '-1', classessTimesJson: [] },
+          { weekDay: '2', workType: false, classesName: '', classesId: '-1', classessTimesJson: [] },
+          { weekDay: '3', workType: false, classesName: '', classesId: '-1', classessTimesJson: [] },
+          { weekDay: '4', workType: false, classesName: '', classesId: '-1', classessTimesJson: [] },
+          { weekDay: '5', workType: false, classesName: '', classesId: '-1', classessTimesJson: [] },
+          { weekDay: '6', workType: false, classesName: '', classesId: '-1', classessTimesJson: [] },
+          { weekDay: '0', workType: false, classesName: '', classesId: '-1', classessTimesJson: [] }
+        ],
         // 类型上班还是休息1上班0休息
         attenceClassesRangeJSON: [],
         classesJson: []

src/views/enterpriseApp/myCustomer/memeberBaseSet.vue

@@ -112,17 +112,13 @@
               <template slot-scope="scope">{{ scope.row.isRealTime == 1 ? '是' : '否' }}</template>
             </el-table-column>
             <el-table-column prop="" label="更新频率" show-overflow-tooltip>
-              <template slot-scope="scope"
-                >{{ scope.row.updateType == 1 ? '每日' : scope.row.updateType == 2 ? '每周' : scope.row.updateType == 3 ? '每月' : '-' }} {{ scope.row.updateType == 1 ? '一次' : scope.row.updateType == 2 ? '周' + scope.row.updateDay : scope.row.updateType == 3 ? scope.row.updateDay + '号' : '-' }}
-              </template>
+              <template slot-scope="scope">{{ scope.row.updateType == 1 ? '每日' : scope.row.updateType == 2 ? '每周' : scope.row.updateType == 3 ? '每月' : '-' }} {{ scope.row.updateType == 1 ? '一次' : scope.row.updateType == 2 ? '周' + scope.row.updateDay : scope.row.updateType == 3 ? scope.row.updateDay + '号' : '-' }} </template>
             </el-table-column>
             <el-table-column prop="" label="状态" show-overflow-tooltip>
               <template slot-scope="scope">{{ scope.row.effectiveStatus == '1' ? '有效' : '失效' }}</template>
             </el-table-column>
             <el-table-column prop="" label="覆盖人数" show-overflow-tooltip>
-              <template slot-scope="scope"
-                >{{ scope.row.memberCount || 0 }}人</template
-              >
+              <template slot-scope="scope">{{ scope.row.memberCount || 0 }}人</template>
             </el-table-column>
             <el-table-column prop="" label="到期时间" show-overflow-tooltip>
               <template slot-scope="scope">

src/views/enterpriseApp/quota/monthList.vue

@@ -63,7 +63,12 @@ export default {
       yearList: [],
       year: '',
       tableList: [],
-      tabelHeader: [{ prop: 'yearMonth', label: '月份' }, { prop: 'totalPerformance', label: '月指标累计' }, { prop: 'totalStore', label: '门店总数' }, { prop: 'totalComplete', label: '门店指标完善数' }],
+      tabelHeader: [
+        { prop: 'yearMonth', label: '月份' },
+        { prop: 'totalPerformance', label: '月指标累计' },
+        { prop: 'totalStore', label: '门店总数' },
+        { prop: 'totalComplete', label: '门店指标完善数' }
+      ],
       // 分页参数
       currentPage: 1,
       pageSize: 20,

src/views/enterpriseApp/signApp/signList.vue

@@ -61,14 +61,10 @@
             </template>
           </el-table-column>
           <el-table-column label="打卡坐标" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row.signLongitude || '-' }} <span v-if="!!scope.row.signLatitude">,</span> {{ scope.row.signLatitude || '-' }}
-            </template>
+            <template slot-scope="scope"> {{ scope.row.signLongitude || '-' }} <span v-if="!!scope.row.signLatitude">,</span> {{ scope.row.signLatitude || '-' }} </template>
           </el-table-column>
           <el-table-column label="门店坐标" show-overflow-tooltip>
-            <template slot-scope="scope">
-              {{ scope.row.storeLongitude || '-' }} <span v-if="!!scope.row.storeLatitude">,</span> {{ scope.row.storeLatitude || '-' }}
-            </template>
+            <template slot-scope="scope"> {{ scope.row.storeLongitude || '-' }} <span v-if="!!scope.row.storeLatitude">,</span> {{ scope.row.storeLatitude || '-' }} </template>
           </el-table-column>
           <el-table-column label="距离" show-overflow-tooltip>
             <template slot-scope="scope">

src/views/reviewCenter/unreview.vue

@@ -231,7 +231,10 @@ export default {
         refuseReason: ''
       },
       rules: {
-        refuseReason: [{ required: true, message: '拒绝理由不能为空', trigger: 'change' }, { min: 1, max: 50, message: '长度在 1 到 50 个字', trigger: 'change' }]
+        refuseReason: [
+          { required: true, message: '拒绝理由不能为空', trigger: 'change' },
+          { min: 1, max: 50, message: '长度在 1 到 50 个字', trigger: 'change' }
+        ]
       },
 
       showStoreDialog: false,