111

src/views/duChaGuanLi/duChaRenYuanList.vue

@@ -17,7 +17,7 @@
       <a-button
         v-show="showEdit"
         @click="editHandler"
-        :disabled="!objType"
+        :disabled="!localObjType"
         type="primary"
         icon="edit"
         size="small"
@@ -37,25 +37,25 @@
       ref="dcryTable">
       <template #bodyCell="{ column, record, text, index }">
         <template v-if="column.dataIndex === 'personType_jc'">
-          <span v-if="objType == '1'">{{ record.personType_sk }}</span>
-          <span v-else-if="objType == '8'">{{ record.personType_jc }}</span>
+          <span v-if="localObjType == '1'">{{ record.personType_sk }}</span>
+          <span v-else-if="localObjType == '8'">{{ record.personType_jc }}</span>
           <span v-else>{{ record.personType }}</span>
         </template>
         <template v-else-if="column.dataIndex === 'action'">
-          <span v-if="(objType == '1' || objType == '50' || objType == '51' || objType == '52' || objType == '58' || objType == '59' || objType == '60' || objType == '64' || objType == '61' || objType == '63' || objType == '18' || objType == '65' || objType == '66' || objType == '85' || objType == '86' || objType == '87' || objType == '88' || objType == '90' || objType == '92' || objType == '107' || objType == '109' || objType == '111' || objType == '114' || objType == '117' || objType == '1110') && ownPriv('manage')">
+          <span v-if="(localObjType == '1' || localObjType == '50' || localObjType == '51' || localObjType == '52' || localObjType == '58' || localObjType == '59' || localObjType == '60' || localObjType == '64' || localObjType == '61' || localObjType == '63' || localObjType == '18' || localObjType == '65' || localObjType == '66' || localObjType == '85' || localObjType == '86' || localObjType == '87' || localObjType == '88' || localObjType == '90' || localObjType == '92' || localObjType == '107' || localObjType == '109' || localObjType == '111' || localObjType == '114' || localObjType == '117' || localObjType == '1110') && ownPriv('manage')">
             <a-select v-model:value="record.pertype" @change="(val) => {swzzHandler(record, val)}" placeholder="请选择" size="small" style="width: 100px">
               <a-select-option v-for="item in options" :key="item.value" :value="item.value">{{ item.label }}</a-select-option>
             </a-select>
             <img src="../../assets/img/delete.png" @click="deleteHandler(record)" title="删除" style="cursor:pointer;width: 20px;">
           </span>
-          <span v-else-if="objType=='8' && ownPriv('manage')">
+          <span v-else-if="localObjType=='8' && ownPriv('manage')">
             <a-select v-model:value="record.pertype" @change="(val) => {swzzHandler(record, val)}" placeholder="请选择" size="small" style="width: 100px">
               <a-select-option v-for="item in options8" :key="item.value" :value="item.value">{{ item.label }}</a-select-option>
             </a-select>
             <img src="../../assets/img/delete.png" @click="deleteHandler(record)" title="删除" style="cursor:pointer;width: 20px;">
           </span>
-          <span v-else-if="ownPriv('manage') && objType != '1' && objType != '8' && objType != '50' && objType != '51' && objType != '52' && objType != '58' && objType != '59' && objType != '60' && objType != '64' && objType != '61' && objType != '63' && objType != '65' && objType != '66' && objType != '18' && objType != '107' && objType != '109' && objType != '111' && objType != '114' && objType != '117' && objType != '1110'">
-            <span v-if="objType != '1' && objType != '8' && objType != '50' && objType != '51' && objType != '52' && objType != '66' && objType != '85' && objType != '86' && objType != '87' && objType != '88' && objType != '90' && objType != '92' && objType != '107' && objType != '109' && objType != '111' && objType != '114' && objType != '117' && objType != '1110'">
+          <span v-else-if="ownPriv('manage') && localObjType != '1' && localObjType != '8' && localObjType != '50' && localObjType != '51' && localObjType != '52' && localObjType != '58' && localObjType != '59' && localObjType != '60' && localObjType != '64' && localObjType != '61' && localObjType != '63' && localObjType != '65' && localObjType != '66' && localObjType != '18' && localObjType != '107' && localObjType != '109' && localObjType != '111' && localObjType != '114' && localObjType != '117' && localObjType != '1110'">
+            <span v-if="localObjType != '1' && localObjType != '8' && localObjType != '50' && localObjType != '51' && localObjType != '52' && localObjType != '66' && localObjType != '85' && localObjType != '86' && localObjType != '87' && localObjType != '88' && localObjType != '90' && localObjType != '92' && localObjType != '107' && localObjType != '109' && localObjType != '111' && localObjType != '114' && localObjType != '117' && localObjType != '1110'">
               <img src="../../assets/img/zuzhang.png" v-if="record.pertype != '1'" @change="(val) => {swzzHandler(record, '1')}" title="设为组长" style="cursor:pointer;width: 20px;">
               <img src="../../assets/img/qxzuzhang.png" v-else @click="qxzzHandler(record)" title="取消组长" style="cursor:pointer;width: 20px;">
               <img src="../../assets/img/delete.png" @click="deleteHandler(record)" title="删除" style="cursor:pointer;width: 20px;">
