样式bug修改

src/views/administrative/appointment.vue

@@ -131,11 +131,29 @@
                         readonly
                         label="执法人员"
                 />
+                <div class="add-box">
                   <div v-for="(item, index) in data.lawCer" :key="index">
+                    <!-- <div class="item-delete" v-if="index>0" @click.stop="cancelUser(index)"><label>执法人员
+                        {{index+1}}</label> <a>删除</a></div> -->
+                    <van-field
+                        v-model="item.show"
+                        label=" "
+                        readonly
+                        clickable
+                        :right-icon="(data.lawCer.length - index ) == 1 ? 'add-o' : 'close'"
+                        @click-right-icon="(data.lawCer.length - index ) == 1 ? addLawCer(index) : cancelUser(index)"
+                        :rules="[{ required: true, message: '必填项' }]"
+                        placeholder="请选择"
+                        @click-input="showPopup(index)"
+                    />
+                  </div>
+                  <!-- <div class="addbtn" @click.stop="addLawCer"><van-icon name="add-o" /></div> -->
+                </div>
+<!--                  <div v-for="(item, index) in data.lawCer" :key="index">
                       <div class="item-delete" v-if="index>0" @click.stop="cancelUser(index)"><label>执法人员 {{index+1}}</label> <a>删除</a></div>
                     <van-field
                                v-model="item.show"
-                               label="执法人员"
+                               label=" "
                                readonly
                                required
                                :rules="[{ required: true, message: '必填项' }]"
@@ -144,7 +162,7 @@
                                @click="showPopup(index)"
                     />
                   </div>
-                <div class="addbtn" @click.stop="addLawCer"><van-icon name="add-o" /></div>
+                <div class="addbtn" @click.stop="addLawCer"><van-icon name="add-o" /></div>-->
 <!--                <van-field-->
 <!--                        v-model="submitData.lawEnforcerTextTwo"-->
 <!--                        readonly-->
@@ -152,7 +170,7 @@
 <!--                        right-icon="add-o"-->
 <!--                        @click="showPopup"-->
 <!--                />-->
-                <van-field
+<!--                <van-field
                         v-model="submitData.remark"
                         label="备注"
                         rows="2"
@@ -161,7 +179,7 @@
                         maxlength="100"
                         placeholder="请输入备注"
                         show-word-limit
-                />
+                />-->
 
                 <van-cell center title="开启联合检查">
                     <template #right-icon>
@@ -421,11 +439,19 @@
         console.log('failed', errorInfo);
     };
 
