更改

src/components/ConstructionDetails/index.vue

@@ -32,7 +32,7 @@
 <!--                <div-->
 <!--                  style="width: 15px;height: 15px;margin: auto 10px;border-radius: 73%;background-color: #a3d3ff;box-shadow: 1px 1px rgb(131 131 131 / 62%);">-->
 <!--                </div>-->
-                <el-checkbox :label="e.id" @change="handleCheckedCitiesChange">
+                <el-checkbox :label="e.id" @change="handleCheckedCitiesChange" :disabled="currentDicts.some(item=>item.label==='底腿')&&(e.onTheDitch.length==0||e.beforeBottom.length==0||e.inferiorSulcus.length==0||e.legBackfilling.length==0)">
                   <h2 style="margin-left: 1%;font-weight: 700;">{{ e.updateTime }}</h2>
                 </el-checkbox>
                 <h2 :style="'margin-left: 20%;font-weight: 700;'+ (e.state == '1'? 'color: #1ab394':'') ">  {{e.state=='0'?"该施工信息审核未通过":e.state=='1'?"该施工信息审核通过":""}}</h2>
@@ -214,14 +214,14 @@
 
                   <el-form-item
                     v-if="currentDicts.some(item=>item.label==='底腿')"
-                    :prop="i.remark + ''"
+                    :prop="e.zEngineeringMaterialBo[0].number + ''"
                     :class="enginType != '基建工程' && enginType != '民用工程' ? 'labelWidth' : '' "
                     label="第"
-                    v-show="i.remark != null"
+                    v-show="e.zEngineeringMaterialBo[0].number != null"
                     label-width="95px"
                   >
                     <div class="block" style="display: inline-block; margin-right: 20px;">
-                      <el-input v-model="i.remark" placeholder="请输入具体位置" style="width: 90%;" maxlength="255" type="number" :disabled="status == 'read-only'"/><span style="font-weight:bold;">根</span>
+                      <el-input v-model="e.zEngineeringMaterialBo[0].number" placeholder="请输入具体位置" style="width: 90%;" maxlength="255" type="number" :disabled="status == 'read-only'"/><span style="font-weight:bold;">根</span>
                     </div>
                   </el-form-item>
 
@@ -749,8 +749,8 @@
                 ref="obsImageUpload"
                 :limit="11"
                 :fileType="['png', 'jpg', 'jpeg']"
-                @input="getlegBackfillingUrl(arguments,idx)"
-                :value="e.legBackfilling"
+                @input="getinferiorSulcusUrl(arguments,idx)"
+                :value="e.inferiorSulcus"
                 :disabled="status == 'read-only' "
               ></ObsImageUpload>
             </div>
@@ -761,8 +761,8 @@
                 ref="obsImageUpload"
                 :limit="11"
                 :fileType="['png', 'jpg', 'jpeg']"
-                @input="getinferiorSulcusUrl(arguments,idx)"
-                :value="e.inferiorSulcus"
+                @input="getlegBackfillingUrl(arguments,idx)"
+                :value="e.legBackfilling"
                 :disabled="status == 'read-only' "
               ></ObsImageUpload>
             </div>