@@ -84,6 +84,7 @@ export default {
       showEdit: true,
       tableData: [],
       currentShowList: [],
+      localObjType: '',
       tableHeight: window.innerHeight - 280,
       isAll: '1',
       options: [
@@ -395,6 +396,10 @@ export default {
     }
   },
   methods: {
+    setObjType(val) {
+      this.localObjType = val || this.objType;
+      console.log(this.localObjType,'setObjType');
+    },
     // 判断当前用户 是否在该节点下   在 则没有删除权限
     userInThisGroup() {
       if (this.userInAllNode && this.userInAllNode.length > 0) {

src/views/duChaJiHua/planManageProvinceNew.vue

@@ -57,6 +57,7 @@ export default {
     },
     duChaType() {
       return this.orgType ? this.orgType.replace(/\b(0+)/gi, '') : '';
+      console.log(this.orgType);
     },
   },
   components: {

src/views/duChaJiHua/planManageProvinceNew/planContent.vue

@@ -181,6 +181,7 @@ export default {
        if (!val?.currentSelectTreeNodeId) return;
        setTimeout(() => {
          this.$refs.renYuanList?.getDcryResult?.(val.currentSelectTreeNodeId);
+         this.$refs.renYuanList?.setObjType?.(this.duChaType);
          this.$refs.qyList?.getDcqyResult?.(val.currentSelectTreeNodeId);
          this.$refs.duiXiangList?.getDcdxList1?.(val.currentSelectTreeNodeId);
        }, 0);

src/views/duChaWenTi/dealproblem_dialog.vue

@@ -111,14 +111,17 @@
             </a-carousel>
           </a-tab-pane>
           <a-tab-pane :tab="filetabName" key="4">
-            <a-table :columns="columns" bordered :data-source="fileArray" style="width: 100%;margin: 0 auto;">
-              <span slot="action" slot-scope="text">
-                <p>
-                  <a :href="`${hostUrl}/${text.filePath}`" target="_blank" rel="noopener noreferrer">
-                    {{ text.fileName }}
-                  </a>
-                </p>
-              </span>
+            <a-table :columns="columns" bordered :data-source="fileArray" style="width: 100%;margin: 0 auto;"
+            >
+              <template #bodyCell="{ column, record }">
+                <template v-if="column.dataIndex==='action'">
+                  <p>
+                    <a :href="`${hostUrl}/${record.filePath}`" target="_blank" rel="noopener noreferrer">
+                      {{ record.fileName }}
+                    </a>
+                  </p>
+                </template>
+              </template>
             </a-table>
           </a-tab-pane>
         </a-tabs>
@@ -160,14 +163,17 @@
             </a-carousel>
           </a-tab-pane>
           <a-tab-pane :tab="filetabName1" key="4">
-            <a-table :columns="columns2" bordered :data-source="fileArray1" style="width: 100%;margin: 0 auto;">
-              <span slot="action" slot-scope="text">
-                <p>
-                  <a :href="`${hostUrl}/${text.filePath}`" target="_blank" rel="noopener noreferrer">
-                    {{ text.fileName }}
-                  </a>
-                </p>
-              </span>
+            <a-table :columns="columns2" bordered :data-source="fileArray1" style="width: 100%;margin: 0 auto;"
+            >
+              <template #bodyCell="{ column, record }">
+                <template v-if="column.dataIndex==='action'">
+                  <p>
+                    <a :href="`${hostUrl}/${record.filePath}`" target="_blank" rel="noopener noreferrer">
+                      {{ record.fileName }}
+                    </a>
+                  </p>
+                </template>
+              </template>
             </a-table>
           </a-tab-pane>
         </a-tabs>
@@ -181,21 +187,19 @@
           :data-source="ApprovalHistory"
           :pagination="false"
           row-key="id"
-          style="width: 100%;">
-          <span slot="workflowStat" slot-scope="text">
-            {{ transferProcStatCodeToName(text.workflowStat) }}
-          </span>
-          <span slot="isag" slot-scope="text">
-            <span
-              style="padding: 3px 10px;background:#00ff00;border-radius:15px;color:rgba(0,0,0,1)"
-              v-if="text.isag == 1">同意</span>
-            <span
-              style="padding: 3px 10px;background:#ffcc33;border-radius:15px;color:rgba(0,0,0,1)"
-              v-if="text.isag == 0">退回</span>
-          </span>
-          <span slot="moddate" slot-scope="text">
-            {{ text.moddate ? formatDateTime(text.moddate) : '' }}
-          </span>
+          style="width: 100%;"
+        >
+          <template #bodyCell="{ column, record }">
+            <template v-if="column.dataIndex==='workflowStat'">
+              {{ record._wsLabel || record.workflowStat }}
+            </template>
+            <template v-if="column.dataIndex==='isag'">
+              {{ record._isagLabel || (String(record.isag) === '1' ? '同意' : '退回') }}
+            </template>
+            <template v-if="column.dataIndex==='moddate'">
+              {{ record.moddate ? formatDateTime(record.moddate) : '' }}
+            </template>
+          </template>
         </a-table>
       </div>
     </div>
@@ -283,6 +287,18 @@ export default {
       videoArray: [],
       fileArray: [],
       ApprovalHistory: [],
+      workflowStatList: [
+        { label: '专家提交待审核', value: '10' },
+        { label: '组内审核', value: '11' },
+        { label: '专家修改', value: '12' },
+        { label: '监督处审核', value: '13' },
+        { label: '责任处室（单位）审核', value: '14' },
+        { label: '责任处室（单位）领导审核', value: '14-1' },
+        { label: '组内组织修改-监督处退回', value: '15' },
+        { label: '监督处生成初步问题清单', value: '16' },
+        { label: '组内组织修改-业务处退回', value: '18' },
+        { label: '责任处室（单位）审核-责任处室（单位）领导退回', value: '18-1' },
+      ],
       audiotabName: '',
       videotabName: '',
       picturetabName: '',
@@ -442,12 +458,16 @@ export default {
         .then((res) => {
           if (res.success) {
             this.ApprovalHistory = res.data;
+            this.ApprovalHistory.forEach((item) => {
+              const wsItem = this.workflowStatList.find(
+                (i) => String(i.value) === String(item.workflowStat)
+              );
+              item._wsLabel = wsItem ? wsItem.label : item.workflowStat;
+              item._isagLabel = String(item.isag) === '1' ? '同意' : '退回';
+            });
           }
         });
     },
-    transferProcStatCodeToName(ActCode) {
-      return transferProcStatCodeToName(ActCode);
-    },
     /*  checkProcStat() {
         this.isModifyAct = (parseInt(this.changeSupervision.workflowStat) == 11 ||
           parseInt(this.changeSupervision.workflowStat) == 12 ||
@@ -618,7 +638,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 @import '../../assets/style/global.css';
 .upload-container {
   width: 100%;

src/views/duChaWenTi/duChaWenTi_dczfzzwtcz.vue

@@ -204,11 +204,11 @@
                             currentWorkflowStat == '13'
                         "
                         style="color:rgba(255,255,255,1);float:right;margin-right:10px;margin-top:5px;"
-                        type="danger"
+                        type="primary"
+                        danger
                         @click="batchCheck"
                         :loading="batchButtonLoading"
-                      >&nbsp;批量审核&nbsp;</a-button
-                      >
+                      >&nbsp;批量审核&nbsp;</a-button>
                       <a-button
                         style="color:rgba(255,255,255,1);float:right;margin-right:10px;margin-top:5px;"
                         type="primary"
@@ -494,8 +494,7 @@
                           <a-date-picker
                             v-model:value="changeSupervision.collTime"
                             disabled
-                            type="date"
-                          ></a-date-picker>
+                          />
                         </a-form-item>
                         <a-form-item
                           label="整改时限"
@@ -505,9 +504,8 @@
                           <a-date-picker
                             v-model:value="changeSupervision.zgDate"
                             format="YYYY-MM-DD"
-                            value-format="YYYY-MM-DD"
-                            type="date"
-                          ></a-date-picker>
+                            valueFormat="YYYY-MM-DD"
+                          />
                         </a-form-item>
                         <a-form-item
                           label="整改要求"
@@ -593,7 +591,7 @@
                                 <a-button
                                   size="small"
                                   @click="removeFile(record.id, index)"
-                                  type="danger"
+                                  type="primary" danger
                                 >删除</a-button
                                 >
                               </template>
@@ -621,7 +619,7 @@
                                 <a-button
                                   size="small"
                                   @click="removeFile(record.id, index)"
-                                  type="danger"
+                                  type="primary" danger
                                 >删除</a-button
                                 >
                               </template>
@@ -649,7 +647,7 @@
                                 <a-button
                                   size="small"
                                   @click="removeFile(record.id, index)"
-                                  type="danger"
+                                  type="primary" danger
                                 >删除</a-button
                                 >
                               </template>
@@ -721,7 +719,7 @@
                                 </elaudio>
                               </template>
                               <template v-else-if="column.dataIndex === 'action'">
-                                <a-button size="small" @click="removeFile(record.id, index)" type="danger">删除</a-button>
+                                <a-button size="small" @click="removeFile(record.id, index)" type="primary" danger>删除</a-button>
                               </template>
                             </template>
                           </a-table>
@@ -738,7 +736,7 @@
                                 </video-player>
                               </template>
                               <template v-else-if="column.dataIndex === 'action'">
-                                <a-button size="small" @click="removeFile(record.id, index)" type="danger">删除</a-button>
+                                <a-button size="small" @click="removeFile(record.id, index)" type="primary" danger>删除</a-button>
                               </template>
                             </template>
                           </a-table>
@@ -756,7 +754,7 @@
                                 </a>
                               </template>
                               <template v-else-if="column.dataIndex === 'action'">
-                                <a-button size="small" @click="removeFile(record.id, index)" type="danger">删除</a-button>
+                                <a-button size="small" @click="removeFile(record.id, index)" type="primary" danger>删除</a-button>
                               </template>
                             </template>
                           </a-table>
@@ -861,12 +859,11 @@
                       <a-date-picker
                         v-model:value="changeTm"
                         format="YYYY-MM-DD"
-                        value-format="YYYY-MM-DD"
+                        valueFormat="YYYY-MM-DD"
                         allow-clear
                         style="width: 300px !important;"
                         placeholder="整改时限"
-                      >
-                      </a-date-picker>
+                      />
                     </a-form-item>
                     <a-form-item label="整改要求" prop="changeRequire">
                       <a-textarea
@@ -3201,6 +3198,7 @@ export default {
         }
 
         // 驱动流程流转到下一步
+        sessionStorage.setItem('Authorization', '1');
         request.post('/dc/insp/pblm/batchSubmit', params).then((res) => {
           if (res.success) {
             this.batchButtonLoading = false;
@@ -3742,9 +3740,8 @@ export default {
     },
     // 提交修改信息
     changeSupervisionInfo() {
-      this.$refs.changeSupFrom.validate((valid) => {
-        if (valid) {
-          this.$nextTick(() => {
+      this.$refs.changeSupFrom.validate().then(() => {
+        this.$nextTick(() => {
             // this.changeSupervisionVisible = true;
             this.buttonLoading = true;
             setTimeout(() => {
@@ -3777,7 +3774,6 @@ export default {
               });
             }, 1000);
           });
-        }
       });
     },
 
@@ -4019,9 +4015,8 @@ export default {
         this.bisInspPblmAudit.auditidea = '';
       }
 
-      this.$refs.changeSupFrom.validate((valid) => {
-        if (valid) {
-          this.$nextTick(() => {
+      this.$refs.changeSupFrom.validate().then(() => {
+        this.$nextTick(() => {
             // this.changeSupervisionVisible = true;
             this.buttonLoading = true;
             setTimeout(() => {
@@ -4077,7 +4072,6 @@ export default {
               });
             }, 1000);
           });
-        }
       });
     },
     submitRectification(row) {
@@ -4096,9 +4090,9 @@ export default {
           return;
         }
       }
-      this.$refs.changeSupFrom.validate((valid) => {
-        if (valid) {
-          this.$nextTick(() => {
+      console.log(this.changeTm);
+      this.$refs.changeSupFrom.validate().then(() => {
+        this.$nextTick(() => {
             // this.changeSupervisionVisible = true;
             this.buttonLoading = true;
             setTimeout(() => {
@@ -4156,7 +4150,6 @@ export default {
               });
             }, 1000);
           });
-        }
       });
       // 先对问题内容进行更新
       // this.changeSupervisionInfo();
@@ -4211,11 +4204,7 @@ export default {
       ) {
         this.changeRequire = this.changeSupervision.proposeZgZgxx;
         // this.changeTm = this.changeSupervision.proposeZgDate || nextMonthLastDay()
-        this.changeTm = this.changeSupervision.zgDate
-          ? moment(this.changeSupervision.zgDate).format('YYYY-MM-DD')
-          : this.changeSupervision.proposeZgDate
-            ? moment(this.changeSupervision.proposeZgDate).format('YYYY-MM-DD')
-            : nextMonthLastDay();
+        this.changeTm = this.changeSupervision.zgDate ? moment(this.changeSupervision.zgDate).format('YYYY-MM-DD') : '';
         if (this.offlineCancellation == 1) {
           this.submitRectification(this.offlineCancellation);
         } else {

src/views/xiTongGuanLi/userManageView.vue

@@ -135,6 +135,7 @@
         :pageSize="searchObj.pageSize"
         @update:pageSize="searchObj.pageSize = $event"
         :total="total"
+        footer="false"
         :page-size-options="['10', '20', '30', '40']"
         :show-total="total => `共${total}条`"
         @showSizeChange="handleSizeChange"
@@ -167,10 +168,10 @@
             </a-select>
           </a-form-item>
         </a-form>
-        <div slot="footer" class="dialog-footer">
+        <template #footer>
           <a-button @click="dialogFormVisible = false">取 消</a-button>
           <a-button type="primary" @click="updateUserInfo">确 定</a-button>
-        </div>
+        </template>
       </a-modal>
     </div>
     <!-- 添加/编辑人员弹窗 -->
@@ -248,10 +249,10 @@
           <a-input v-model:value="addObj.remark" read-only />
         </a-form-item>
       </a-form>
-      <div slot="footer" class="dialog-footer">
+      <template #footer>
         <a-button @click="memberInfoDialog = false">取 消</a-button>
         <a-button type="primary" @click="addMember">确 定</a-button>
-      </div>
+      </template>
     </a-modal>
     <!-- 关联所属机构弹窗 -->
     <a-modal title="关联机构" :open="dialogOrganVisible" @cancel="dialogOrganVisible = false">
@@ -268,10 +269,10 @@
           </provTreeListMultiple>
         </a-form-item>
       </a-form>
-      <div slot="footer" class="dialog-footer">
+      <template #footer>
         <a-button @click="dialogOrganVisible = false">取 消</a-button>
         <a-button type="primary" @click="updateUserOrgan">确 定</a-button>
-      </div>
+      </template>
     </a-modal>
     <add-task-com
       v-if="taskDialogVisible"
@@ -630,6 +631,7 @@ export default {
         ownerSystem: this.editUser.ownerSystem,
         persType: this.editUser.persType,
       };
+      sessionStorage.setItem('Authorization', '1');
       request
         .post(`/bis/insp/updateUser`, paramsObj)
         .then((res) => {
@@ -955,7 +957,7 @@ export default {
 };
 </script>
 
-<style lang='less' scoped>
+<style scoped>
 .user-manage {
   padding: 20px;
   box-sizing: border-box;