Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

src/components/ConstructionDetails/index.vue

@@ -36,14 +36,14 @@
             </template>
             <!--  人员信息 -->
             <div class="personInfo">
-              <span>负责人：{{ e.headName }} </span>
-              <span>负责人电话：{{
-                  e.headPhone === undefined || e.headPhone === null || e.headPhone === '' ? '无' : e.headPhone
-                }}</span>
-<!--              <span>施工人：{{ e.constructUser }}</span>-->
-<!--              <span>施工人电话：{{-->
-<!--                  e.constructPhone === undefined || e.constructPhone === null || e.constructPhone === '' ? '无' : e.constructPhone-->
-<!--                  }}</span>-->
+<!--              <span>负责人：{{ e.headName }} </span>-->
+<!--              <span>负责人电话：{{-->
+<!--                  e.headPhone === undefined || e.headPhone === null || e.headPhone === '' ? '无' : e.headPhone-->
+<!--                }}</span>-->
+              <span>施工人：{{ e.constructUser }}</span>
+              <span>施工人电话：{{
+                  e.constructPhone === undefined || e.constructPhone === null || e.constructPhone === '' ? '无' : e.constructPhone
+                  }}</span>
             </div>
             <hr>
             <!--  用料明细 -->

src/components/EngineeNode/index.vue

