From b504a5baa38e2a1a02eda66e1e168108971fd8fc Mon Sep 17 00:00:00 2001
From: huangyuxuan <huangyuxuan@zcloudchina.com>
Date: Thu, 5 Sep 2024 11:16:13 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=B5=81=E7=A8=8B=E8=B0=83=E8=AF=95=EF=BC=8C?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D]=20=20-=20=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=96=B9App=E7=AB=AF=20=E5=AE=89=E5=85=A8=E7=8E=AF?=
 =?UTF-8?q?=E4=BF=9D=E6=A3=80=E6=9F=A5=E6=B5=81=E7=A8=8B=E8=B0=83=E8=AF=95?=
 =?UTF-8?q?=20=20=20=20-=20=E8=A2=AB=E6=A3=80=E6=9F=A5=E4=BA=BA=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 safetyEnvirSubPackages/api/index.js           |  2 +-
 .../pages/inspected/detail.vue                | 43 +++++++++++++------
 .../pages/inspected/list.vue                  |  3 +-
 .../pages/inspector-confirms/detail.vue       |  2 +-
 .../pages/inspector-confirms/list.vue         |  8 ++--
 5 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/safetyEnvirSubPackages/api/index.js b/safetyEnvirSubPackages/api/index.js
index b1920ed..317e900 100644
--- a/safetyEnvirSubPackages/api/index.js
+++ b/safetyEnvirSubPackages/api/index.js
@@ -61,7 +61,7 @@ export const setSafetyenvironmentalGoEdit = (params) =>
 
 /** 申辩 */
 export const setSafetyenvironmentalExplain = (params) =>
-	post("/app/safetyenvironmental/explain", params);
+	post("/app/safetyenvironmental/checkverify", params);
 
 /** 设置安全环境流程 */
 export const setSafetyenvironmentalFlow = (params) => post("/app/safetyenvironmental/getFlow", params);
diff --git a/safetyEnvirSubPackages/pages/inspected/detail.vue b/safetyEnvirSubPackages/pages/inspected/detail.vue
index c4e31dc..797796b 100644
--- a/safetyEnvirSubPackages/pages/inspected/detail.vue
+++ b/safetyEnvirSubPackages/pages/inspected/detail.vue
@@ -136,7 +136,8 @@
           <label class="radio">
             <radio value="3" :checked="inspectedForm.INSPECTION_STATUS === '3'" />同意
           </label>
-          <label v-if="form.hiddenList && form.hiddenList.length > 0" class="radio">
+		  <!-- v-if="form.hiddenList && form.hiddenList.length > 0" -->
+          <label class="radio">
             <radio value="-2" :checked="inspectedForm.INSPECTION_STATUS === '-2'" />申辩
           </label>
         </radio-group>
