Merge branch 'master' of http://47.92.161.104:10080/shuzhan/shinestar-portal

src/views/base/companyInfo-detail.vue

@@ -64,16 +64,8 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="地区" prop="regionId">
-              <!-- <el-select v-model="formModel.regionId" filterable placeholder="请选择" style="width:50%">
-                <el-option
-                  v-for="region in regionData"
-                  :key="region.id"
-                  :label="region.name"
-                  :value="region.id"
-                ></el-option>
-              </el-select> -->
               <el-select-tree
                 :props="props"
                 :options="regionData"
@@ -82,7 +74,7 @@
                 width="400px"
               ></el-select-tree>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="12">
             <el-form-item label="单位性质" prop="unitType">
               <el-select
@@ -101,8 +93,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="12">
             <el-form-item label="场景值" prop="sceneId">
               <el-select
@@ -121,7 +111,17 @@
               </el-select>
             </el-form-item>
           </el-col>
-      
+        </el-row>
+        <el-row>
+          
+          <el-col :span="12">
+            <el-form-item label="是否外协部门" prop="isOutsourcer">
+              <el-radio v-model="formModel.isOutsourcer" :label="true">是</el-radio>
+              <el-radio v-model="formModel.isOutsourcer" :label="false">否</el-radio>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="12">
             <el-form-item label="允许手机注册用户" prop="enableRegister">
               <el-radio v-model="formModel.enableRegister" :label="true">允许</el-radio>
@@ -481,6 +481,11 @@ export default {
             self.fileUrl =
               logo + "?x-oss-process=image/resize,m_lfit,h_400,w_400";
           }
+
+          let isOutsourcer = self.formModel.isOutsourcer;
+          if(isOutsourcer == null){
+            self.formModel.isOutsourcer = false;
+          }
         } else {
           self.$message.error(jsonData.message + "");
         }

src/views/base/companyInfo-list.vue

@@ -173,20 +173,20 @@
         width="120"
       ></el-table-column>
       <el-table-column
-        prop="sceneName"
-        label="场景值"
+        prop="isOutsourcer"
+        label="是否外协"
         width="90"
-      ></el-table-column>
-      <el-table-column
-        prop="typeName"
-        label="服务场景"
-        width="90"
-      ></el-table-column>
-      <el-table-column
+      >
+      <template slot-scope="{row}">
+        <span v-if="row.isOutsourcer">是</span>
+        <span v-else>否</span>
+      </template>
+      </el-table-column>
+      <!-- <el-table-column
         prop="regionName"
         label="地区"
         width="90"
-      ></el-table-column>
+      ></el-table-column> -->
       <el-table-column
         prop="typeName"
         label="单位类别"

src/views/business/workScheduleAttendance-day-list.vue

@@ -68,19 +68,15 @@
         label="日期"
         width="180"
       ></el-table-column>
-      <el-table-column
-        prop="shiftNumbers"
-        label="班次"
-        width="180"
-      >
-      <template slot-scope="{ row }">
+      <el-table-column prop="shiftNumbers" label="班次" width="180">
+        <template slot-scope="{ row }">
           <span v-if="row.onWorkStatus != 1 && row.onWorkStatus != 1">
-            {{row.onWorkStatusN}}
+            {{ row.onWorkStatusN }}
           </span>
           <span v-else>
-            {{row.shiftNumbers}}
+            {{ row.shiftNumbers }}
           </span>
-      </template>
+        </template>
       </el-table-column>
       <el-table-column prop="onWorkResult" label="上班" width="180">
         <template slot-scope="{ row }">
@@ -127,7 +123,7 @@
       ></el-table-column>
       <el-table-column
         prop="notSwipingNum"
-        label="未刷次数"
+        label="未打卡次数"
         width="180"
       ></el-table-column>
     </el-table>
@@ -140,7 +136,7 @@ import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
 
 export default {
-  name:"BusinessWorkScheduleAttendanceDayList",
+  name: "BusinessWorkScheduleAttendanceDayList",
   data() {
     var self = this;
 
@@ -207,13 +203,14 @@ export default {
 
           self.tableData = jsonData.wsaList;
           self.personInfo = jsonData.personInfo;
-          self.showMessage =
-            "查询结果 部门:" +
-            self.personInfo.companyName +
-            "      工号:" +
-            self.personInfo.jobNumber +
-            "      姓名:" +
-            self.personInfo.name;
+          let message = "查询结果 部门:" + self.personInfo.companyName;
+          let message2 = "      工号:" + self.personInfo.jobNumber;
+          let message3 = "      姓名:" + self.personInfo.name;
+          if (self.personInfo.jobNumber == null) {
+            self.showMessage = message + message3;
+          } else {
+            self.showMessage = message + message2 + message3;
+          }
 
           self.tableHeight =
             window.innerHeight - self.$refs.formTable.$el.offsetTop - 100;
@@ -256,7 +253,7 @@ export default {
     var timeRanges = this.$route.query.timeRanges;
     this.queryModel.personId = personId;
     let tims = timeRanges.split(",");
-    this.queryModel.timeRanges = [tims[0],tims[1]]
+    this.queryModel.timeRanges = [tims[0], tims[1]];
 
     this.changePage();
   },

src/views/business/workScheduleAttendance-list.vue

@@ -90,22 +90,26 @@
         type="index"
         label="序号"
         :index="indexMethod"
+         fixed="left"
         width="50"
       ></el-table-column>
       <el-table-column
         prop="personInfo.id"
         label="id"
         width="120"
+        fixed="left"
       ></el-table-column>
       <el-table-column
         prop="personInfo.jobNumber"
         label="工号"
         width="120"
+        fixed="left"
       ></el-table-column>
       <el-table-column
         prop="personInfo.name"
         label="姓名"
         width="120"
+        fixed="left"
       ></el-table-column>
       <el-table-column
         prop="attendanceDays"
@@ -149,7 +153,7 @@
       ></el-table-column>
       <el-table-column
         prop="notSwipingNum"
-        label="未刷次数"
+        label="未打卡次数"
         width="120"
       ></el-table-column>
       <el-table-column
@@ -300,6 +304,9 @@ export default {
         if (jsonData.result) {
           self.tableData = jsonData.data.wsaList;
 
+          self.totalPages = jsonData.data.totalPages;
+          self.totalElements = jsonData.data.recordsTotal;
+
           //45为分页栏的高度
           //页面高度-列表上面的高度-分页栏高度
           self.tableHeight =