From e3adbaee733746320a84bd295e45e18719320a59 Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Thu, 25 Jul 2024 16:18:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E8=AE=B0=E4=BF=9D=E5=AD=98,=20?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF=E8=AF=A6=E6=83=85=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=8C=89=E9=92=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/enforce.js                            |  1 +
 src/views/enforce/enforcementPlanAdd.vue      | 74 +++++++++++++------
 src/views/enforce/sign.vue                    | 11 +--
 .../enterprise/enterpriseInspectionDetail.vue |  2 +-
 4 files changed, 61 insertions(+), 27 deletions(-)

diff --git a/src/api/enforce.js b/src/api/enforce.js
index 872c73b..5e4c2ea 100644
--- a/src/api/enforce.js
+++ b/src/api/enforce.js
@@ -32,6 +32,7 @@ export const addEnforcementInspectionProgram = (params, success, error) =>_post(
 export const addEnforcementRegistration = (params, success, error) => _post("/app/code/registration/add",params,success,error)
 export const editEnforcementRegistration = (params, success, error) => _post("/app/code/registration/edit",params,success,error)
 export const getRegByUserIdAndZero = (userId, success, error) => _get("/app/code/registration/getByUserIdAndZero/"+ userId,null,success,error)
+export const getByUserIdAndEnterpriseNumber = (userId, enterpriseNumber, success, error) => _get("/app/code/registration/getByUserIdAndEnterpriseNumber/"+ userId +"/"+ enterpriseNumber,null,success,error)
 export const getByIdToDataFillIn = (id, success, error) => _get("/app/code/registration/getByIdToDataFillIn/" + id,null,success,error)
 
 //查询历史检查信息
diff --git a/src/views/enforce/enforcementPlanAdd.vue b/src/views/enforce/enforcementPlanAdd.vue
index 24a63d2..2da9b2f 100644
--- a/src/views/enforce/enforcementPlanAdd.vue
+++ b/src/views/enforce/enforcementPlanAdd.vue
@@ -13,15 +13,15 @@
         <div class="warp_body">
             <van-form @failed="onFailed" @submit="submit">
                 <van-cell-group>
-                    <van-field
-                            v-model="submitData.planYear"
-                            required
-                            label="计划年度"
-                            placeholder="必填"
-                            readonly
-                            :rules="[{ required: true, message: '请选择年度计划' }]"
-                            @click="selectDate"
-                    />
+<!--                    <van-field-->
+<!--                            v-model="submitData.planYear"-->
+<!--                            required-->
+<!--                            label="计划年度"-->
+<!--                            placeholder="必填"-->
+<!--                            readonly-->
+<!--                            :rules="[{ required: true, message: '请选择年度计划' }]"-->
+<!--                            @click="selectDate"-->
+<!--                    />-->
                     <van-popup v-model:show="data.showDatePicker" position="bottom">
                         <van-date-picker
                                 title="选择日期"
@@ -33,13 +33,34 @@
                                 @cancel="cancelSelectDate"
                         />
                     </van-popup>
-<!--                    <van-field-->
-<!--                            v-model="submitData.planName"-->
-<!--                            label="计划名称"-->
-<!--                            placeholder="请输入"-->
-<!--                            required-->
-<!--                            :rules="[{ required: true, message: '请输入计划名称' }]"-->
-<!--                    />-->
+                    <div style="display: flex; justify-content: space-between; width: 100%">
+                        <div style="width: 50%">
+                            <van-field
+                                    v-model="submitData.planName"
+                                    label="计划名称"
+                                    placeholder="请输入"
+                                    required
+                                    :rules="[{ required: true, message: '请输入计划名称' }]"
+                            />
+                        </div>
+                        <div style="width: 30%;">
+                            <van-field
+                                    v-model="data.fieldValue"
+                                    is-link
+                                    readonly
+                                    placeholder="选择日期"
+                                    @click="data.dateShowPicker = true"
+                            />
+                        </div>
+                        <div style="width: 30%;"><label style="font-size: 0.4rem;">行政检查计划</label></div>
+                    </div>
+                    <van-popup v-model:show="data.dateShowPicker" round position="bottom">
+                        <van-picker
+                                :columns="data.dateColumns"
+                                @cancel="data.dateShowPicker = false"
+                                @confirm="dateOnConfirm"
+                        />
+                    </van-popup>
                     <van-field
                             v-model="submitData.enforcementDepartment"
                             label="执法部门"
@@ -100,7 +121,7 @@
 
 <script setup name="register">
 
-    import {showSuccessToast, showLoadingToast, closeToast} from 'vant';
+    import {showToast, showSuccessToast, showLoadingToast, closeToast} from 'vant';
     import {addEnforcementInspectionProgram, queryUserInfo} from '@/api/enforce'
     import {getDict} from '../../api/Home'
     import {uploadFile} from '../../util/fileUpload'
@@ -126,6 +147,13 @@
         currentDate1: ref(['2024', '03', '01']),
         //vant组件上传照片列表
         fileListObj: [],
+        dateShowPicker: false,
+        fieldValue: "年度",
+        dateColumns: [
+            { text: '年度', value: 'year' },
+            { text: '月度', value: 'month' },
+            { text: '季度', value: 'quarter' },
+        ],
     });
     //保存参数
     const submitData = reactive({
@@ -159,10 +187,8 @@
     };
 
     const submit = () => {
-        showConfirmDialog({
-            title: '公布执法计划',
-            message: '对外公布本部门年度执法计划',
-        }).then(() => {
+        submitData.planName = submitData.planName + data.fieldValue +"行政检查计划"
+        showConfirmDialog(submitData).then(() => {
             console.log(1)
             submitData.isPublish = 1
             addEnforcementInspectionProgram(submitData, success => {
@@ -314,6 +340,12 @@
         data.showPicker = false;
     }
 
+    const dateOnConfirm = ({ selectedOptions }) => {
+        data.dateShowPicker = false;
+        data.fieldValue = selectedOptions[0].text;
+    };
+
+
 
 </script>
 <style lang="less" scoped>
diff --git a/src/views/enforce/sign.vue b/src/views/enforce/sign.vue
index ee92c1e..8414285 100644
--- a/src/views/enforce/sign.vue
+++ b/src/views/enforce/sign.vue
@@ -163,7 +163,7 @@
                 </van-cell-group>
 
                 <van-action-bar>
-<!--                  <van-button round block type="info" native-type="submit" @click="tmpSave">保存</van-button>-->
+                  <van-button round block type="info" native-type="submit" @click="tmpSave">保存</van-button>
                   <van-button round block type="info" native-type="submit" @click="submit(1)">提交</van-button>
                 </van-action-bar>
             </van-form>
@@ -199,7 +199,7 @@
 
 import { showSuccessToast } from 'vant';
 import 'vant/es/toast/style';
-import {addEnforcementRegistration, editEnforcementRegistration, getRegByUserIdAndZero, queryUserInfo} from '../../api/enforce'
+import {addEnforcementRegistration, editEnforcementRegistration, getRegByUserIdAndZero, getByUserIdAndEnterpriseNumber, queryUserInfo} from '../../api/enforce'
 import {getEnterpriseInformation} from '../../api/enterprise'
 import { reactive, ref } from "vue";
 import {uploadFile} from "../../util/fileUpload";
@@ -338,11 +338,11 @@ const getLinkageByParentIdToGA = (parentId) => {
 //3a0096181c184e5aa56f70923680856d$6e74ceda1463c165fd43eeeadce4f7cd
 //初始化参数，获取扫码的企业统一信用编码
 onMounted(() =>{
+    submitData.enterpriseNumber = route?.query?.enterpriseNumber;
     // 数据填充
-    // dataFillIn();
+    dataFillIn();
     submitData.enforce = route?.query?.reason;
     data.isNoScan = route?.query?.isNoScan;
-    submitData.enterpriseNumber = route?.query?.enterpriseNumber;
     console.log(data.isNoScan)
 
     //查询企业信息
@@ -434,7 +434,8 @@ const gaCancel = () => {
 /* 检查要求 end */
 
 const dataFillIn = () => {
-    getRegByUserIdAndZero(useCommon.userId,success =>{
+    // getRegByUserIdAndZero(useCommon.userId,success =>{
+    getByUserIdAndEnterpriseNumber(useCommon.userId, submitData.enterpriseNumber,success =>{
         //跳转企业二维码地址
         if(success.success){
             Object.keys(submitData).forEach((item) => {
diff --git a/src/views/enterprise/enterpriseInspectionDetail.vue b/src/views/enterprise/enterpriseInspectionDetail.vue
index 8802549..4f0dafd 100644
--- a/src/views/enterprise/enterpriseInspectionDetail.vue
+++ b/src/views/enterprise/enterpriseInspectionDetail.vue
@@ -79,7 +79,7 @@
               readonly
             />
 
-            <van-action-bar v-if="submitData.isReg != 1 && submitData.status != 1 && submitData.status != 3">
+            <van-action-bar v-if="!data.isEnterprise && submitData.isReg != 1 && submitData.status != 1 && submitData.status != 3">
                 <van-button round block type="info" native-type="submit" @click="cancel">取消</van-button>
             </van-action-bar>
         </van-form>