@@ -458,6 +459,19 @@ export default {
     // this.getDict();
   },
   methods: {
+	  validStr(str) {
+	  	if (
+	  		str != null &&
+	  		str != "" &&
+	  		typeof str != "undefined" &&
+	  		str != "undefined" &&
+	  		str != 0 &&
+	  		str != "null"
+	  	) {
+	  		return true;
+	  	}
+	  	return false;
+	  },
     /**
      * 读取详情数据
      */
@@ -478,6 +492,7 @@ export default {
         if (responseData.result === 'success') {
           uni.hideLoading();
           _this.form = responseData.pd;
+		  console.info(this.form)
           for (let i = 0; i < _this.form.inspectorList.length; i++) {
             _this.inspectorList.push([])
             _this.getUserList('inspectorList', _this.form.inspectorList[i].INSPECTION_DEPARTMENT_ID, i)
@@ -500,7 +515,7 @@ export default {
         // });
       }
     },
-    /**
+    /** 
      * 完成手写签字事件处理
      */
     subCanvas(e) {
@@ -509,7 +524,7 @@ export default {
       this.$set(this.inspectedForm, 'INSPECTED_SITEUSER_SIGN_TIME', formatDate(new Date(), 'yyyy-MM-dd hh:mm'))
       this.modalShow = false;
     },
-    /**
+    /** 
      * 删除手写签名的图片
      */
     delImg(e) {
@@ -551,7 +566,7 @@ export default {
       this.$refs['showHiddenWindow'].close();
       this.showHiddenWindow = false;
     },
-    /**
+    /** 
      * 抽屉状态发生变化触发
      */
     change(e, type) {
@@ -571,7 +586,7 @@ export default {
         current: this.$store.state.filePath + url
       });
     },
-    /**
+    /** 
      * 被检查单位现场负责人意见的单选选择动作
      */
     changeRadioGroup(e) {
@@ -591,6 +606,7 @@ export default {
     async goSubmit() {
       var _this = this;
       let required = true;
+	  this.inspectedForm.INSPECTED_SITEUSER_SIGN_IMG = this.signImgList[0].filePath
       this.inspectedRules.map(({ name, message }) => {
         if (!this.inspectedForm[name]) {
           uni.showToast({
@@ -624,9 +640,10 @@ export default {
       this.$set(this.inspectedForm, 'CORPINFO_ID', this.$store.state.userInfo.CORPINFO_ID)
       this.$set(this.inspectedForm, 'ACTION_USER', this.$store.state.userInfo.USERNAME)
       var _this = this;
-      uni.showLoading({
-        title: '请稍候'
-      })
+      // uni.showLoading({
+      //   title: '请稍候'
+      // })
+	  console.log("inspectedForm",this.inspectedForm)
       uni.uploadFile({
         url: "http://127.0.0.1:8199/app/safetyenvironmental/checkverify",
         filePath: _this.signImgList[0].filePath,
@@ -659,7 +676,7 @@ export default {
       uni.navigateBack({ delta: 1 });
       uni.hideLoading();
     },
-    /**
+    /** 
      * 获取部门下拉信息
      */
     async getDept() {
@@ -668,8 +685,8 @@ export default {
         loading: false,
         CORPINFO_ID: this.$store.state.userInfo.CORPINFO_ID
       });
-      if (resData.data.result === 'success') {
-        _this.treeNode = eval(resData.data.zTreeNodes);
+      if (resData.result === 'success') {
+        _this.treeNode = eval(resData.zTreeNodes);
       } else {
         uni.showToast({
           title: resData.data.message,
@@ -677,7 +694,7 @@ export default {
         });
       }
     },
-    /**
+    /** 
      * 获取人员列表
      */
     async getUserList(list, dept, i) {
@@ -1070,4 +1087,4 @@ export default {
   bottom: 0;
   height: 80upx;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/safetyEnvirSubPackages/pages/inspected/list.vue b/safetyEnvirSubPackages/pages/inspected/list.vue
index 437c3cc..ca87ed9 100644
--- a/safetyEnvirSubPackages/pages/inspected/list.vue
+++ b/safetyEnvirSubPackages/pages/inspected/list.vue
@@ -59,11 +59,12 @@ export default {
           { id: "0", name: "待检查人核实" },
           { id: "1", name: "检查人核实中" },
           { id: "2", name: "待被检查人确认" },
-          { id: "3", name: "已归档" },
+          { id: "3", name: "待指派" },
           { id: "4", name: "指派中" },
           { id: "5", name: "指派完成" },
           { id: "6", name: "待验收" },
           { id: "7", name: "已验收" },
+		  { id: "8", name: "已归档" },
           { id: "-1", name: "检查人核实打回" },
           { id: "-2", name: "被检查人申辩" },
       ],
diff --git a/safetyEnvirSubPackages/pages/inspector-confirms/detail.vue b/safetyEnvirSubPackages/pages/inspector-confirms/detail.vue
index 5f3c1ee..15c557c 100644
--- a/safetyEnvirSubPackages/pages/inspector-confirms/detail.vue
+++ b/safetyEnvirSubPackages/pages/inspector-confirms/detail.vue
@@ -15,7 +15,7 @@
         <u-cell>
           <view slot="title" class="title required">被检查单位：</view>
           <view slot="value">
-            <text>{{ form.INSPECTED_CORPINFO_ID_NAME }}</text>
+            <text>{{ form.INSPECTED_DEPARTMENT_NAMES }}</text>
           </view>
         </u-cell>
         <u-cell>
diff --git a/safetyEnvirSubPackages/pages/inspector-confirms/list.vue b/safetyEnvirSubPackages/pages/inspector-confirms/list.vue
index fb373de..a6c3211 100644
--- a/safetyEnvirSubPackages/pages/inspector-confirms/list.vue
+++ b/safetyEnvirSubPackages/pages/inspector-confirms/list.vue
@@ -78,7 +78,7 @@
 							)
 						"
 					/>
-					<view class="ml-10">
+<!-- 					<view class="ml-10">
 						<u-button
 							type="primary"
 							text="流程图"
@@ -86,11 +86,11 @@
 							shape="circle"
 							@click="showFlowChart(item.INSPECTION_ID)"
 						/>
-					</view>
+					</view> -->
 					<view
 						class="ml-10"
 						v-if="
-							!validStr(item.INSPECTION_USER_SIGN_TIME) &&
+							!validStr(item.INSPECTION_USER_SIGN_TIME) && validStr(item.USER_ID) &&
 							(item.INSPECTION_STATUS == '0' || item.INSPECTION_STATUS == '1')
 						"
 					>
@@ -119,7 +119,7 @@
 import { getSafetyenvironmentalinspectorList } from "../../api";
 import keyWordSearchInput from "@/components/keyWordSearchInput/index.vue";
 import List from "@/components/list/list.vue";
-import { initiateList } from "../../../Mock/safetyEnvirData";
+// import { initiateList } from "../../../Mock/safetyEnvirData";
 
 export default {
 	components: { keyWordSearchInput, List },