feat: 车辆以及花名册新功能添加

src/views/projectFront/carManage/carManage.vue

@@ -23,21 +23,63 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="车辆下发状态">
+          <el-select
+            size="medium"
+            v-model="tableParameter.sendSuccessStatus"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="(item, index) in sendStatusArr"
+              :key="index"
+              :label="item.name"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item>
-          <el-button v-permission="{key: 'clgl_query', menuPath: '/project/carManage/carManage'}" type="primary" plain @click="getList">{{
+          <el-button
-            $t("message.deviceManage.query")
+            v-permission="{
-          }}</el-button>
+              key: 'clgl_query',
+              menuPath: '/project/carManage/carManage',
+            }"
+            type="primary"
+            plain
+            @click="getList"
+            >{{ $t("message.deviceManage.query") }}</el-button
+          >
         </el-form-item>
       </el-form>
-      <el-button v-permission="{key: 'clgl_refresh', menuPath: '/project/carManage/carManage'}" type="warning" size="medium" plain @click="refresh">{{
+      <el-button
-        $t("message.deviceManage.refresh")
+        v-permission="{
-      }}</el-button>
+          key: 'clgl_refresh',
-      <el-button v-permission="{key: 'clgl_add', menuPath: '/project/carManage/carManage'}" type="primary" size="medium" @click="add">{{
+          menuPath: '/project/carManage/carManage',
-        $t("message.deviceManage.add")
+        }"
-      }}</el-button>
+        type="warning"
+        size="medium"
+        plain
+        @click="refresh"
+        >{{ $t("message.deviceManage.refresh") }}</el-button
+      >
+      <el-button
+        v-permission="{
+          key: 'clgl_add',
+          menuPath: '/project/carManage/carManage',
+        }"
+        type="primary"
+        size="medium"
+        @click="add"
+        >{{ $t("message.deviceManage.add") }}</el-button
+      >
     </div>
     <div class="table_wrap whiteBlock">
       <el-table class="tables" :data="List">
+        <el-table-column
+          prop="enterpriseName"
+          align="center"
+          label="企业名称"
+          show-overflow-tooltip
+        ></el-table-column>
         <el-table-column
           prop="carNumber"
           align="center"
@@ -81,8 +123,14 @@
               :active-value="0"
               inactive-color="#000000"
               :inactive-value="1"
-              :disabled="!editPermission ?true : scope.row.carModuleType === 2 ? true : false "
+              :disabled="
-              @change="e => blackSwich(e,scope.row)"
+                !editPermission
+                  ? true
+                  : [2,3].includes(scope.row.carModuleType)
+                  ? true
+                  : false
+              "
+              @change="(e) => blackSwich(e, scope.row)"
             >
             </el-switch>
           </template>
@@ -121,11 +169,13 @@
         <el-table-column
           prop="carModuleType"
           align="center"
-          :label="$t('message.carManage.carModuleType')"
+          label="固定/临时/外来车辆"
+          width="180"
         >
           <template slot-scope="scope">
             <span v-if="scope.row.carModuleType === 1">固定车辆</span>
             <span v-else-if="scope.row.carModuleType === 2">临时车辆</span>
+            <span v-else>外来车辆</span>
           </template>
         </el-table-column>
 
@@ -133,10 +183,10 @@
           prop="reserveStartTime reserveEndTime"
           align="center"
           label="预约时间"
-          width="350"
+          show-overflow-tooltip
         >
-          <template slot-scope="scope" v-if="scope.row.carModuleType === 2">
+          <template slot-scope="scope" v-if="[2,3].includes(scope.row.carModuleType)">
-            <span v-if="scope.row.carModuleType === 2">
+            <span v-if="[2,3].includes(scope.row.carModuleType) && scope.row.reserveStartTime">
               {{
                 scope.row.reserveStartTime + " 至 " + scope.row.reserveEndTime
               }}
@@ -149,15 +199,157 @@
           align="center"
           :label="$t('message.carManage.entryAndExitPermit')"
         >
