Browse Source

调整提交

wang_xy 9 months ago
parent
commit
025cf121aa

+ 1 - 1
src/views/gas/area/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="队伍" prop="ranks">
-        <el-select v-model="queryParams.ranks" clearable placeholder="请选择" @change="getUsers" :disabled="postName.indexOf('xx') > -1">
+        <el-select v-model="queryParams.ranks" clearable placeholder="请选择" @change="getUsers" :disabled="postName.indexOf('xx') > -1&&postName!='xxallrank'">
           <el-option
             v-for="item in postOptions"
             :key="item.postId"

+ 2 - 2
src/views/gas/courtyardNetworkManagement/index.vue

@@ -23,7 +23,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="队伍">
-        <el-select v-model="queryParams.ranks" clearable placeholder="请选择" @change="getUsers" :disabled="postName.indexOf('xx') > -1">
+        <el-select v-model="queryParams.ranks" clearable placeholder="请选择" @change="getUsers" :disabled="postName.indexOf('xx') > -1&&postName!='xxallrank'">
           <el-option
             v-for="item in postOptions"
             :key="item.postId"
@@ -182,7 +182,7 @@
           <el-image
             style="width: 50px; height: 50px"
             :src="scope.row.photoList[0]"
-            :preview-src-list="[scope.row.photoList[0]]">
+            :preview-src-list="scope.row.photoList">
           </el-image>
         </template>
       </el-table-column>

+ 1 - 1
src/views/gas/emergencyRepair/index.vue

@@ -190,7 +190,7 @@
           <el-image
             style="width: 50px; height: 50px"
             :src="scope.row.photoList!=null?scope.row.photoList[0]:''"
-            :preview-src-list="[scope.row.photoList!=null?scope.row.photoList[0]:'']">
+            :preview-src-list="scope.row.photoList">
           </el-image>
         </template>
       </el-table-column>

+ 1 - 1
src/views/gas/patrolRecord/index.vue

@@ -91,7 +91,7 @@
           <el-image
             style="width: 50px; height: 50px"
             :src="scope.row.photoList!=null?scope.row.photoList[0]:''"
-            :preview-src-list="[scope.row.photoList!=null?scope.row.photoList[0]:'']">
+            :preview-src-list="scope.row.photoList">
           </el-image>
         </template>
       </el-table-column>

+ 1 - 1
src/views/gas/patrolTeam/index.vue

@@ -12,7 +12,7 @@
         </el-select>
       </el-form-item>
         <el-form-item label="队伍" prop="ranks">
-          <el-select v-model="queryParams.ranks" clearable placeholder="请选择" @change="getUsers" :disabled="postName.indexOf('xx') > -1">
+          <el-select v-model="queryParams.ranks" clearable placeholder="请选择" @change="getUsers" :disabled="postName.indexOf('xx') > -1&&postName!='xxallrank'">
             <el-option
               v-for="item in postOptions"
               :key="item.postId"

+ 1 - 1
src/views/gas/pipelineGasUser/index.vue

@@ -162,7 +162,7 @@
           <el-image
             style="width: 50px; height: 50px"
             :src="scope.row.photoList!=null?scope.row.photoList[0]:''"
-            :preview-src-list="[scope.row.photoList!=null?scope.row.photoList[0]:'']">
+            :preview-src-list="scope.row.photoList">
           </el-image>
         </template>
       </el-table-column>

+ 1 - 1
src/views/gas/regulatingBoxMaintenance/index.vue

@@ -11,7 +11,7 @@
         />
       </el-form-item>
       <el-form-item label="队伍" prop="ranks">
-        <el-select v-model="queryParams.ranks"  clearable placeholder="请选择队伍" @change="getUsers" :disabled="postName.indexOf('xx') > -1">
+        <el-select v-model="queryParams.ranks"  clearable placeholder="请选择队伍" @change="getUsers" :disabled="postName.indexOf('xx') > -1&&postName!='xxallrank'">
           <el-option
             v-for="item in postOptions"
             :key="item.postId"

+ 18 - 14
src/views/gas/regulatorBox/index.vue

@@ -25,7 +25,7 @@
         />
       </el-form-item>
       <el-form-item label="队伍" prop="ranks">
-        <el-select v-model="queryParams.ranks" clearable placeholder="请选择队伍" @change="getUsers" :disabled="postName.indexOf('xx') > -1">
+        <el-select v-model="queryParams.ranks" clearable placeholder="请选择队伍" @change="getUsers" :disabled="postName.indexOf('xx') > -1&&postName!='xxallrank'">
           <el-option
             v-for="item in postOptions"
             :key="item.postId"
@@ -668,19 +668,23 @@
               <el-input v-model="form.remarks" type="textarea" placeholder="请输入内容"/>
             </el-form-item>
           </el-col>
-          <el-form-item label="审核状态" v-show="isDisabled && form.processStatus!=null">
-            <el-select v-model="form.processStatus" placeholder="请选择审核状态" clearable size="small" @change="$forceUpdate">
-              <el-option
-                v-for="dict in dict.type.process_status"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="审核备注" v-show="isDisabled && form.processStatus!=null">
-            <el-input type="textarea" v-model="form.processComments" placeholder=""/>
-          </el-form-item>
+          <el-col :span="24">
+            <el-form-item label="审核状态" v-if="isDisabled && form.processStatus!=null">
+              <el-select v-model="form.processStatus" placeholder="请选择审核状态" clearable size="small" @change="$forceUpdate">
+                <el-option
+                  v-for="dict in dict.type.process_status"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="审核备注" v-if="isDisabled && form.processStatus!=null">
+              <el-input type="textarea" v-model="form.processComments" placeholder=""/>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">

+ 1 - 1
src/views/gas/roadSectionInspection/index.vue

@@ -21,7 +21,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="队伍" >
-        <el-select v-model="queryParams.ranks" clearable placeholder="请选择队伍" @change="getUsers" :disabled="postName.indexOf('xx') > -1">
+        <el-select v-model="queryParams.ranks" clearable placeholder="请选择队伍" @change="getUsers" :disabled="postName.indexOf('xx') > -1&&postName!='xxallrank'">
           <el-option
             v-for="item in postOptions"
             :key="item.postId"

+ 1 - 1
src/views/gas/valveWellInspection/index.vue

@@ -5,7 +5,7 @@
         <el-input v-model="queryParams.valveWellName" placeholder="请输入阀井名称" clearable size="small"/>
       </el-form-item>
       <el-form-item label="队伍" >
-        <el-select v-model="queryParams.ranks" clearable placeholder="请选择队伍" @change="getUsers" :disabled="postName.indexOf('xx') > -1">
+        <el-select v-model="queryParams.ranks" clearable placeholder="请选择队伍" @change="getUsers" :disabled="postName.indexOf('xx') > -1&&postName!='xxallrank'">
           <el-option
             v-for="item in postOptions"
             :key="item.postId"

+ 1 - 1
src/views/gas/warningPile/index.vue

@@ -100,7 +100,7 @@
           <el-image
             style="width: 50px; height: 50px"
             :src="scope.row.photoList!=null?scope.row.photoList[0]:''"
-            :preview-src-list="[scope.row.photoList!=null?scope.row.photoList[0]:'']">
+            :preview-src-list="scope.row.photoList">
           </el-image>
         </template>
       </el-table-column>