-    const cancelUser = (index) =>{
+/*    const cancelUser = (index) =>{
         data.lawCer.splice(index, 1);
     }
     const addLawCer = () =>{
         data.lawCer.push({ text:"", id:"", show:"", num:"" });
+    }*/
+    const cancelUser = (index) => {
+      data.lawCer.splice(index, 1);
+    }
+    const addLawCer = (index) => {
+      data.lawCer.push({text: "", id: ""});
+      showUserAdd.value = false;
+      showNextUserAdd.value = true;
     }
     const showPopup = (flag) => {
         data.lawCerFlag = flag;
@@ -779,6 +805,12 @@
       box-shadow: 0 0 0.27rem #e5e5e5;
     }
 
+    .add-box {
+      position: relative;
+      margin-top: -1px;
+      border-bottom: 1px solid #f6f7f8;
+    }
+
     .addbtn {
       margin: 3%;
       padding: 0 0.35rem;

src/views/administrative/appointmentDetail.vue

@@ -60,7 +60,7 @@
                         label="执法部门"
                         :rules="[{ required: true, message: '必填项' }]"
                 />
-                <van-field
+<!--                <van-field
                         v-model="submitData.lawEnforcerText"
                         readonly
                         label="执法人员"
@@ -70,7 +70,20 @@
                            label="执法人员"
                            readonly
 
-                />
+                />-->
+                <div class="one-label">
+                  <van-field
+                      v-model="submitData.lawEnforcerText"
+                      label="执法人员"
+                      readonly
+                  />
+                  <van-field class="no-label"
+                             v-for="(item, index) in data.lawCer" :key="index"
+                             v-model="item.show"
+                             label=" "
+                             readonly
+                  />
+                </div>
 <!--                <van-field
                         v-model="submitData.remark"
                         label="备注"
@@ -80,10 +93,10 @@
                         type="textarea"
                         show-word-limit
                 />-->
-                <div class="fold-div">
+<!--                <div class="fold-div">
                 <label>备注</label>
                 <van-text-ellipsis :content="submitData.remark" rows="2" autosize expand-text="展开" collapse-text="收起" />
-              </div>
+                </div>-->
                   <div class="add-inspect">
                       <p v-if="submitData.userObjs.length > 0"><label>联合检查部门、人员</label></p>
                       <p v-for="(item, index) in submitData.userObjs" :key="index">
@@ -703,4 +716,19 @@
       color: #666;
     }
 
+    .one-label .van-cell:first-child {
+      padding-bottom: 0;
+    }
+
+    .one-label .no-label {
+      margin-top: -1px;
+      padding-top: 0;
+      padding-bottom: 0;
+    }
+
+    .one-label .no-label:last-child {
+      padding-bottom: 0.27rem;
+      border-bottom: 1px solid #f6f7f8;
+    }
+
 </style>

src/views/administrative/appointmentEdit.vue

@@ -96,7 +96,25 @@
                         readonly
                         label="执法人员"
                 />
+                <div class="add-box">
                   <div v-for="(item, index) in data.lawCer" :key="index">
+                    <!-- <div class="item-delete" v-if="index>0" @click.stop="cancelUser(index)"><label>执法人员
+                        {{index+1}}</label> <a>删除</a></div> -->
+                    <van-field
+                        v-model="item.show"
+                        label=" "
+                        readonly
+                        clickable
+                        :right-icon="(data.lawCer.length - index ) == 1 ? 'add-o' : 'close'"
+                        @click-right-icon="(data.lawCer.length - index ) == 1 ? addLawCer(index) : cancelUser(index)"
+                        :rules="[{ required: true, message: '必填项' }]"
+                        placeholder="请选择"
+                        @click-input="showPopup(index)"
+                    />
+                  </div>
+                  <!-- <div class="addbtn" @click.stop="addLawCer"><van-icon name="add-o" /></div> -->
+                </div>
+<!--                  <div v-for="(item, index) in data.lawCer" :key="index">
                       <div class="item-delete" v-if="index>0" @click.stop="cancelUser(index)"><label>执法人员 {{index+1}}</label> <a>删除</a></div>
                 <van-field
                            v-model="item.show"
@@ -109,14 +127,14 @@
                            @click="showPopup(index)"
                 />
                   </div>
-                <div class="addbtn" @click.stop="addLawCer"><van-icon name="add-o" /></div>
+                <div class="addbtn" @click.stop="addLawCer"><van-icon name="add-o" /></div>-->
 <!--                <van-field-->
 <!--                        v-model="submitData.lawEnforcerTextTwo"-->
 <!--                        readonly-->
 <!--                        label="执法人员"-->
 <!--                        @click="showPopup"-->
 <!--                />-->
-                <van-field
+<!--                <van-field
                         v-model="submitData.remark"
                         label="备注"
                         rows="2"
@@ -125,7 +143,7 @@
                         maxlength="100"
                         placeholder="请输入备注"
                         show-word-limit
-                />
+                />-->
 
                 <van-cell v-if="data.mainDeputyOrder == 1 && submitData.isSubmit == 0" center title="开启联合检查">
                     <template #right-icon>
@@ -563,11 +581,19 @@
         }
     }
 