-          <template slot-scope="scope" v-if="scope.row.carModuleType === 2">
+          <template slot-scope="scope" v-if="[2,3].includes(scope.row.carModuleType)">
             <span v-if="scope.row.entryAndExitPermit === 0">单次</span>
             <span v-else-if="scope.row.entryAndExitPermit === 1">多次</span>
           </template>
         </el-table-column>
-
+        <el-table-column align="center" label="车辆下发状态">
+          <template v-slot="{ row }">
+            <span
+              :class="[
+                'valuesColor',
+                row.sendSuccessStatus === 1
+                  ? 'green'
+                  : row.sendSuccessStatus === 2
+                  ? 'red'
+                  : row.sendSuccessStatus === 3
+                  ? 'yellow'
+                  : '',
+              ]"
+            >
+              {{
+                row.sendSuccessStatus === 1
+                  ? "成功"
+                  : row.sendSuccessStatus === 2
+                  ? "失败"
+                  : row.sendSuccessStatus === 3
+                  ? "部分成功"
+                  : ""
+              }}</span
+            >
+          </template>
+        </el-table-column>
+        <el-table-column
+          width="80"
+          align="center"
+          label="驾驶证"
+        >
+          <div slot slot-scope="scope">
+            <img
+              v-if="
+                scope.row.jsz &&
+                JSON.parse(scope.row.jsz).length > 0
+              "
+              :preview="
+                JSON.parse(scope.row.jsz)[0]
+                  ? $store.state.FILEURL +
+                    JSON.parse(scope.row.jsz)[0].url
+                  : ''
+              "
+              :src="
+                JSON.parse(scope.row.jsz)[0]
+                  ? $store.state.FILEURL +
+                    JSON.parse(scope.row.jsz)[0].url
+                  : ''
+              "
+              alt=""
+              width="50px"
+              height="50px"
+            />
+          </div>
+        </el-table-column>
+        <el-table-column
+          width="80"
+          align="center"
+          label="行驶证"
+        >
+          <div slot slot-scope="scope">
+            <img
+              v-if="
+                scope.row.xsz &&
+                JSON.parse(scope.row.xsz).length > 0
+              "
+              :preview="
+                JSON.parse(scope.row.xsz)[0]
+                  ? $store.state.FILEURL +
+                    JSON.parse(scope.row.xsz)[0].url
+                  : ''
+              "
+              :src="
+                JSON.parse(scope.row.xsz)[0]
+                  ? $store.state.FILEURL +
+                    JSON.parse(scope.row.xsz)[0].url
+                  : ''
+              "
+              alt=""
+              width="50px"
+              height="50px"
+            />
+          </div>
+        </el-table-column>
+        <el-table-column
+          width="80"
+          align="center"
+          label="交强险"
+        >
+          <div slot slot-scope="scope">
+            <img
+              v-if="
+                scope.row.jqx &&
+                JSON.parse(scope.row.jqx).length > 0
+              "
+              :preview="
+                JSON.parse(scope.row.jqx)[0]
+                  ? $store.state.FILEURL +
+                    JSON.parse(scope.row.jqx)[0].url
+                  : ''
+              "
+              :src="
+                JSON.parse(scope.row.jqx)[0]
+                  ? $store.state.FILEURL +
+                    JSON.parse(scope.row.jqx)[0].url
+                  : ''
+              "
+              alt=""
+              width="50px"
+              height="50px"
+            />
+          </div>
+        </el-table-column>
+        <el-table-column
+          width="80"
+          align="center"
+          label="其他证明"
+        >
+          <div slot slot-scope="scope">
+            <img
+              v-if="
+                scope.row.otherProve &&
+                JSON.parse(scope.row.otherProve).length > 0
+              "
+              :preview="
+                JSON.parse(scope.row.otherProve)[0]
+                  ? $store.state.FILEURL +
+                    JSON.parse(scope.row.otherProve)[0].url
+                  : ''
+              "
+              :src="
+                JSON.parse(scope.row.otherProve)[0]
+                  ? $store.state.FILEURL +
+                    JSON.parse(scope.row.otherProve)[0].url
+                  : ''
+              "
+              alt=""
+              width="50px"
+              height="50px"
+            />
+          </div>
+        </el-table-column>
         <el-table-column
           :label="$t('message.deviceManage.operation')"
