提交代码

src/assets/styles/ruoyi.scss

@@ -109,25 +109,25 @@
 }
 
 .el-input.is-disabled .el-input__inner {
-  background-color: #f5f7fa ;
-  border-color: #dfe4ed00 ;
-  color: #7e8289 ;
-  cursor: not-allowed ;
+  background-color: #f5f7fa !important;
+  border-color: #dfe4ed00 !important;
+  color: #606266 !important;
+  cursor: not-allowed !important;
 }
 .el-input-group__append{
-  border-color: #dfe4ed00 ;
+  border-color: #dfe4ed00 !important;
 }
 
 .el-radio__input.is-disabled.is-checked .el-radio__inner {
-  background-color: #F5F7FA;
-  color: #7e8289 ;
+  background-color: #F5F7FA !important;
+  color: #606266 !important;
 }
 .el-textarea.is-disabled .el-textarea__inner{
-  color: #7e8289 ;
-  border-color: #dfe4ed00;
+  color: #606266 !important;
+  border-color: #606266 !important;
 }
 .el-radio__input.is-disabled + span.el-radio__label {
-  color: #7e8289 ;
+  color: #606266 !important;
 }
 
 /** 表单布局 **/

src/views/gas/courtyardNetworkManagement/index.vue

@@ -114,7 +114,7 @@
       </el-table-column>
       <el-table-column label="审核状态" align="center" prop="processStatus">
         <template slot-scope="scope">
-          <span v-if="scope.row.processStatus == null">未审核</span>
+          <span v-if="scope.row.processStatus == null && scope.row.processStatus == '-1'">未审核</span>
           <dict-tag v-else :options="dict.type.process_status" :value="scope.row.processStatus"/>
         </template>
       </el-table-column>
@@ -144,7 +144,7 @@
             type="text"
             icon="el-icon-edit"
             @click="openshShow(scope.row)"
-            v-show="scope.row.processStatus != 0"
+            v-show="scope.row.processStatus == null && scope.row.processStatus != '-1'"
             v-hasPermi="['gas:courtyardNetworkManagement:edit']"
           >审核
           </el-button>

src/views/gas/patrolTeam/index.vue

@@ -104,7 +104,7 @@
       <el-table-column label="上传位置" align="center" prop="uploadLocation" />
       <el-table-column label="是否正常巡检" align="center" prop="isNormalInspection" >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.yes_and_no" :value="scope.row.team"/>
+          <dict-tag :options="dict.type.yes_and_no" :value="scope.row.isNormalInspection"/>
         </template>
       </el-table-column>
       <el-table-column label="上传人" align="center" prop="createByName" />

src/views/gas/regulatingBoxMaintenance/index.vue

@@ -148,7 +148,7 @@
       <el-table-column label="审核状态" align="center" prop="processStatus">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.process_status" :value="scope.row.processStatus"
-                    v-if="scope.row.processStatus != null"/>
+                    v-if="scope.row.processStatus != null && scope.row.processStatus != '-1' "/>
           <span v-else>未审核</span>
         </template>
       </el-table-column>
@@ -182,7 +182,7 @@
           <el-button
             size="mini"
             type="text"
-            v-show="scope.row.processStatus == null"
+            v-show="scope.row.processStatus == null && scope.row.processStatus != '-1'"
             icon="el-icon-edit"
             @click="process(scope.row)"
             v-hasPermi="['gas:regulatingBoxMaintenance:edit']"

src/views/gas/regulatorBox/index.vue

@@ -125,7 +125,7 @@
       <el-table-column label="创建时间" align="center" prop="createTime"/>
       <el-table-column label="审核状态" align="center" prop="processStatus">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.process_status" :value="scope.row.processStatus" v-if="scope.row.processStatus != null"/>
+          <dict-tag :options="dict.type.process_status" :value="scope.row.processStatus" v-if="scope.row.processStatus != null && scope.row.processStatus != '-1' "/>
           <span v-else>未审核</span>
         </template>
       </el-table-column>
@@ -159,7 +159,7 @@
           <el-button
             size="mini"
             type="text"
-            v-show="scope.row.processStatus == null"
+            v-show="scope.row.processStatus == null && scope.row.processStatus != '-1'"
             icon="el-icon-edit"
             @click="process(scope.row)"
             v-hasPermi="['gas:regulatingBoxMaintenance:edit']"

src/views/gas/roadSectionInspection/index.vue

@@ -37,16 +37,16 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['gas:roadSectionInspection:add']"
-        >新增</el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['gas:roadSectionInspection:add']"-->
+<!--        >新增</el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="success"
@@ -102,7 +102,7 @@
       </el-table-column>
       <el-table-column label="审核状态" align="center" prop="processStatus">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.process_status" :value="scope.row.processStatus" v-if="scope.row.processStatus != null"/>
+          <dict-tag :options="dict.type.process_status" :value="scope.row.processStatus" v-if="scope.row.processStatus != null && scope.row.processStatus != '-1' "/>
           <span v-else>未审核</span>
         </template>
       </el-table-column>
@@ -118,14 +118,14 @@
 <!--      <el-table-column label="备注" align="center" prop="remark" />-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            @click="handleUpdate(scope.row,true)"
-            v-hasPermi="['gas:regulatingBoxMaintenance:edit']"
-          >查看
-          </el-button>
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-view"-->
+<!--            @click="handleUpdate(scope.row,true)"-->
+<!--            v-hasPermi="['gas:regulatingBoxMaintenance:edit']"-->
+<!--          >查看-->
+<!--          </el-button>-->
           <el-button
             size="mini"
             type="text"
@@ -136,7 +136,7 @@
           <el-button
             size="mini"
             type="text"
-            v-show="scope.row.processStatus == null"
+            v-show="scope.row.processStatus == null && scope.row.processStatus != '-1'"
             icon="el-icon-edit"
             @click="process(scope.row)"
             v-hasPermi="['gas:regulatingBoxMaintenance:edit']"

src/views/gas/valveWellInspection/index.vue

@@ -118,7 +118,7 @@
       </el-table-column>
       <el-table-column label="审核状态" align="center" prop="processStatus">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.process_status" :value="scope.row.processStatus" v-if="scope.row.processStatus != null"/>
+          <dict-tag :options="dict.type.process_status" :value="scope.row.processStatus" v-if="scope.row.processStatus != null && scope.row.processStatus != '-1' "/>
           <span v-else>未审核</span>
         </template>
       </el-table-column>
@@ -153,7 +153,7 @@
           <el-button
             size="mini"
             type="text"
-            v-show="scope.row.processStatus == null"
+            v-show="scope.row.processStatus == null && scope.row.processStatus != '-1'"
             icon="el-icon-edit"
             @click="process(scope.row)"
             v-hasPermi="['gas:regulatingBoxMaintenance:edit']"
@@ -382,6 +382,7 @@ export default {
         remark: undefined,
         delFlag: undefined,
         createBy: undefined,
+        photoList: [],
         createTime: undefined,
         updateBy: undefined,
         updateTime: undefined
@@ -462,7 +463,8 @@ export default {
               this.buttonLoading = false;
             });
           } else {
-            this.form.photoList = this.form.photoList.split(',')
+            if (this.form.photoList.length > 0)
+              this.form.photoList = this.form.photoList.split(',')
             addValveWellInspection(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;