@@ -1079,7 +1079,11 @@ export default {
           try {
             this.infoIdList.nodeName = this.activeNames
             this.checkingInfo.engInfoId = this.currentEnginId
-            this.checkingInfo.delInfoIdList=this.delinfoidList
+            if(this.currentDicts[0].value == '底腿'){
+              this.checkingInfo.delInfoIdList = [];
+            }else{
+              this.checkingInfo.delInfoIdList=this.delinfoidList
+            }
             this.checkingInfo.infoIdList= this.infoIdList
             console.log('checkWorking',this.checkingInfo)
             this.$emit('checkWorking',this.checkingInfo)

src/components/EnginNodeInfo/index.vue

@@ -80,14 +80,14 @@
         <ObsImageUpload ref="beforeBottom" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.beforeBottom"
                         @input="getbeforeBottomUrl"></ObsImageUpload>
       </el-form-item>
-      <el-form-item label="回填" prop="legBackfilling" v-if="currentContain.includes('legBackfilling')" class="obsImage" :class=" enginType == '顶管工程' ? 'obsActiveImage' : enginType == '基建工程' ? 'obsActiveImageStructure' : '' ">
-        <ObsImageUpload ref="legBackfilling" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.legBackfilling"
-                        @input="getlegBackfillingUrl"></ObsImageUpload>
-      </el-form-item>
-      <el-form-item label="下沟" prop="inferiorSulcus" v-if="currentContain.includes('inferiorSulcus')" class="obsImage" :class=" enginType == '顶管工程' ? 'obsActiveImage' : enginType == '基建工程' ? 'obsActiveImageStructure' : '' ">
+      <el-form-item label="回填" prop="inferiorSulcus" v-if="currentContain.includes('inferiorSulcus')" class="obsImage" :class=" enginType == '顶管工程' ? 'obsActiveImage' : enginType == '基建工程' ? 'obsActiveImageStructure' : '' ">
         <ObsImageUpload ref="inferiorSulcus" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.inferiorSulcus"
                         @input="getinferiorSulcusUrl"></ObsImageUpload>
       </el-form-item>
+      <el-form-item label="下沟" prop="legBackfilling" v-if="currentContain.includes('legBackfilling')" class="obsImage" :class=" enginType == '顶管工程' ? 'obsActiveImage' : enginType == '基建工程' ? 'obsActiveImageStructure' : '' ">
+        <ObsImageUpload ref="legBackfilling" :limit="9999" :fileType="['png', 'jpg', 'jpeg']" :value="nodeInfo.legBackfilling"
+                        @input="getlegBackfillingUrl"></ObsImageUpload>
+      </el-form-item>
 
       <el-form-item label="视频" prop="Video" v-if="currentContain.includes('Video')" class="obsImage" :class=" enginType == '顶管工程' ? 'obsActiveImage' : enginType == '基建工程' ? 'obsActiveImageStructure' : '' ">
         <ObsVideoUpload ref="Video" :limit="9999" :fileType="['mp4']" :value="nodeInfo.video"

src/views/system/user/index.vue

@@ -92,17 +92,17 @@
               v-hasPermi="['system:user:add']"
             >新增</el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button
-              type="success"
-              plain
-              icon="el-icon-edit"
-              size="mini"
-              :disabled="single"
-              @click="handleUpdate"
-              v-hasPermi="['system:user:edit']"
-            >修改</el-button>
-          </el-col>
+<!--          <el-col :span="1.5">-->
+<!--            <el-button-->
+<!--              type="success"-->
+<!--              plain-->
+<!--              icon="el-icon-edit"-->
+<!--              size="mini"-->
+<!--              :disabled="single"-->
+<!--              @click="handleUpdate"-->
+<!--              v-hasPermi="['system:user:edit']"-->
+<!--            >修改</el-button>-->
+<!--          </el-col>-->
           <el-col :span="1.5">
             <el-button
               type="danger"
@@ -172,6 +172,7 @@
                 icon="el-icon-edit"
                 @click="handleUpdate(scope.row)"
                 v-hasPermi="['system:user:edit']"
+                v-if="scope.row.createBy == sysUserName||sysUserName=='admin'"
               >修改</el-button>
               <el-button
                 size="mini"
@@ -281,7 +282,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="用户类型" prop="userType">
-              <el-select v-model="form.userType" placeholder="请选择用户类型">
+              <el-select v-model="form.userType" placeholder="请选择用户类型" :disabled="sysUserName=='wdl'||sysUserName=='htcl'">
                 <el-option
                   v-for="dict in dict.type.sys_user_type"
                   :key="dict.value"
@@ -293,7 +294,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="角色">
-              <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
+              <el-select v-model="form.roleIds" multiple placeholder="请选择角色" :disabled="sysUserName=='wdl'||sysUserName=='htcl'">
                 <el-option
                   v-for="item in roleOptions"
                   :key="item.roleId"
@@ -354,6 +355,7 @@
 <script>
 import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
 import { getToken } from "@/utils/auth";
+import Cookies from "js-cookie";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
@@ -409,6 +411,8 @@ export default {
         children: "children",
         label: "label"
       },
+      // 当前用户信息
+      sysUserName:Cookies.get("username"),
       // 用户导入参数
       upload: {
         // 是否显示弹出层（用户导入）
@@ -592,6 +596,10 @@ export default {
         this.open = true;
         this.title = "添加用户";
         this.form.password = this.initPassword;
+        if(this.sysUserName == 'wdl'||this.sysUserName == 'htcl'){
+          this.form.userType='app_user'
+          this.$set(this.form, "roleIds", ["1770423663032823809"]);
+        }
       });
     },
     /** 修改按钮操作 */
@@ -607,6 +615,10 @@ export default {
         this.open = true;
         this.title = "修改用户";
         this.form.password = "";
+        if(this.sysUserName == 'wdl'||this.sysUserName == 'htcl'){
+          this.form.userType='app_user'
+          this.$set(this.form, "roleIds", ["1770423663032823809"]);
+        }
       });
     },
     /** 重置密码按钮操作 */

src/views/zdsz/engineeringCivil/index.vue