-          align="center" width="280px"
+          align="center"
+          width="280px"
         >
           <template slot-scope="scope">
             <div class="tableBtns">
@@ -165,15 +357,22 @@
                         </div>
                         <div @click="bao(scope.row)" class="operationText"><img src="@/assets/images/bao.png" alt="">{{$t('message.alarmValueSet.bjz')}}
                         </div>-->
-              <!-- <div @click="showDetail(scope.row.id)" class="operationText">
+              <div @click="showDetail(scope.row.id)" class="operationText">
                 <img
                   src="@/assets/images/tableIcon/showReply.png"
                   width="15px"
                   height="15px"
                 />
                 <span>下发详情</span>
-              </div> -->
+              </div>
-              <div v-permission="{key: 'clgl_edit', menuPath: '/project/carManage/carManage'}"  @click="edit(scope.row)" class="operationText">
+              <div
+                v-permission="{
+                  key: 'clgl_edit',
+                  menuPath: '/project/carManage/carManage',
+                }"
+                @click="edit(scope.row)"
+                class="operationText"
+              >
                 <img
                   src="@/assets/images/icon-edit.png"
                   width="15px"
@@ -181,7 +380,14 @@
                 />
                 <span>{{ $t("message.deviceManage.edit") }}</span>
               </div>
-              <div v-permission="{key: 'clgl_delete', menuPath: '/project/carManage/carManage'}" @click="deleteDev(scope.row)" class="operationText">
+              <div
+                v-permission="{
+                  key: 'clgl_delete',
+                  menuPath: '/project/carManage/carManage',
+                }"
+                @click="deleteDev(scope.row)"
+                class="operationText"
+              >
                 <img
                   src="@/assets/images/icon-delete.png"
                   width="15px"
@@ -223,10 +429,7 @@
           class="dialogFormBox"
         >
           <!-- 企业 -->
-          <el-form-item
+          <el-form-item label="企业" prop="enterpriseId">
-            label="企业"
-            prop="enterpriseId"
-          >
             <el-select
               v-model="addEditForm.enterpriseId"
               :placeholder="$t('message.carManage.placeholder_select')"
@@ -249,6 +452,7 @@
             <el-radio-group v-model="addEditForm.carModuleType">
               <el-radio :label="1">固定车辆</el-radio>
               <el-radio :label="2">临时车辆</el-radio>
+              <el-radio :label="3">外来车辆</el-radio>
             </el-radio-group>
           </el-form-item>
 
@@ -257,9 +461,9 @@
             :label="$t('message.carManage.reserveStartTime')"
             prop="reserveStartTime"
             :rules="
-              this.addEditForm.carModuleType === 2 ? reserveStartTimeRule : []
+              [2,3].includes(addEditForm.carModuleType) ? reserveStartTimeRule : []
             "
-            v-if="this.addEditForm.carModuleType === 2"
+            v-if="[2,3].includes(addEditForm.carModuleType)"
           >
             <el-date-picker
               v-model="addEditForm.reserveStartTime"
@@ -276,9 +480,9 @@
             :label="$t('message.carManage.reserveEndTime')"
             prop="reserveEndTime"
             :rules="
-              this.addEditForm.carModuleType === 2 ? reserveEndTimeRule : []
+              [2,3].includes(addEditForm.carModuleType) ? reserveEndTimeRule : []
             "
-            v-if="this.addEditForm.carModuleType === 2"
+            v-if="[2,3].includes(addEditForm.carModuleType)"
           >
             <el-date-picker
               v-model="addEditForm.reserveEndTime"
@@ -295,8 +499,8 @@
           <el-form-item
             :label="$t('message.carManage.entryAndExitPermit')"
             prop="entryAndExitPermit"
-            :rules="this.addEditForm.carModuleType === 2 ? isRequireRule : []"
+            :rules="[2,3].includes(addEditForm.carModuleType) ? isRequireRule : []"
-            v-if="this.addEditForm.carModuleType === 2"
+            v-if="[2,3].includes(addEditForm.carModuleType)"
           >
             <el-radio-group v-model="addEditForm.entryAndExitPermit">
               <el-radio :label="0">单次</el-radio>
