修改执法预告时段

1 year ago · afe082938a
7 changed files with 152 additions and 98 deletions
--- a/src/views/administrative/appointment.vue
+++ b/src/views/administrative/appointment.vue
@ -51,14 +51,22 @@
                          @click="data.showTimePicker = true"
                  />
                  <van-field
-                      v-model="submitData.checkTimeOrderText"
+                      v-model="data.checkHourStart"
+                      required
+                      label=""
+                      placeholder="开始时间"
+                      readonly
+                      :rules="[{ required: true, message: '必填项' }]"
+                      @click="data.hourStartPicker = true"
+                  />
+                   <van-field
+                      v-model="data.checkHourEnd"
                      required
-                      is-link
                      label=""
-                      placeholder="时段"
+                      placeholder="结束时间"
                      readonly
                      :rules="[{ required: true, message: '必填项' }]"
-                      @click="data.checkTimePicker = true"
+                      @click="data.hourEndPicker = true"
                  />
                </div>

@ -267,11 +275,16 @@

        <DeptPopup :visible="data.deptChecked" :content="data.deptContent" @close="closePopup"
                   @reciveData="reciveDept"/>
-        <van-popup v-model:show="data.checkTimePicker" round position="bottom">
-            <van-picker
-                    :columns="data.checkTimeColumns"
-                    @cancel="data.checkTimePicker = false"
-                    @confirm="checkTimeOnConfirm"
+        <van-popup v-model:show="data.hourStartPicker" round position="bottom">
+            <van-time-picker v-model="data.currentHour" :columns-type='data.checkHourType'
+                    @cancel="data.hourStartPicker = false"
+                    @confirm="hourStartConfirm"
+            />
+        </van-popup>
+        <van-popup v-model:show="data.hourEndPicker" round position="bottom">
+            <van-time-picker v-model="data.currentHour" :columns-type='data.checkHourType'
+                    @cancel="data.hourEndPicker = false" 
+                    @confirm="hourEndConfirm"
            />
        </van-popup>
        <van-notify v-model:show="data.notifyShow" type="success">
@ -341,11 +354,13 @@
        lawCerFlag: 0,
        lawCer:[{ text:"", id:"", show:"", num:"" }],

-        checkTimePicker: ref(false),
-        checkTimeColumns: [
-            { text: '9:00 ~ 12:00', value: '1' },
-            { text: '14:00 ~ 17:00', value: '2' },
-        ],
+        hourStartPicker: ref(false),
+        hourEndPicker: ref(false),
+        currentHour:ref(['00','00']),
+        checkHourType:ref(['hour', 'minute']),
+        checkHourStart:"",
+        checkHourEnd:""
+
        // lawCer:[],
    });
    //保存参数
@ -402,6 +417,8 @@
         */
        checkTimeOrder: 0,
        checkTimeOrderText:"",