@@ -1476,7 +1476,7 @@ export default {
     },
     createFilter(queryString) {
       return (restaurant) => {
-        return (restaurant.userName.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+        return (restaurant.userName.toLowerCase().indexOf(queryString.toLowerCase()) === 0)||(restaurant.nickName.indexOf(queryString) === 0);
       };
     },
     enginNodeStatusExecuted(item) {

src/views/zdsz/engineeringGY/index.vue

@@ -201,11 +201,11 @@
     <!-- 添加或修改工业工程|工业工程对话框 -->
     <el-dialog :title="title" :visible.sync="open" append-to-body customClass="appendElDialog">
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
-        <el-form-item label="工程名称" prop="enginName">
+        <el-form-item label="工程名称" prop="enginName" v-hasPermi="['zdsz:engineeringgy:add']">
           <el-input v-model="form.enginName" placeholder="请填写工程名称" maxlength="60"
                     :readonly="title == '添加用料' "></el-input>
         </el-form-item>
-        <el-form-item label="建筑单位" prop="constructUnit">
+        <el-form-item label="建筑单位" prop="constructUnit" v-hasPermi="['zdsz:engineeringgy:add']">
           <el-input v-model="form.constructUnit" placeholder="请填写建筑单位" maxlength="50"
                     :readonly="title == '添加用料' "></el-input>
         </el-form-item>
@@ -249,7 +249,7 @@
           <el-input v-model="form.gcPreset" placeholder="请填写钢材预设" maxlength="13" oninput="value=value.match(/\d+(\.\d{0,1})?/) ? value.match(/\d+(\.\d{0,1})?/)[0] : ''"
                     :readonly="title == '添加用料' "></el-input>
         </el-form-item>
-        <el-form-item label="工程分类" prop="enginType">
+        <el-form-item label="工程分类" prop="enginType" v-hasPermi="['zdsz:engineeringgy:add']">
           <el-select v-model="form.enginType" placeholder="请选择工程分类" style="width: 100%"
                      :disabled="title == '添加用料' ">
             <el-option
@@ -260,7 +260,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="工程类型" prop="enginClassification">
+        <el-form-item label="工程类型" prop="enginClassification" v-hasPermi="['zdsz:engineeringgy:add']">
           <el-select v-model="form.enginClassification" placeholder="请选择工程类型" style="width: 100%"  @change="clickByType"
                      :disabled="title == '添加用料' ">
             <el-option

src/views/zdsz/engineeringGasOpening/index.vue

@@ -115,6 +115,17 @@
         >删除
         </el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['zdsz:engineeringGasOpening:export']"
+        >导出
+        </el-button>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -1399,7 +1410,7 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('zdsz/engineeringIndustry/export', {
+      this.download('zdsz/engineeringGasOpening/export', {
         ...this.queryParams
       }, `comprehensive_${new Date().getTime()}.xlsx`)
     }

src/views/zdsz/engineeringIndustry/index.vue

@@ -197,13 +197,14 @@
     <!-- 添加或修改市政工程|工业工程对话框 -->
     <el-dialog :title="title" :visible.sync="open" append-to-body customClass="appendElDialog">
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
-        <el-form-item label="工程名称" prop="enginName">
+        <el-form-item label="工程名称" prop="enginName" v-hasPermi="['zdsz:engineeringIndustry:add']">
           <el-input v-model="form.enginName" placeholder="请填写工程名称" maxlength="60"
-                    :readonly="title == '添加用料' "></el-input>
+                    :readonly="title == '添加用料' "
+          ></el-input>
         </el-form-item>
-        <el-form-item label="建筑单位" prop="constructUnit">
+        <el-form-item label="建筑单位" prop="constructUnit" v-hasPermi="['zdsz:engineeringIndustry:add']">
           <el-input v-model="form.constructUnit" placeholder="请填写建筑单位" maxlength="50"
-                    :readonly="title == '添加用料' "></el-input>
+                    :readonly="title == '添加用料' " ></el-input>
         </el-form-item>
         <el-form-item label="项目负责人" prop="projectHead">
           <el-input v-model="form.projectHead" placeholder="请填写项目负责人" maxlength="20"
@@ -245,9 +246,9 @@
           <el-input v-model="form.gcPreset" placeholder="请填写钢材预设" maxlength="13" oninput="value=value.match(/\d+(\.\d{0,1})?/) ? value.match(/\d+(\.\d{0,1})?/)[0] : ''"
                     :readonly="title == '添加用料' "></el-input>
         </el-form-item>
-        <el-form-item label="工程类型" prop="enginType">
+        <el-form-item label="工程类型" prop="enginType" v-hasPermi="['zdsz:engineeringIndustry:add']">
           <el-select v-model="form.enginType" placeholder="请选择工程类型" style="width: 100%"
-                     :disabled="title == '添加用料' ">
+                     :disabled="title == '添加用料' " >
             <el-option
               v-for="e in EngineepipeType"
               :key="e.dictValue"