@@ -335,7 +539,86 @@
             ><!--:on-preview="handlePictureCardPreview"-->
             <!--                        {{showImgUrl}}-->
           </el-form-item>
-
+          <!-- 驾驶证 -->
+          <el-form-item
+            label="驾驶证"
+            prop="jsz"
+            v-if="[2,3].includes(addEditForm.carModuleType)"
+          >
+            <el-upload
+              :action="$store.state.UPLOADURL"
+              list-type="picture-card"
+              multiple
+              name="files"
+              :limit="1"
+              :file-list="fileList2"
+              :on-success="handleSuccess2"
+              :on-remove="handleRemove2"
+            >
+              <i class="el-icon-plus"></i> </el-upload
+            ><!--:on-preview="handlePictureCardPreview"-->
+            <!--                        {{showImgUrl}}-->
+          </el-form-item>
+          <!-- 行驶证 -->
+          <el-form-item
+            label="行驶证"
+            prop="xsz"
+            v-if="[2,3].includes(addEditForm.carModuleType)"
+          >
+            <el-upload
+              :action="$store.state.UPLOADURL"
+              list-type="picture-card"
+              multiple
+              name="files"
+              :limit="1"
+              :file-list="fileList3"
+              :on-success="handleSuccess3"
+              :on-remove="handleRemove3"
+            >
+              <i class="el-icon-plus"></i> </el-upload
+            ><!--:on-preview="handlePictureCardPreview"-->
+            <!--                        {{showImgUrl}}-->
+          </el-form-item>
+          <!-- 交强险 -->
+          <el-form-item
+            label="交强险"
+            prop="jqx"
+            v-if="[2,3].includes(addEditForm.carModuleType)"
+          >
+            <el-upload
+              :action="$store.state.UPLOADURL"
+              list-type="picture-card"
+              multiple
+              name="files"
+              :limit="1"
+              :file-list="fileList4"
+              :on-success="handleSuccess4"
+              :on-remove="handleRemove4"
+            >
+              <i class="el-icon-plus"></i> </el-upload
+            ><!--:on-preview="handlePictureCardPreview"-->
+            <!--                        {{showImgUrl}}-->
+          </el-form-item>
+          <!-- 其他证明 -->
+          <el-form-item
+            label="其他证明"
+            prop="otherProve"
+            v-if="[2,3].includes(addEditForm.carModuleType)"
+          >
+            <el-upload
+              :action="$store.state.UPLOADURL"
+              list-type="picture-card"
+              multiple
+              name="files"
+              :limit="1"
+              :file-list="fileList5"
+              :on-success="handleSuccess5"
+              :on-remove="handleRemove5"
+            >
+              <i class="el-icon-plus"></i> </el-upload
+            ><!--:on-preview="handlePictureCardPreview"-->
+            <!--                        {{showImgUrl}}-->
+          </el-form-item>
           <!-- 车辆颜色 -->
           <el-form-item
             :label="$t('message.carManage.carColor')"
@@ -375,11 +658,11 @@
           <!-- 司机姓名 -->
           <el-form-item
             :label="$t('message.carManage.driverName')"
-            prop="driverName"
+            prop="driverWorkerName"
-            v-if="COMPANY == 'neimenggu'"
+            v-if="COMPANY == 'neimenggu' || addEditForm.carModuleType == 3"
           >
             <el-input
-              v-model="addEditForm.driverName"
+              v-model="addEditForm.driverWorkerName"
               :placeholder="$t('message.deviceManage.placeholder')"
             ></el-input>
           </el-form-item>
@@ -586,10 +869,13 @@ import {
   getCarCameraListApi,
 } from "../../../assets/js/api/carManage";
 import { getProjectChilderSystemUserListApi } from "@/assets/js/api/configManage";