-    const cancelUser = (index) =>{
+    /*const cancelUser = (index) =>{
         data.lawCer.splice(index, 1);
     }
     const addLawCer = () =>{
         data.lawCer.push({ text:"", id:"", show:"", num:"" });
+    }*/
+    const cancelUser = (index) => {
+      data.lawCer.splice(index, 1);
+    }
+    const addLawCer = (index) => {
+      data.lawCer.push({text: "", id: ""});
+      showUserAdd.value = false;
+      showNextUserAdd.value = true;
     }
 
     const getLinkageByValueAndParentId = (value, parentId) => {
@@ -709,6 +735,12 @@
       box-shadow: 0 0 0.27rem #e5e5e5;
     }
 
+    .add-box {
+      position: relative;
+      margin-top: -1px;
+      border-bottom: 1px solid #f6f7f8;
+    }
+
     .addbtn {
       margin: 3%;
       padding: 0 0.35rem;

src/views/enforce/enterpriseBaseInfo.vue

@@ -15,9 +15,9 @@
                         label="企业名称"
                         readonly
                 />
-              <van-field
+              <van-field class="mult-line"
                         v-model="data.enterpriseInfo.enterpriseNumber"
-                        label="统一社会信用代码:"
+                        label="统一社会信用代码"
                         readonly
                 />
                 <van-field
@@ -799,7 +799,8 @@
       color: #666;
     }
 
-    /deep/ .van-cell-group .van-cell:nth-child(2) .van-field__label {
+    /deep/ .mult-line .van-field__label {
+      padding-right: 0.5rem;
       line-height: 1.25;
     }
 

src/views/enforce/enterpriseWarningInfo.vue

@@ -22,7 +22,7 @@
     </div>-->
   <div class="search-button-list">
     <van-button plain hairline :class="0==data.checkNum?'search-button active':'search-button'" @click="searchWarnType(1)" round type="primary" size="mini">
-		预警提醒（全行业）
+		预警提醒（全市）
     </van-button>
     <van-button plain hairline :class="1==data.checkNum?'search-button active':'search-button'" @click="searchWarnType(0)" round type="primary"
                 size="mini">预警提醒（本部门）

src/views/enforce/sign.vue

@@ -11,14 +11,14 @@
 
 
               <van-cell-group>
-                <!--                    <div class="qy-name">企业信息</div>-->
+                                    <div class="qy-name">企业信息</div>
                 <van-field
                     v-model="submitData.enterpriseName"
                     label="企业名称"
                     :rules="[{ required: true, message: '必填项' }]"
                     placeholder="企业名称"
                 />
-              <van-field
+              <van-field class="mult-line"
                     v-model="submitData.enterpriseNumber"
                     readonly
                     label="统一社会信用代码"
@@ -30,7 +30,7 @@
 
               <van-divider class="divdsty"/>
                 <van-cell-group>
-<!--                    <div class="zf-name">执法信息</div>-->
+                    <div class="zf-name">执法信息</div>
                     <van-field
                             v-model="submitData.lawText"
                             label="是否关联预约"
@@ -60,9 +60,8 @@
                             {{index+1}}</label> <a>删除</a></div> -->
                         <van-field
                                 v-model="item.show"
-                                label="执法人员"
+                                label=" "
                                 readonly
-                                required
                                 clickable
                                 :right-icon="(data.lawCer.length - index ) == 1 ? 'add-o' : 'close'"
                                 @click-right-icon="(data.lawCer.length - index ) == 1 ? addLawCer(index) : cancelUser(index)"
@@ -76,11 +75,11 @@
                     <van-field
                             v-model="submitData.checkCategoryText"
                             label="检查类别"
-                            placeholder="请选择 检查类别"
+                            placeholder="请选择"
                             is-link
                             readonly
                             required
-                            :rules="[{ required: true, message: '请加检查类别' }]"
+                            :rules="[{ required: true, message: '请选择检查类别' }]"
                             @click="data.showCheckCategoryPicker = true"
                     />
                     <van-field
@@ -90,7 +89,7 @@
                             autosize
                             type="textarea"
                             maxlength="100"
-                            placeholder="请输入检查事项"
+                            placeholder="请输入 检查事项"
                             show-word-limit
                     />
                     <van-field v-model="submitData.lawEnforcementItem" v-show="false"/>
@@ -102,7 +101,7 @@
                                 v-model="item.text"
                                 readonly
                                 label="检查依据"
-                                placeholder="检查依据"
+                                placeholder="请选择"
                                 @click-input="showPopupqz(index)"
                                 rows="1"
                                 autosize
@@ -118,7 +117,6 @@
                                 v-model="submitData.enforce"
                                 label="未扫码原因"
                                 readonly
-                                placeholder="请选择"
 
                         />
                         <van-field v-if="submitData.checkCss==3"
@@ -136,7 +134,7 @@
                             v-model="submitData.enforcementTime"
                             label="检查时间"
                             readonly
-                            placeholder="请选择"
+                            placeholder="请选择 检查时间"
                             :rules="[{ required: true, message: '必填项' }]"
                             @click="data.showTimePicker = true"
                     />
@@ -1082,6 +1080,8 @@
 
     .add-box {
       position: relative;
+      margin-top: -1px;
+      border-bottom: 1px solid #f6f7f8;
     }
 
     .addbtn {
@@ -1131,7 +1131,8 @@
         text-align: center;
     }
 
-    /deep/ .van-cell-group .van-cell:nth-child(2) .van-field__label {
+    /deep/ .mult-line .van-field__label {
+      padding-right: 0.5rem;
       line-height: 1.25;
     }
 
@@ -1141,4 +1142,8 @@
       font-weight: 600;
     }
 
+    /deep/ .van-field .van-field__control {
+      color: #666;
+    }
+
 </style>

src/views/enforceHome.vue

@@ -18,7 +18,7 @@
                     </li>
                 </ul>
                 <ul v-else class="notice_list" >
-                    <li>最近一星期暂无年度行政检查计划公布</li>
+                    <li>近一星期暂无通知消息</li>
                 </ul>
             </div>
             <div class="carousel_box" @onLoad="onLoad">

src/views/enterprise/complaintEvaluate.vue

@@ -10,7 +10,7 @@
 
             <div class="cardsty"><label>处置单位</label><span>{{data.dataObj.orgText}}</span></div>
             <div class="cardsty">
-                <h4>您对我们的服务满意吗？</h4>
+                <h4>您对我们的执法检查满意吗？</h4>
                 <div class="eval-item">
                     <label>处置速度</label>
                     <span class="eval-star">
@@ -76,7 +76,7 @@
 
             </div>
             <div class="cardsty">
-                <label>反馈详情</label>
+                <label>意见|建议</label>
                 <div class="eval-cont">
                     {{data.dataObj.writingEvaluation}}
                 </div>

src/views/enterprise/complaintList.vue

@@ -39,10 +39,10 @@
           <!--      <van-button plain hairline class="search-button" @click="mssq()" round type="primary" size="mini">临时按钮</van-button>-->
 
       </div>
-      <div class="search-button-date">
+<!--      <div class="search-button-date">
           <span class="date-select" @click="selectDate">{{  data.dateSearch }}</span>
-          <div style="border-color: black;" class="van-hairline--bottom"></div>
-          <!-- <van-button class="search-button"  type="primary" size="mini">统计分析</van-button> -->
+          <div style="border-color: black;" class="van-hairline&#45;&#45;bottom"></div>
+          &lt;!&ndash; <van-button class="search-button"  type="primary" size="mini">统计分析</van-button> &ndash;&gt;
           <van-popup v-model:show="data.showDatePicker" position="bottom">
               <van-date-picker
                       title="选择日期"
@@ -54,7 +54,7 @@
                       @cancel="cancelSelectDate"
               />
           </van-popup>
-      </div>
+      </div>-->
 
       <!-- 中间 -->
       <div class="shop-center">

src/views/enterprise/enterpriseEvaluate/evaluate.vue

@@ -4,7 +4,7 @@
 
 <!--            <div class="cardsty"><label>处置单位</label><span>{{data.dataObj.orgText}}</span></div>-->
             <div class="cardsty">
-                <h4>您对我们的服务满意吗？</h4>
+                <h4>您对我们的执法检查满意吗？</h4>
                 <div class="eval-item">
                     <label>检查效率</label>
                     <span class="eval-star">
@@ -78,7 +78,7 @@
 
             </div>
             <div class="cardsty">
-                <label>检查反馈</label>
+                <label>意见|建议</label>
 
                     <van-field class="eval-cont"
                             v-model="submitData.evaluateDescription"

src/views/enterprise/register.vue

@@ -26,7 +26,7 @@
             @click="showPopup"
           />
           <Popup :visible="popupVisible" :content="popupContent" @close="closePopup"  @reciveData="reciveData" />
-        <van-field
+        <van-field class="mult-line"
           v-model="submitData.enterpriseNumber"
           required
           readonly
@@ -391,7 +391,7 @@ export default {
   color: #666;
 }
 
-/deep/ .van-cell-group .van-cell:nth-child(2) .van-field__label {
+/deep/ .mult-line .van-field__label {
   padding-right: 0.3rem;
   width: 2.3rem;
   line-height: 1.25;

src/views/enterprise/registrationDetail.vue

@@ -4,7 +4,7 @@
             <van-form @failed="onFailed" @submit="submit">
 
                 <van-cell-group>
-<!--                    <div class="qy-name">企业信息</div>-->
+                    <div class="qy-name">企业信息</div>
                     <van-field
                             v-model="submitData.enterpriseName"
                             label="企业名称"
@@ -12,7 +12,7 @@
                     />
 <!--                    <div style="font-size: 15px; padding-left: 18px;">统一社会信用代码</div>
                     <div style="font-size: 15px; padding-left: 18px;">{{submitData.enterpriseNumber}}</div>-->
-                    <van-field
+                    <van-field class="mult-line"
                             v-model="submitData.enterpriseNumber"
                             label="统一社会信用代码"
                             readonly
@@ -22,56 +22,80 @@
                 <van-divider class="divdsty" />
 
                 <van-cell-group>
-<!--                    <div class="zf-name">执法信息</div>-->
+                    <div class="zf-name">执法信息</div>
                     <van-field
                       v-model="submitData.lawEnforcement"
                       label="执法部门"
                       readonly
                     />
+                  <div class="one-label">
                     <van-field
-                      v-model="submitData.lawEnforcer"
-                      label="执法人员"
-                      readonly
+                        v-model="submitData.lawEnforcer"
+                        label="执法人员"
+                        readonly
+                    />
+                    <van-field class="no-label"
+                               v-for="(item, index) in data.lawCer" :key="index"
+                               v-model="item.show"
+                               label=" "
+                               readonly
                     />
+                  </div>
+<!--
                     <van-field v-for="(item, index) in data.lawCer" :key="index"
                       v-model="item.show"
                       label="执法人员"
                       readonly
-                      @click="showPopup"
+                    />-->
+
+
+
+                    <van-field
+                        v-model="submitData.checkCategoryText"
+                        label="检查类别"
+                        readonly
                     />
                     <van-field
-                            v-model="submitData.checkCategoryText"
-                            label="检查类别"
-                            readonly
+                        v-model="submitData.lawEnforcementItemText"
+                        label="检查事项"
+                        rows="2"
+                        autosize
+                        readonly
+                        type="textarea"
+                        show-word-limit
                     />
+<!--                    <van-field v-for="(item, index) in data.lawList" :key="index"
+                        v-model="item.text"
+                        label="检查依据"
+                        readonly
+                        type="textarea"
+                        rows="1"
+                        autosize
+                    />-->
+                  <div class="one-label">
                     <van-field
-                      v-model="submitData.lawEnforcementItemText"
-                      label="检查事项"
-                      rows="2"
-                      autosize
-                      readonly
-                      type="textarea"
-                      show-word-limit
+                        v-model="submitData.lawEnforcer"
+                        label="检查依据"
+                        readonly
                     />
-                    <van-field v-for="(item, index) in data.lawList" :key="index"
-                      v-model="item.text"
-                      label="检查依据"
-                      readonly
-                      type="textarea"
-                      rows="1"
-                      autosize
+                    <van-field class="no-label"
+                               v-for="(item, index) in data.lawList" :key="index"
+                               v-model="item.show"
+                               label=" "
+                               readonly
                     />
+                  </div>
                     <view  v-if="null != submitData.enforce">
                         <van-field
-                                v-model="submitData.enforce"
-                                label="未扫码原因"
-                                readonly
+                            v-model="submitData.enforce"
+                            label="未扫码原因"
+                            readonly
                         />
                     </view>
                     <van-field
-                            v-model="submitData.enforcementTime"
-                            label="检查时间"
-                            readonly
+                        v-model="submitData.enforcementTime"
+                        label="检查时间"
+                        readonly
                     />
 <!--                    <van-field-->
 <!--                            v-model="submitData.lawFieldText"-->
@@ -562,6 +586,11 @@ const reciveData2 = (item) =>{
   color: #666;
 }
 
+/deep/ .mult-line .van-field__label {
+  padding-right: 0.5rem;
+  line-height: 1.25;
+}
+
 .complaint-cont {
   margin: -1px 3% 2%;
   padding: 0 0.15rem 0.5rem;
@@ -571,4 +600,20 @@ const reciveData2 = (item) =>{
   line-height: 1.5;
   font-size: 0.37rem;
 }
+
+.one-label .van-cell:first-child {
+  padding-bottom: 0;
+}
+
+.one-label .no-label {
+  margin-top: -1px;
+  padding-top: 0;
+  padding-bottom: 0;
+}
+
+.one-label .no-label:last-child {
+  padding-bottom: 0.27rem;
+  border-bottom: 1px solid #f6f7f8;
+}
+
 </style>

src/views/enterprise/registrationEdit.vue

@@ -18,7 +18,7 @@
                     :rules="[{ required: true, message: '必填项' }]"
                     placeholder="企业名称"
                 />
-                <van-field
+                <van-field class="mult-line"
                     v-model="submitData.enterpriseNumber"
                     required
                     label="统一社会信用代码"
@@ -51,16 +51,34 @@
                             required
                             :rules="[{ required: true, message: '请加载执法人员' }]"
                     />
-                    <van-field v-for="(item, index) in data.lawCer" :key="index"
+<!--                    <van-field v-for="(item, index) in data.lawCer" :key="index"
                                v-model="item.show"
-                               label="执法人员"
+                               label=" "
                                readonly
                                placeholder="请选择"
                                is-link
                                @click="showPopup(index)"
                     />
 
-                    <div class="addbtn" @click.stop="addLawCer"><van-icon name="add-o" /></div>
+                    <div class="addbtn" @click.stop="addLawCer"><van-icon name="add-o" /></div>-->
+                  <div class="add-box">
+                    <div v-for="(item, index) in data.lawCer" :key="index">
+                      <!-- <div class="item-delete" v-if="index>0" @click.stop="cancelUser(index)"><label>执法人员
+                          {{index+1}}</label> <a>删除</a></div> -->
+                      <van-field
+                          v-model="item.show"
+                          label=" "
+                          readonly
+                          clickable
+                          :right-icon="(data.lawCer.length - index ) == 1 ? 'add-o' : 'close'"
+                          @click-right-icon="(data.lawCer.length - index ) == 1 ? addLawCer(index) : cancelUser(index)"
+                          :rules="[{ required: true, message: '必填项' }]"
+                          placeholder="请选择"
+                          @click-input="showPopup(index)"
+                      />
+                    </div>
+                    <!-- <div class="addbtn" @click.stop="addLawCer"><van-icon name="add-o" /></div> -->
+                  </div>
                     <!-- <van-field
                       v-model="submitData.subsidiaryerText"
                       label="辅助人员"
@@ -661,8 +679,16 @@
     const addField = () =>{
         data.lawList.push({ text:"", id:"", "show":"" });
     }
-    const addLawCer = () =>{
+    /*const addLawCer = () =>{
         data.lawCer.push({ text:"", id:"" });
+    }*/
+    const cancelUser = (index) => {
+      data.lawCer.splice(index, 1);
+    }
+    const addLawCer = (index) => {
+      data.lawCer.push({text: "", id: ""});
+      showUserAdd.value = false;
+      showNextUserAdd.value = true;
     }
     const closePopup = () =>{
         data.popupVisible = false;
@@ -864,6 +890,12 @@
         box-shadow: 0 0 0.27rem #e5e5e5;
     }
 
+    .add-box {
+      position: relative;
+      margin-top: -1px;
+      border-bottom: 1px solid #f6f7f8;
+    }
+
     .addbtn {
       margin: 3%;
       padding: 0 0.35rem;
@@ -880,7 +912,7 @@
       font-size: 0.4rem;
     }
 
-    /deep/ .van-cell-group .van-cell:nth-child(2) .van-field__label {
+    /deep/ .mult-line .van-field__label {
       padding-right: 0.3rem;
       width: 2.3rem;
       line-height: 1.25;