@@ -215,7 +215,7 @@ import {updateEngineeringDangerous, addEngineeringDangerous} from "@/api/zdsz/en
 
 export default {
   name: 'EngineeNode',
-  dicts: ['pass_check',
+  dicts: ['sys_yes_no',
     'is_repair',
     'engin_type',
     'self_closing_valve_type',

src/views/system/role/index.vue

@@ -157,7 +157,7 @@
     />
 
     <!-- 添加或修改角色配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="角色名称" prop="roleName">
           <el-input v-model="form.roleName" placeholder="请输入角色名称" />
@@ -183,6 +183,15 @@
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="工程类型">
+          <el-checkbox-group v-model="form.enginTypeList">
+            <el-checkbox
+              v-for="dict in dict.type.engin_type"
+              :key="dict.value"
+              :label="dict.label"
+            ></el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
         <el-form-item label="菜单权限">
           <el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">展开/折叠</el-checkbox>
           <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">全选/全不选</el-checkbox>
@@ -258,7 +267,7 @@ import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/m
 
 export default {
   name: "Role",
-  dicts: ['sys_normal_disable'],
+  dicts: ['sys_normal_disable','engin_type'],
   data() {
     return {
       // 遮罩层
@@ -432,6 +441,7 @@ export default {
         status: "0",
         menuIds: [],
         deptIds: [],
+        enginTypeList:[],
         menuCheckStrictly: true,
         deptCheckStrictly: true,
         remark: undefined
@@ -512,6 +522,7 @@ export default {
       const roleMenu = this.getRoleMenuTreeselect(roleId);
       getRole(roleId).then(response => {
         this.form = response.data;
+        this.form.enginTypeList = this.form.enginTypeList != null ? this.form.enginTypeList.split(","):[];
         this.open = true;
         this.$nextTick(() => {
           roleMenu.then(res => {
@@ -558,6 +569,7 @@ export default {
         if (valid) {
           if (this.form.roleId != undefined) {
             this.form.menuIds = this.getMenuAllCheckedKeys();
+            this.form.enginTypeList = this.form.enginTypeList.join(",");
             updateRole(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -565,6 +577,7 @@ export default {
             });
           } else {
             this.form.menuIds = this.getMenuAllCheckedKeys();
+            this.form.enginTypeList = this.form.enginTypeList.join(",");
             addRole(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;

src/views/zdsz/engineeringCivil/index.vue

@@ -252,8 +252,8 @@
               placement="top-start"
               trigger="hover"
               :content="item.Type">
-              <span slot="reference" v-if="item.state == '1'||item.state == '2'" style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #30B08F"></span>
-              <span slot="reference" v-if="item.state == '0'" style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #C03639"></span>
+              <span slot="reference" v-if="item.state == '1'||item.state == '2'" style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #30B08F;"></span>
+              <span slot="reference" v-if="item.state == '0'" style="height: 20px;margin-right: 5px;width: 20px; border-radius: 50%; display: inline-block; background-color: #C03639;"></span>
             </el-popover>
           </div>
         </template>
@@ -487,7 +487,6 @@
                   :disabled=enginNodeStatusExecuted(item)
                   :label="item.dictValue"
                   v-for="item in checkList"
-
                   :key="item"
                 ></el-checkbox>
               </el-checkbox-group>
@@ -826,7 +825,7 @@ export default {
   },
 
   name: "EngineeringCivil",
-  dicts: ['pass_check',
+  dicts: ['sys_yes_no',
     'is_repair',
     'engin_type',
     'old_renovation',

src/views/zdsz/engineeringIndustry/index.vue

@@ -337,7 +337,7 @@ import {getEnginSpecificationsList} from '@/api/zdsz/enginSpecifications'
 
 export default {
   name: "openrepair",
-  dicts: ['pass_check', 'is_repair', 'industry_engin_type', 'self_closing_valve_type', 'visit_type', 'engin_classification', 'engineering_infrastructure'],
+  dicts: ['sys_yes_no', 'is_repair', 'industry_engin_type', 'self_closing_valve_type', 'visit_type', 'engin_classification', 'engineering_infrastructure'],
   components: {
     ConstructionDetails,
     EngineePipe

src/views/zdsz/engineeringPipeJacking/index.vue

@@ -300,7 +300,7 @@ export default {
     EngineePipe,
     ConstructionDetails
   },
-  dicts:['pass_check','is_repair','engin_type','self_closing_valve_type','visit_type','pipe_jack'],
+  dicts:['sys_yes_no','is_repair','engin_type','self_closing_valve_type','visit_type','pipe_jack'],
   data() {
     return {
       currentCollapses:[],  // 当前节点历史数据

src/views/zdsz/openbolt/index.vue

@@ -138,16 +138,11 @@
       <el-table-column label="楼栋" align="center" prop="buildingName" />
       <el-table-column label="单元" align="center" prop="unitName" />
       <el-table-column label="房间" align="center" prop="houseName" />
-<!--      <el-table-column label="安检是否合格" align="center" prop="isQualified">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.pass_check" :value="scope.row.isQualified"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      <el-table-column label="是否维修" align="center" prop="isMaintenance">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.is_repair" :value="scope.row.isMaintenance"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <el-table-column label="是否开栓" align="center" prop="isQualified">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isQualified"/>
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -247,6 +242,18 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否开栓" prop="isQualified">
+              <el-select v-model="form.isQualified" placeholder="请选择是否开栓" filterable style="width: 100%;">
+                <el-option
+                  v-for="dict in dict.type.sys_yes_no"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="24">
@@ -280,7 +287,7 @@ import {listAll} from "@/api/system/user";
 
 export default {
   name: "openbolt",
-  dicts:['pass_check','is_repair','district'],
+  dicts:['sys_yes_no','is_repair','district'],
   data() {
     return {
       // 按钮loading
@@ -318,7 +325,6 @@ export default {
         houseId: undefined,
         type: 1,
         isQualified: undefined,
-        isMaintenance: undefined,
       },
       // 表单参数
       form: {},
@@ -349,10 +355,7 @@ export default {
           { required: false, message: "类型不能为空", trigger: "change" }
         ],
         isQualified: [
-          { required: false, message: "安检是否合格不能为空", trigger: "blur" }
-        ],
-        isMaintenance: [
-          { required: false, message: "是否维修不能为空", trigger: "blur" }
+          { required: false, message: "是否合格不能为空", trigger: "blur" }
         ],
         // photo: [
         //   { required: true, message: "照片不能为空", trigger: "blur" }
@@ -479,7 +482,6 @@ export default {
         houseId: undefined,
         type: 1,
         isQualified: undefined,
-        isMaintenance: undefined,
         photo: undefined,
         remark: undefined,
         delFlag: 0,
@@ -517,7 +519,6 @@ export default {
           houseId: undefined,
           type: 1,
           isQualified: undefined,
-          isMaintenance: undefined,
       }
       this.handleQuery();
     },

src/views/zdsz/opencheck/index.vue

@@ -135,16 +135,11 @@
       <el-table-column label="楼栋" align="center" prop="buildingName" />
       <el-table-column label="单元" align="center" prop="unitName" />
       <el-table-column label="房间" align="center" prop="houseName" />
-      <el-table-column label="安检是否合格" align="center" prop="isQualified">
+      <el-table-column label="是否合格" align="center" prop="isQualified">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.pass_check" :value="scope.row.isQualified"/>
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isQualified"/>
         </template>
       </el-table-column>
-<!--      <el-table-column label="是否维修" align="center" prop="isMaintenance">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.is_repair" :value="scope.row.isMaintenance"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
       <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -245,10 +240,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="安检是否合格" prop="isQualified">
-              <el-select v-model="form.isQualified" placeholder="请选择安检是否合格" filterable style="width: 100%">
+            <el-form-item label="是否合格" prop="isQualified">
+              <el-select v-model="form.isQualified" placeholder="请选择是否合格" filterable style="width: 100%">
                 <el-option
-                  v-for="obj in dict.type.pass_check"
+                  v-for="obj in dict.type.sys_yes_no"
                   :key="obj.value"
                   :label="obj.label"
                   :value="obj.value"
@@ -256,18 +251,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-<!--          <el-col :span="12">-->
-<!--            <el-form-item label="是否维修" prop="isMaintenance">-->
-<!--              <el-select v-model="form.isMaintenance" placeholder="请选择是否维修" filterable style="width: 100%">-->
-<!--                <el-option-->
-<!--                  v-for="obj in dict.type.is_repair"-->
-<!--                  :key="obj.value"-->
-<!--                  :label="obj.label"-->
-<!--                  :value="obj.value"-->
-<!--                ></el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
         </el-row>
         <el-row :gutter="20">
           <el-col :span="24">
@@ -301,7 +284,7 @@ import {listAll} from "@/api/system/user";
 
 export default {
   name: "opencheck",
-  dicts:['pass_check','is_repair','district'],
+  dicts:['sys_yes_no','is_repair','district'],
   data() {
     return {
       // 按钮loading
@@ -339,7 +322,6 @@ export default {
         houseId: undefined,
         type: 2,
         isQualified: undefined,
-        isMaintenance: undefined,
       },
       // 表单参数
       form: {},
@@ -370,10 +352,7 @@ export default {
           { required: false, message: "类型不能为空", trigger: "change" }
         ],
         isQualified: [
-          { required: true, message: "安检是否合格不能为空", trigger: "blur" }
-        ],
-        isMaintenance: [
-          { required: false, message: "是否维修不能为空", trigger: "blur" }
+          { required: true, message: "是否合格不能为空", trigger: "blur" }
         ],
         remark: [
           { required: false, message: "备注不能为空", trigger: "blur" }
@@ -492,7 +471,6 @@ export default {
         houseId: undefined,
         type: 2,
         isQualified: undefined,
-        isMaintenance: undefined,
         photo: undefined,
         remark: undefined,
         delFlag: 0,
@@ -530,7 +508,6 @@ export default {
         houseId: undefined,
         type: 2,
         isQualified: undefined,
-        isMaintenance: undefined,
       }
       this.handleQuery();
     },

src/views/zdsz/openrepair/index.vue

@@ -135,21 +135,11 @@
       <el-table-column label="楼栋" align="center" prop="buildingName" />
       <el-table-column label="单元" align="center" prop="unitName" />
       <el-table-column label="房间" align="center" prop="houseName" />
-<!--      <el-table-column label="安检是否合格" align="center" prop="isQualified">-->
-<!--        <template slot-scope="scope">-->
-<!--          <dict-tag :options="dict.type.pass_check" :value="scope.row.isQualified"/>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-      <el-table-column label="是否维修" align="center" prop="isMaintenance">
+      <el-table-column label="是否合格" align="center" prop="isQualified">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.is_repair" :value="scope.row.isMaintenance"/>
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isQualified"/>
         </template>
       </el-table-column>
-      <!--      <el-table-column label="是否维修" align="center" prop="isMaintenance">-->
-      <!--        <template slot-scope="scope">-->
-      <!--          <dict-tag :options="dict.type.is_repair" :value="scope.row.isMaintenance"/>-->
-      <!--        </template>-->
-      <!--      </el-table-column>-->
       <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -251,23 +241,11 @@
           </el-col>
         </el-row>
         <el-row :gutter="20">
-<!--          <el-col :span="12">-->
-<!--            <el-form-item label="安检是否合格" prop="isQualified">-->
-<!--              <el-select v-model="form.isQualified" placeholder="请选择安检是否合格" filterable style="width: 100%">-->
-<!--                <el-option-->
-<!--                  v-for="obj in dict.type.pass_check"-->
-<!--                  :key="obj.value"-->
-<!--                  :label="obj.label"-->
-<!--                  :value="obj.value"-->
-<!--                ></el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
           <el-col :span="12">
-            <el-form-item label="是否维修" prop="isMaintenance">
-              <el-select v-model="form.isMaintenance" placeholder="请选择是否维修" filterable style="width: 100%">
+            <el-form-item label="是否合格" prop="isQualified">
+              <el-select v-model="form.isQualified" placeholder="请选择是否合格" filterable style="width: 100%">
                 <el-option
-                  v-for="obj in dict.type.is_repair"
+                  v-for="obj in dict.type.sys_yes_no"
                   :key="obj.value"
                   :label="obj.label"
                   :value="obj.value"
@@ -308,7 +286,7 @@ import {listAll} from "@/api/system/user";
 
 export default {
   name: "opencheck",
-  dicts:['pass_check','is_repair','district'],
+  dicts:['sys_yes_no','is_repair','district'],
   data() {
     return {
       // 按钮loading
@@ -346,7 +324,6 @@ export default {
         houseId: undefined,
         type: 3,
         isQualified: undefined,
-        isMaintenance: undefined,
       },
       // 表单参数
       form: {},
@@ -377,10 +354,7 @@ export default {
           { required: false, message: "类型不能为空", trigger: "change" }
         ],
         isQualified: [
-          { required: true, message: "安检是否合格不能为空", trigger: "blur" }
-        ],
-        isMaintenance: [
-          { required: false, message: "是否维修不能为空", trigger: "blur" }
+          { required: true, message: "是否合格不能为空", trigger: "blur" }
         ],
         remark: [
           { required: false, message: "备注不能为空", trigger: "blur" }
@@ -499,7 +473,6 @@ export default {
         houseId: undefined,
         type: 3,
         isQualified: undefined,
-        isMaintenance: undefined,
         photo: undefined,
         remark: undefined,
         delFlag: 0,
@@ -537,7 +510,6 @@ export default {
         houseId: undefined,
         type: 3,
         isQualified: undefined,
-        isMaintenance: undefined,
       }
       this.handleQuery();
     },