检查记录问题修改

zh-baseversion-web/src/views/supervision/record/components/InsRefDetailInfo.vue

@@ -94,6 +94,14 @@
           </el-form-item>
         </el-col>
 
+        <el-col :span="12">
+          <el-form-item label="是否执行">
+            <span v-if="detailInfo.fIsEnforcement == '1'">是</span>
+            <span v-else-if="detailInfo.fIsEnforcement == '0'">否</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
         <el-col :span="12">
           <el-form-item label="隐患整改前照片">
             <el-image
@@ -120,14 +128,6 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="12">
-          <el-form-item label="是否执行">
-            <span v-if="detailInfo.fIsEnforcement == '1'">是</span>
-            <span v-else-if="detailInfo.fIsEnforcement == '0'">否</span>
-            <span v-else>-</span>
-          </el-form-item>
-        </el-col>
-
         <el-col :span="12">
           <el-form-item label="处罚措施">
             <span v-if="detailInfo.fEnforcementType">{{ $parent.fEnforcementTypeFormat(detailInfo) }}</span>

zh-baseversion-web/src/views/supervision/record/components/InspectInfo.vue

@@ -68,7 +68,8 @@
 
           <el-col :span="12">
             <el-form-item label="是否需执法">
-              <span v-if="detailInfo.fDoscNeedExecute">{{ detailInfo.fDoscNeedExecute }}</span>
+              <span v-if="detailInfo.fDoscNeedExecute == '0'">否</span>
+              <span v-else-if="detailInfo.fDoscNeedExecute == '1'">是</span>
               <span v-else>-</span>
             </el-form-item>
           </el-col>

zh-baseversion-web/src/views/supervision/record/components/Rectification.vue

@@ -236,7 +236,6 @@
               <el-select
                 v-model="form.fIsEnforcement"
                 placeholder="请选择是否执行"
-                @change="isEnforcement"
                 style="width: 100%"
               >
                 <el-option label="是" value="1" />
@@ -245,7 +244,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="12" v-if="form.fIsEnforcement == '1'">
+          <el-col :span="12" v-if="$parent.$parent.$parent.form.fDoscNeedExecute == '1'">
             <el-form-item label="处罚措施" prop="fEnforcementType">
               <el-select
                 v-model="form.fEnforcementType"
@@ -263,13 +262,13 @@
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="处罚金额/万元" prop="fPenaltyAmount"  v-if="form.fIsEnforcement == '1'">
+            <el-form-item label="处罚金额/万元" prop="fPenaltyAmount"  v-if="$parent.$parent.$parent.form.fDoscNeedExecute == '1'">
               <el-input type="number" v-model="form.fPenaltyAmount" placeholder="请输入处罚金额/万元" />
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="执法日期" prop="fPenaltyDate" v-if="form.fIsEnforcement == '1'">
+            <el-form-item label="执法日期" prop="fPenaltyDate" v-if="$parent.$parent.$parent.form.fDoscNeedExecute == '1'">
               <el-date-picker
                 style="width: 100%"
                 v-model="form.fPenaltyDate"
@@ -281,7 +280,7 @@
           </el-col>
 
           <el-col :span="24">
-            <el-form-item label="其他执法情况说明" prop="fPenaltyDesc" v-if="form.fIsEnforcement == '1'">
+            <el-form-item label="其他执法情况说明" prop="fPenaltyDesc" v-if="$parent.$parent.$parent.form.fDoscNeedExecute == '1'">
               <el-input type="textarea" v-model="form.fPenaltyDesc" placeholder="请输入其他执法情况说明" />
             </el-form-item>
           </el-col>