+        checkHourStart:"",
+        checkHourEnd:""
    })

    const currentDate =() => {
@ -446,12 +463,14 @@
    /**
     * 执法时间 时段选择
     */
-    const checkTimeOnConfirm = ({ selectedOptions }) => {
-        data.checkTimePicker = false;
-        console.log(selectedOptions[0].text);
-        console.log(selectedOptions[0].value);
-        submitData.checkTimeOrderText = selectedOptions[0].text;
-        submitData.checkTimeOrder = selectedOptions[0].value;
+    const hourStartConfirm = ({ selectedOptions }) => {
+        data.hourStartPicker = false;
+        data.checkHourStart = selectedOptions[0].value+":"+selectedOptions[1].value;
+    };
+
+    const hourEndConfirm = ({ selectedOptions }) => {
+        data.hourEndPicker = false;
+        data.checkHourEnd = selectedOptions[0].value+":"+selectedOptions[1].value;;
    };
    const validator = (val) => /^1[34578]\d{9}$/.test(val);

@ -599,6 +618,8 @@
        submitData.lawEnforcerTwoId = submitData.lawEnforcerTwoId.substring(0, submitData.lawEnforcerTwoId.length - 1);
        submitData.lawEnforcerTwo = submitData.lawEnforcerTwo.substring(0, submitData.lawEnforcerTwo.length - 1);
        submitData.lawCertificateNum = submitData.lawCertificateNum.substring(0, submitData.lawCertificateNum.length - 1);
+        submitData.checkHourStart=data.checkHourStart;
+        submitData.checkHourEnd=data.checkHourEnd;
        addEnterpriseLawEnforcement(submitData, success => {
            data.overlayShow = false;
            //跳转企业二维码地址
@ -640,6 +661,8 @@
        submitData.lawEnforcerTwoId = submitData.lawEnforcerTwoId.substring(0, submitData.lawEnforcerTwoId.length - 1);
        submitData.lawEnforcerTwo = submitData.lawEnforcerTwo.substring(0, submitData.lawEnforcerTwo.length - 1);
        submitData.lawCertificateNum = submitData.lawCertificateNum.substring(0, submitData.lawCertificateNum.length - 1);
+        submitData.checkHourStart=data.checkHourStart;
+        submitData.checkHourEnd=data.checkHourEnd;
        editEnterpriseLawEnforcement(submitData, success => {
            data.overlayShow = false;
            //跳转企业二维码地址
--- a/src/views/administrative/appointmentDetail.vue
+++ b/src/views/administrative/appointmentDetail.vue
@ -278,6 +278,8 @@
        /** 状态 0:正常;1:取消 */
        status:1,
        checkTimeOrderText:"",  
+        checkHourStart:"",
+        checkHourEnd:""
    })

    const onConfirm = (time) => {
@ -414,11 +416,7 @@
                    let tmplawno = null == userInfo_tmp.lawCertificateNum?'':userInfo_tmp.lawCertificateNum;
                    data.lawCer.push({ id: userInfo_tmp.strUserId, text: userInfo_tmp.userName, num: userInfo_tmp.lawCertificateNum, show: userInfo_tmp.userName +" "+ tmplawno });
                }
-              if(success.data.checkTimeOrder == 1){
-                submitData.checkTime = submitData.checkTime + " 上午 9:00~12:00";
-              }else{
-                submitData.checkTime = submitData.checkTime + " 下午 14:00~17:00";
-              }
+                submitData.checkTime = submitData.checkTime +" "+submitData.checkHourStart+"~"+submitData.checkHourEnd
                // 执法人员
                submitData.lawEnforcerTwoId = success.data['lawEnforcerTwoId'];
                submitData.lawEnforcerTwo = success.data['lawEnforcerTwo'];
--- a/src/views/administrative/appointmentEdit.vue
+++ b/src/views/administrative/appointmentEdit.vue
@ -31,14 +31,6 @@
                        label="联系人电话"
                        :rules="[{ validator, message: '请输入正确内容' }]"
                />
-                <!-- <van-field
-                        v-model="submitData.checkTime"
-                        required
-                        readonly
-                        label="执法时间"
-                        :rules="[{ required: true, message: '必填项' }]"
-                        @click="data.showTimePicker = true"
-                /> -->
                <div class="flex-div">
                  <van-field
                          v-model="submitData.checkTime"
@ -50,13 +42,22 @@
                          @click="data.showTimePicker = true"
                  />
                  <van-field
-                      v-model="submitData.checkTimeOrderText"
+                      v-model="data.checkHourStart"
                      required
-                      is-link
                      label=""
-                      placeholder="时段"
+                      placeholder="开始时间"
+                      readonly
                      :rules="[{ required: true, message: '必填项' }]"
-                      @click="data.checkTimePicker = true"
+                      @click="data.hourStartPicker = true"
+                  />
+                   <van-field
+                      v-model="data.checkHourEnd"
+                      required
+                      label=""
+                      placeholder="结束时间"
+                      readonly
+                      :rules="[{ required: true, message: '必填项' }]"
+                      @click="data.hourEndPicker = true"
                  />
                </div>

@ -240,11 +241,16 @@
        <DeptPopup :visible="data.deptChecked" :content="data.deptContent" @close="closePopup"
                   @reciveData="reciveDept"/>

-        <van-popup v-model:show="data.checkTimePicker" round position="bottom">
-            <van-picker
-                    :columns="data.checkTimeColumns"
-                    @cancel="data.checkTimePicker = false"
-                    @confirm="checkTimeOnConfirm"
+        <van-popup v-model:show="data.hourStartPicker" round position="bottom">
+            <van-time-picker v-model="data.currentHour" :columns-type='data.checkHourType'
+                    @cancel="data.hourStartPicker = false"
+                    @confirm="hourStartConfirm"
+            />
+        </van-popup>
+        <van-popup v-model:show="data.hourEndPicker" round position="bottom">
+            <van-time-picker v-model="data.currentHour" :columns-type='data.checkHourType'
+                    @cancel="data.hourEndPicker = false" 
+                    @confirm="hourEndConfirm"
            />
        </van-popup>
        <van-overlay :show="data.overlayShow">
@ -295,11 +301,12 @@
        mainDeputyOrder: 1,
        lawCerFlag: 0,
        lawCer:[{ text:"", id:"", show:"", num:"" }],
-        checkTimePicker: false,
-        checkTimeColumns: [
-            { text: '9:00 ~ 12:00', value: '1' },
-            { text: '14:00 ~ 17:00', value: '2' },
-        ],
+        hourStartPicker: ref(false),
+        hourEndPicker: ref(false),
+        currentHour:ref(['00','00']),
+        checkHourType:ref(['hour', 'minute']),
+        checkHourStart:"",
+        checkHourEnd:""
    });
    //保存参数
    const submitData = reactive({
@ -357,8 +364,23 @@
         */
        checkTimeOrder: 0,
        checkTimeOrderText:"",
+        checkHourStart:"",
+        checkHourEnd:""
    })

+     /**
+     * 执法时间 时段选择
+     */
+    const hourStartConfirm = ({ selectedOptions }) => {
+        data.hourStartPicker = false;
+        data.checkHourStart = selectedOptions[0].value+":"+selectedOptions[1].value;
+    };
+
+    const hourEndConfirm = ({ selectedOptions }) => {
+        data.hourEndPicker = false;
+        data.checkHourEnd = selectedOptions[0].value+":"+selectedOptions[1].value;;
+    };
+
    const onConfirm = (time) => {
        console.log(time)
        if(time != null) {
@ -470,6 +492,8 @@
            console.log("getByIdToDataFillIn : ", success);
            //跳转企业二维码地址
            if(success.success){
+                data.checkHourStart=success.data['checkHourStart'];
+                data.checkHourEnd=success.data['checkHourEnd'];
                data.mainDeputyOrder = success.data.mainDeputyOrder;
                Object.keys(submitData).forEach((item) => {
                    submitData[item] = success.data[item] ? success.data[item] : "";
@ -571,6 +595,8 @@
        submitData.lawEnforcerTwoId = submitData.lawEnforcerTwoId.substring(0, submitData.lawEnforcerTwoId.length - 1);
        submitData.lawEnforcerTwo = submitData.lawEnforcerTwo.substring(0, submitData.lawEnforcerTwo.length - 1);
        submitData.lawCertificateNum = submitData.lawCertificateNum.substring(0, submitData.lawCertificateNum.length - 1);
+        submitData.checkHourStart=data.checkHourStart;
+        submitData.checkHourEnd=data.checkHourEnd;
        addEnterpriseLawEnforcement(submitData,success =>{
            data.overlayShow = false;    // 遮罩层
            //跳转企业二维码地址
@ -615,6 +641,8 @@
        submitData.lawEnforcerTwoId = submitData.lawEnforcerTwoId.substring(0, submitData.lawEnforcerTwoId.length - 1);
        submitData.lawEnforcerTwo = submitData.lawEnforcerTwo.substring(0, submitData.lawEnforcerTwo.length - 1);
        submitData.lawCertificateNum = submitData.lawCertificateNum.substring(0, submitData.lawCertificateNum.length - 1);
+        submitData.checkHourStart=data.checkHourStart;
+        submitData.checkHourEnd=data.checkHourEnd;
        if(data.mainDeputyOrder == 0) {
            editEnterpriseLawEnforcementDeputyOrder(submitData,success =>{
                data.overlayShow = false;    // 遮罩层
--- a/src/views/administrative/appointmentList.vue
+++ b/src/views/administrative/appointmentList.vue
@ -58,11 +58,8 @@
                            <div class="card_box">
                                <div class="card_box_span">
                                  <p>执法时间：{{ formattedTimeYYYYmmdd(item.checkTime) }}
-                                    <span class="times" v-if="item.checkTimeOrder == 1" >
-                                            上午 9:00~12:00
-                                          </span>
-                                    <span class="times" v-if="item.checkTimeOrder == 2">
-                                            下午 14:00~17:00
+                                    <span class="times" v-if="item.checkHourStart !=null && item.checkHourEnd !=null ">
+                                            {{item.checkHourStart}}~{{item.checkHourEnd}}
                                    </span>
                                  </p>
                                  <div class="act-btn" v-if="item.isUnite == 1">
--- a/src/views/administrative/appointmentRelaunch.vue
+++ b/src/views/administrative/appointmentRelaunch.vue
@ -35,14 +35,6 @@
                        :rules="[{ validator, message: '请输入正确内容' }]"
                        readonly
                />
-                <!-- <van-field
-                        v-model="submitData.checkTime"
-                        required
-                        readonly
-                        label="执法时间"
-                        :rules="[{ required: true, message: '必填项' }]"
-                        @click="data.showTimePicker = true"
-                /> -->
                <div class="flex-div">
                  <van-field
                          v-model="submitData.checkTime"
@ -55,14 +47,22 @@
                          @click="data.showTimePicker = true"
                  />
                   <van-field
-                      v-model="submitData.checkTimeOrderText"
+                      v-model="data.checkHourStart"
                      required
-                      is-link
                      label=""
-                      
-                      placeholder="时段"
+                      placeholder="开始时间"
+                      readonly
                      :rules="[{ required: true, message: '必填项' }]"
-                      @click="data.checkTimePicker = true"
+                      @click="data.hourStartPicker = true"
+                  />
+                   <van-field
+                      v-model="data.checkHourEnd"
+                      required
+                      label=""
+                      placeholder="结束时间"
+                      readonly
+                      :rules="[{ required: true, message: '必填项' }]"
+                      @click="data.hourEndPicker = true"
                  />
                </div>

@ -239,11 +239,16 @@
            />
        </van-popup>

-        <van-popup v-model:show="data.checkTimePicker" round position="bottom">
-            <van-picker
-                    :columns="data.checkTimeColumns"
-                    @cancel="data.checkTimePicker = false"
-                    @confirm="checkTimeOnConfirm"
+        <van-popup v-model:show="data.hourStartPicker" round position="bottom">
+            <van-time-picker v-model="data.currentHour" :columns-type='data.checkHourType'
+                    @cancel="data.hourStartPicker = false"
+                    @confirm="hourStartConfirm"
+            />
+        </van-popup>
+        <van-popup v-model:show="data.hourEndPicker" round position="bottom">
+            <van-time-picker v-model="data.currentHour" :columns-type='data.checkHourType'
+                    @cancel="data.hourEndPicker = false" 
+                    @confirm="hourEndConfirm"
            />
        </van-popup>
        <DeptPopup :visible="data.deptChecked" :content="data.deptContent" @close="closePopup"
@ -298,13 +303,14 @@
        mainDeputyOrder: 1,
        lawCerFlag: 0,
        lawCer:[{ text:"", id:"", show:"", num:"" }],
-        checkTimePicker: false,
-        checkTimeColumns: [
-            { text: '9:00 ~ 12:00', value: '1' },
-            { text: '14:00 ~ 17:00', value: '2' },
-        ],
        minDate: new Date(),
        maxDate: new Date(2125, 5, 1),
+        hourStartPicker: ref(false),
+        hourEndPicker: ref(false),
+        currentHour:ref(['00','00']),
+        checkHourType:ref(['hour', 'minute']),
+        checkHourStart:"",
+        checkHourEnd:""
    });
    //保存参数
    const submitData = reactive({
@ -358,7 +364,9 @@
        bureauDeptId:"",
        bureauDeptName:"",
        checkTimeOrder:"",
-        checkTimeOrderText:""
+        checkTimeOrderText:"",
+        checkHourStart:"",
+        checkHourEnd:""

    })

@ -482,6 +490,8 @@
                    submitData.checkTimeOrderText = "14:00 ~ 17:00"
                }
                submitData.checkTimeOrder = success.data.checkTimeOrder;
+                data.checkHourStart= success.data.checkHourStart;
+                data.checkHourEnd=success.data.checkHourEnd;
                // 执法事项
                submitData.checkItemText = success.data.checkItemText;
                // 执法要求
@ -629,6 +639,8 @@
        submitData.lawEnforcerTwoId = submitData.lawEnforcerTwoId.substring(0, submitData.lawEnforcerTwoId.length - 1);
        submitData.lawEnforcerTwo = submitData.lawEnforcerTwo.substring(0, submitData.lawEnforcerTwo.length - 1);
        submitData.lawCertificateNum = submitData.lawCertificateNum.substring(0, submitData.lawCertificateNum.length - 1);
+        submitData.checkHourStart=data.checkHourStart;
+        submitData.checkHourEnd=data.checkHourEnd;
        //默认设置再次发起页面ID为空
        submitData.id = "";
        addEnterpriseLawEnforcement(submitData,success =>{
@ -672,6 +684,8 @@
        submitData.lawEnforcerTwoId = submitData.lawEnforcerTwoId.substring(0, submitData.lawEnforcerTwoId.length - 1);
        submitData.lawEnforcerTwo = submitData.lawEnforcerTwo.substring(0, submitData.lawEnforcerTwo.length - 1);
        submitData.lawCertificateNum = submitData.lawCertificateNum.substring(0, submitData.lawCertificateNum.length - 1);
+        submitData.checkHourStart=data.checkHourStart;
+        submitData.checkHourEnd=data.checkHourEnd;
        //默认设置再次发起页面ID为空
        submitData.id = "";
        editEnterpriseLawEnforcement(submitData, success => {
@ -788,12 +802,14 @@
    /**
     * 执法时间 时段选择
     */
-     const checkTimeOnConfirm = ({ selectedOptions }) => {
-        data.checkTimePicker = false;
-        console.log(selectedOptions[0].text);
-        console.log(selectedOptions[0].value);
-        submitData.checkTimeOrderText = selectedOptions[0].text;
-        submitData.checkTimeOrder = selectedOptions[0].value;
+    const hourStartConfirm = ({ selectedOptions }) => {
+        data.hourStartPicker = false;
+        data.checkHourStart = selectedOptions[0].value+":"+selectedOptions[1].value;
+    };
+
+    const hourEndConfirm = ({ selectedOptions }) => {
+        data.hourEndPicker = false;
+        data.checkHourEnd = selectedOptions[0].value+":"+selectedOptions[1].value;;
    };
 </script>
 <script>
--- a/src/views/enterprise/enterpriseInspectionDetail.vue
+++ b/src/views/enterprise/enterpriseInspectionDetail.vue
@ -243,12 +243,7 @@ onMounted(() =>{
        submitData.enterpriseName = success.data.enterpriseName;
        submitData.linkMan = success.data.linkMan;
        submitData.linkTel = success.data.linkTel;
-        submitData.checkTime = formattedTimeYYYYmmdd(success.data.checkTime);
-        if(success.data.checkTimeOrder == 1){
-          submitData.checkTime = submitData.checkTime + " 上午 9:00~12:00";
-        }else{
-          submitData.checkTime = submitData.checkTime + " 下午 14:00~17:00";
-        }
+        submitData.checkTime = formattedTimeYYYYmmdd(success.data.checkTime) +" "+success.data.checkHourStart+"~"+success.data.checkHourEnd
        submitData.remark = success.data.remark;
        submitData.isReg = success.data.isReg;
        submitData.status = success.data.status;
--- a/src/views/enterprise/enterpriseInspectionList.vue
+++ b/src/views/enterprise/enterpriseInspectionList.vue
@ -75,11 +75,8 @@
                                <div class="card_box">
                                    <div class="card_box_span">
                                        <p>执法时间：{{ formattedTimeYYYYmmdd(item.checkTime) }}
-                                          <span v-if="item.checkTimeOrder == 1" >
-                                             &nbsp;上午 9:00~12:00
-                                          </span>
-                                          <span v-if="item.checkTimeOrder == 2">
-                                            &nbsp; 下午 14:00~17:00
+                                          <span class="times" v-if="item.checkHourStart !=null && item.checkHourEnd !=null ">
+                                            {{item.checkHourStart}}~{{item.checkHourEnd}}
                                        </span>
                                        </p>
                                        <div class="act-btn" v-if="item.isUnite == 1">