-import { getWorkerInfoList, getEnterpriseInfoList, 
+import {
+  getWorkerInfoList,
+  getEnterpriseInfoList,
   xmglXzHikvisionSyncGetNewestList,
-  xmglXzHikvisionSyncRetryAPI, } from "@/assets/js/api/laborPerson";
+  xmglXzHikvisionSyncRetryAPI,
-import store from '@/store'
+} from "@/assets/js/api/laborPerson";
+import store from "@/store";
 export default {
   data() {
     var validReserveStartTime = (rule, value, callback) => {
@@ -625,6 +911,14 @@ export default {
       }
     };
     return {
+      sendStatusArr: [
+        { name: "成功", value: 1 },
+        { name: "失败", value: 2 },
+        { name: "部分成功", value: 3 },
+      ],
+      tableParameter: {
+        sendSuccessStatus: null,
+      },
       enterpriseListData: [],
       uDevAllList: [],
       isIndeterminate2: false,
@@ -652,8 +946,12 @@ export default {
       startEndTimeArr: [],
       COMPANY: COMPANY,
       fileList: [],
+      fileList2: [],
+      fileList3: [],
+      fileList4: [],
+      fileList5: [],
       showImgUrl: "",
-      editPermission:false,
+      editPermission: false,
       props: {
         multiple: true,
       },
@@ -758,7 +1056,7 @@ export default {
             trigger: "change",
           },
         ],
-        driverName: [
+        driverWorkerName: [
           {
             required: true,
             message: this.$t("message.carManage.required"),
@@ -816,7 +1114,7 @@ export default {
     this.getAppWorkerList();
     this.getUDevList();
     this.getEnterpriseListFn();
-    this.getBlackWhiteBoole()
+    this.getBlackWhiteBoole();
   },
   methods: {
     // 展示下发详情
@@ -840,9 +1138,12 @@ export default {
       });
       console.log(res);
     },
-    getBlackWhiteBoole(){
+    getBlackWhiteBoole() {
-      let clgl = {key: 'clgl_blackWhiteList', menuPath: '/project/carManage/carManage'}
+      let clgl = {
-      console.log('1111111111111111111111111',this.checkPermission(clgl) );
+        key: "clgl_blackWhiteList",
+        menuPath: "/project/carManage/carManage",
+      };
+      console.log("1111111111111111111111111", this.checkPermission(clgl));
       this.editPermission = this.checkPermission(clgl);
     },
     // 获取企业分级列表
@@ -899,7 +1200,7 @@ export default {
         this.addEditForm.entryAndExitPermit = null;
         this.getStratEndTime();
       }
-      if (this.addEditForm.carModuleType === 2) {
+      if ([2,3].includes(this.addEditForm.carModuleType)) {
         this.addEditForm.reserveStartTime = "";
         this.addEditForm.reserveEndTime = "";
         this.addEditForm.entryAndExitPermit = "";
@@ -942,6 +1243,42 @@ export default {
           file.url = this.$store.state.FILEURL + file.url;
         });
       }
+      if (typeof obj.jsz === "string") {
+        this.addEditForm.jsz =
+          obj.jsz != "" ? JSON.parse(obj.jsz) : [];
+        this.fileList2 = this.addEditForm.jsz;
+        this.fileList2.map((file) => {
+          console.log("url", file.url);
+          file.url = this.$store.state.FILEURL + file.url;
+        });
+      }
+      if (typeof obj.xsz === "string") {
+        this.addEditForm.xsz =
+          obj.xsz != "" ? JSON.parse(obj.xsz) : [];
+        this.fileList3 = this.addEditForm.xsz;
+        this.fileList3.map((file) => {
+          console.log("url", file.url);
+          file.url = this.$store.state.FILEURL + file.url;
+        });
+      }
+      if (typeof obj.jqx === "string") {
+        this.addEditForm.jqx =
+          obj.jqx != "" ? JSON.parse(obj.jqx) : [];
+        this.fileList4 = this.addEditForm.jqx;
+        this.fileList4.map((file) => {
+          console.log("url", file.url);
+          file.url = this.$store.state.FILEURL + file.url;
+        });
+      }
+      if (typeof obj.otherProve === "string") {
+        this.addEditForm.otherProve =
+          obj.otherProve != "" ? JSON.parse(obj.otherProve) : [];
+        this.fileList5 = this.addEditForm.otherProve;
+        this.fileList5.map((file) => {
+          console.log("url", file.url);
+          file.url = this.$store.state.FILEURL + file.url;
+        });
+      }
       if (
         typeof obj.alarmPushWorkerId === "string" &&
         obj.alarmPushWorkerId != ""
@@ -992,9 +1329,14 @@ export default {
     },
     submit() {
       this.processTheFile();
+      this.processTheFile2();
+      this.processTheFile3();
+      this.processTheFile4();
+      this.processTheFile5();
       let params = JSON.parse(JSON.stringify(this.addEditForm));
       // params.startEndTimeArr = []
       // params.startEndTimeArr.push(params.reserveStartTime,params.reserveEndTime)
+      // 车辆图片
       var arr = [],
         arr2 = JSON.parse(params.carPhotosUrl);
       if (arr2.length > 0) {
@@ -1007,6 +1349,58 @@ export default {
         });
       }
       params.carPhotosUrl = JSON.stringify(arr);
+      // 驾驶证
+      var arrJsz = [],
+      arrJsz2 = JSON.parse(params.jsz);
+      if (arrJsz2.length > 0) {
+        arrJsz2.forEach((element) => {
+          var item = element;
+          if (element.url.indexOf("http://") != -1) {
+            item.url = element.url.split("/image/")[1];
+          }
+          arrJsz.push(item);
+        });
+      }
+      params.jsz = JSON.stringify(arrJsz);
+      // 行驶证
+      var arrXsz = [],
+      arrXsz2 = JSON.parse(params.xsz);
+      if (arrXsz2.length > 0) {
+        arrXsz2.forEach((element) => {
+          var item = element;
+          if (element.url.indexOf("http://") != -1) {
+            item.url = element.url.split("/image/")[1];
+          }
+          arrXsz.push(item);
+        });
+      }
+      params.xsz = JSON.stringify(arrXsz);
+      // 交强险
+      var arrJqx = [],
+      arrJqx2 = JSON.parse(params.jqx);
+      if (arrJqx2.length > 0) {
+        arrJqx2.forEach((element) => {
+          var item = element;
+          if (element.url.indexOf("http://") != -1) {
+            item.url = element.url.split("/image/")[1];
+          }
+          arrJqx.push(item);
+        });
+      }
+      params.jqx = JSON.stringify(arrJqx);
+      // 其他证明
+      var arrOther = [],
+      arrOther2 = JSON.parse(params.otherProve);
+      if (arrOther2.length > 0) {
+        arrOther2.forEach((element) => {
+          var item = element;
+          if (element.url.indexOf("http://") != -1) {
+            item.url = element.url.split("/image/")[1];
+          }
+          arrOther.push(item);
+        });
+      }
+      params.otherProve = JSON.stringify(arrOther);
       params.projectSn = this.$store.state.projectSn;
       if (this.addEditForm.alarmPushWorkerId) {
         params.alarmPushWorkerId = this.addEditForm.alarmPushWorkerId.join(",");
@@ -1053,14 +1447,14 @@ export default {
         }
       });
     },
-    blackSwich(e,rowObj) {
+    blackSwich(e, rowObj) {
-      console.log(e,rowObj)
+      console.log(e, rowObj);
       // let params = JSON.parse(JSON.stringify(this.addEditForm));
       // params.projectSn = this.$store.state.projectSn;
       let requestData = {
         ...rowObj,
-        isBlack: e
+        isBlack: e,
-      }
+      };
       // if (isBlack === 1) params.isBlack = 0;
       // if (isBlack === 0) params.isBlack = 1;
       editCarInfoApi(requestData).then((result) => {
@@ -1073,6 +1467,7 @@ export default {
     refresh() {
       this.carNumber = "";
       this.isBlack = "";
+      this.tableParameter.sendSuccessStatus = null;
       this.pagInfo.pageNo = 1; //页数
       this.pagInfo.pageSize = 10; //条数
       this.getList();
@@ -1084,6 +1479,7 @@ export default {
         projectSn: this.$store.state.projectSn,
         carNumber: this.carNumber,
         isBlack: this.isBlack,
+        sendSuccessStatus: this.tableParameter.sendSuccessStatus
       }).then((result) => {
         if (result.success) {
           this.List = result.result.records;
@@ -1125,6 +1521,98 @@ export default {
       // console.log('处理el上传的结构后转字符串', JSON.stringify(this.registerInfo.licenseFile));
       // console.log('最终要上传的图片', this.registerInfo.licenseFile)
     },
+    processTheFile2() {
+      //处理el上传的文件格式(结构)
+      this.addEditForm.jsz = [];
+      this.fileList2.map((item) => {
+        if (!item.response) {
+          this.addEditForm.jsz.push(item);
+          // console.log('符合的结构', item)
+        } else if (item.response) {
+          // console.log('不符合的结构', item)
+          this.addEditForm.jsz.push({
+            name: item.response.data[0].filename,
+            url: item.response.data[0].imageUrl,
+          });
+        }
+      });
+      console.log("处理el上传的结构后", this.addEditForm.jsz);
+      this.addEditForm.jsz = JSON.stringify(
+        this.addEditForm.jsz
+      );
+      console.log("转字符串后", this.addEditForm.jsz);
+      // console.log('处理el上传的结构后转字符串', JSON.stringify(this.registerInfo.licenseFile));
+      // console.log('最终要上传的图片', this.registerInfo.licenseFile)
+    },
+    processTheFile3() {
+      //处理el上传的文件格式(结构)
+      this.addEditForm.xsz = [];
+      this.fileList3.map((item) => {
+        if (!item.response) {
+          this.addEditForm.xsz.push(item);
+          // console.log('符合的结构', item)
+        } else if (item.response) {
+          // console.log('不符合的结构', item)
+          this.addEditForm.xsz.push({
+            name: item.response.data[0].filename,
+            url: item.response.data[0].imageUrl,
+          });
+        }
+      });
+      console.log("处理el上传的结构后", this.addEditForm.xsz);
+      this.addEditForm.xsz = JSON.stringify(
+        this.addEditForm.xsz
+      );
+      console.log("转字符串后", this.addEditForm.xsz);
+      // console.log('处理el上传的结构后转字符串', JSON.stringify(this.registerInfo.licenseFile));
+      // console.log('最终要上传的图片', this.registerInfo.licenseFile)
+    },
+    processTheFile4() {
+      //处理el上传的文件格式(结构)
+      this.addEditForm.jqx = [];
+      this.fileList4.map((item) => {
+        if (!item.response) {
+          this.addEditForm.jqx.push(item);
+          // console.log('符合的结构', item)
+        } else if (item.response) {
+          // console.log('不符合的结构', item)
+          this.addEditForm.jqx.push({
+            name: item.response.data[0].filename,
+            url: item.response.data[0].imageUrl,
+          });
+        }
+      });
+      console.log("处理el上传的结构后", this.addEditForm.jqx);
+      this.addEditForm.jqx = JSON.stringify(
+        this.addEditForm.jqx
+      );
+      console.log("转字符串后", this.addEditForm.jqx);
+      // console.log('处理el上传的结构后转字符串', JSON.stringify(this.registerInfo.licenseFile));
+      // console.log('最终要上传的图片', this.registerInfo.licenseFile)
+    },
+    processTheFile5() {
+      //处理el上传的文件格式(结构)
+      this.addEditForm.otherProve = [];
+      this.fileList5.map((item) => {
+        if (!item.response) {
+          this.addEditForm.otherProve.push(item);
+          // console.log('符合的结构', item)
+        } else if (item.response) {
+          // console.log('不符合的结构', item)
+          this.addEditForm.otherProve.push({
+            name: item.response.data[0].filename,
+            url: item.response.data[0].imageUrl,
+          });
+        }
+      });
+      console.log("处理el上传的结构后", this.addEditForm.otherProve);
+      this.addEditForm.otherProve = JSON.stringify(
+        this.addEditForm.otherProve
+      );
+      console.log("转字符串后", this.addEditForm.otherProve);
+      // console.log('处理el上传的结构后转字符串', JSON.stringify(this.registerInfo.licenseFile));
+      // console.log('最终要上传的图片', this.registerInfo.licenseFile)
+    },
     handlePictureCardPreview() {
       this.showImgUrl = this.addEditForm.carPhotosUrl[0].url;
       // this.showImgUrl = this.$store.state.FILEURL + this.addEditForm.carPhotosUrl[0].url;
@@ -1134,9 +1622,37 @@ export default {
       console.log("图片上传成功", fileList);
       this.fileList = fileList;
     },
+    handleSuccess2(response, file, fileList){
+      console.log("图片上传成功", fileList);
+      this.fileList2 = fileList;
+    },
+    handleSuccess3(response, file, fileList){
+      console.log("图片上传成功", fileList);
+      this.fileList3 = fileList;
+    },
+    handleSuccess4(response, file, fileList){
+      console.log("图片上传成功", fileList);
+      this.fileList4 = fileList;
+    },
+    handleSuccess5(response, file, fileList){
+      console.log("图片上传成功", fileList);
+      this.fileList5 = fileList;
+    },
     handleRemove(response, fileList) {
       this.fileList = fileList;
     },
+    handleRemove2(response, fileList){
+      this.fileList2 = fileList;
+    },
+    handleRemove3(response, fileList){
+      this.fileList3 = fileList;
+    },
+    handleRemove4(response, fileList){
+      this.fileList4 = fileList;
+    },
+    handleRemove5(response, fileList){
+      this.fileList5 = fileList;
+    },
     SizeChange(val) {
       this.pagInfo.pageSize = val;
       this.getList();
@@ -1202,4 +1718,19 @@ export default {
     margin-right: 15px;
   }
 }
+
+.valuesColor {
+  color: #fff;
+  padding: 3px;
+}
+
+.yellow {
+  background-color: #fbe000;
+}
+.green {
+  background-color: #72cb40;
+}
+.red {
+  background-color: #ec373e;
+}
 </style>

src/views/projectFront/laborManage/rosterNew.vue

@@ -109,6 +109,20 @@
               v-model="tableParameter.idCard"
             ></el-input>
           </el-form-item>
+          <el-form-item label="人员下发状态">
+            <el-select
+              size="medium"
+              v-model="tableParameter.sendSuccessStatus"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="(item,index) in sendStatusArr"
+                :key="index"
+                :label="item.name"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item>
             <el-button
             v-permission="{key: 'hmc_query', menuPath: '/project/labor/roster'}"
@@ -130,6 +144,7 @@
                 tableParameter.inserviceType = '';
                 tableParameter.personType = '';
                 tableParameter.idCard = '';
+                tableParameter.sendSuccessStatus = null
                 getInfoList();
               "
               plain
@@ -946,6 +961,11 @@ export default {
   },
   data() {
     return {
+      sendStatusArr: [
+          {name: "成功",value: 1},
+          {name: "失败",value: 2},
+          {name: "部分成功",value: 3}
+      ],
       issuePointList: [],
       comboFormVisible: false,
       tableData: [],
@@ -1012,6 +1032,7 @@ export default {
       },
       enterpriseListData: [],
       tableParameter: {
+        sendSuccessStatus: null,
         idCard: "",
         personType: "",
         workerName: "",
@@ -1202,9 +1223,10 @@ export default {
     getInfoList() {
       let data = {
         personType: this.tableParameter.personType, //人员类型
-        enterpriseId: this.tableParameter.enterpriseId, //所属企业
+        enterpriseId: this.tableParameter.enterpriseId + "", //所属企业
         inserviceType: this.tableParameter.inserviceType, //在职状态
         idCard: this.tableParameter.idCard, //身份证号
+        sendSuccessStatus: this.tableParameter.sendSuccessStatus, // 下发状态
         workerName: this.tableParameter.workerName, //姓名
         codeState: this.tableParameter.codeState,
         projectSn: this.projectSn,
@@ -1547,7 +1569,10 @@ export default {
     padding: 15px 0;
     box-sizing: border-box;
     width: 100%;
-    height: calc(100% - 42px);
+    // height: calc(100% - 42px);
+    height: 100%;
+    display: flex;
+    flex-direction: column;
   }
   .title_wrap {
     width: 100%;