底腿添加施工位置

src/components/ConstructionDetails/index.vue

@@ -95,17 +95,16 @@
                     </el-form-item>
                   <el-form-item
                     v-if="currentDicts.some(item=>item.label==='底腿')"
-                    :prop="i.number + ''"
+                    :prop="i.remark + ''"
                     :class="enginType != '基建工程' && enginType != '民用工程' ? 'labelWidth' : '' "
-                    label="管径"
-                    v-show="i.number != null"
+                    label="施工内容"
+                    v-show="currentDicts.some(item=>item.label==='底腿')"
                     label-width="95px"
                   >
                     <div class="block" style="display: inline-block; margin-right: 20px;">
-                      <el-input v-model="i.number" placeholder="请输入管径" style="width: 100%" type="number" oninput="value = value.replace(/[^\d]/g, '');if(value.length>9); value=value.slice(0,9)" max="999999999" :disabled="status == 'read-only'"></el-input>
+                      <el-input v-model="i.remark" placeholder="请输入具体位置" style="width: 100%"   maxlength="100"  :disabled="status == 'read-only'"></el-input>
                     </div>
                   </el-form-item>
-
                   <el-form-item
                     v-if="currentDicts.some(item=>item.label==='底腿')"
                     :prop="e.constructAddre + ''"
@@ -125,18 +124,21 @@
                       </el-select>
                     </div>
                   </el-form-item>
+
                   <el-form-item
                     v-if="currentDicts.some(item=>item.label==='底腿')"
-                    :prop="i.remark + ''"
+                    :prop="i.number + ''"
                     :class="enginType != '基建工程' && enginType != '民用工程' ? 'labelWidth' : '' "
                     label="具体位置"
-                    v-show="currentDicts.some(item=>item.label==='底腿')"
+                    v-show="i.number != null"
                     label-width="95px"
                   >
                     <div class="block" style="display: inline-block; margin-right: 20px;">
-                      <el-input v-model="i.remark" placeholder="请输入具体位置" style="width: 100%"  :disabled="status == 'read-only'"></el-input>
+                      <el-input v-model="i.remark" placeholder="请填写描述" style="width: 200px;" maxlength="255" type="textarea" :disabled="status == 'read-only'"/>
                     </div>
                   </el-form-item>
+
+
 <!--                    <el-form-item-->
 <!--                      v-else-->
 <!--                      :prop="i.number + ''"-->
@@ -346,6 +348,18 @@
               ></ObsImageUpload>
             </div>
             <div style="display: flex;width: 100%;height: 100%;" v-if="currentDicts.some(item=>item.label==='底腿')">
+              <h3 style="width: 95px;font-weight: 600;text-align: center;text-indent: 41px;">沟上部分</h3>
+              <ObsImageUpload
+                :class=" status == 'read-only' ? 'obsImageUploads' : '' "
+                ref="obsImageUpload"
+                :limit="11"
+                :fileType="['png', 'jpg', 'jpeg']"
+                @input="getonTheDitchUrl(arguments,idx)"
+                :value="e.onTheDitch"
+                :disabled="status == 'read-only' "
+              ></ObsImageUpload>
+            </div>
+            <div style="display: flex;width: 100%;height: 100%;" v-if="currentDicts.some(item=>item.label==='底腿')">
               <h3 style="width: 95px;font-weight: 600;text-align: center;text-indent: 41px;">开挖前</h3>
               <ObsImageUpload
                 :class=" status == 'read-only' ? 'obsImageUploads' : '' "
@@ -766,6 +780,11 @@ export default {
     {
       this.currentCollapses[idx].constructionRecords = [...arguments][0][0].map(e=>e.url) || [];
       console.log(this.currentCollapses[idx].constructionRecords)
+    },
+    getonTheDitchUrl(_,idx)
+    {
+      this.currentCollapses[idx].onTheDitch = [...arguments][0][0].map(e=>e.url) || [];
+      console.log(this.currentCollapses[idx].onTheDitch)
     }
   }
 }

src/views/zdsz/engineeringCivil/index.vue

@@ -98,6 +98,42 @@
             />
           </el-select>
       </el-form-item>
+      <el-form-item label="施工时间" prop="completionStatus">
+        <el-date-picker
+          v-model="queryParams1.beginTime"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
+          >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="施工人" prop="completionStatus">
+<!--        <el-select v-model="queryParams1.createBy" placeholder="请选择施工人" filterable clearable-->
+<!--                   @clear="">-->
+<!--          <el-option-->
+<!--            v-for="dict in userList"-->
+<!--            :key="dict.userName"-->
+<!--            :label="dict.userName"-->
+<!--            :value="dict.userName"-->
+<!--          />-->
+<!--        </el-select>-->
+        <el-autocomplete
+          popper-class="my-autocomplete"
+          v-model="queryParams1.createBy"
+          :fetch-suggestions="querySearch"
+          value-key="userName"
+          placeholder="请输入内容"
+          @select="handleSelect"
+        >
+          <template slot-scope="{ item }">
+            <div class="name">{{ item.nickName }}</div>
+            <span class="addr">{{item.userName }}</span>
+          </template>
+
+        </el-autocomplete>
+      </el-form-item>
       <!--      <el-form-item label="工程周期" prop="enginCycle">-->
       <!--        <el-select v-model="queryParams1.enginCycle" placeholder="请选择工程周期" clearable-->
       <!--                   @clear="">-->
@@ -765,6 +801,7 @@ import {getDicts} from "@/api/system/dict/data";
 import EnginNodeInfo from "@/components/EnginNodeInfo/index";
 import EngineePipe from '@/components/EngineePipe'
 import ConstructionDetails from "@/components/ConstructionDetails/index.vue";
+import {listAll} from "@/api/system/user";
 
 function formatDate(date) {
   const days = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
@@ -1089,11 +1126,12 @@ export default {
           components: [
             [
               'caliber' ,// 管径
-                'specificConstruction', //具体施工位置
+              'specificConstruction', //具体施工位置
               'constructAddre'//位置
             ],
             'constructTime',
             'beforeBottom',
+            'onTheDitch',
             'legBackfilling',
             'inferiorSulcus',                // 照片
           ]
@@ -1197,7 +1235,9 @@ export default {
         enginCycle: 0,
         completionStatus: undefined,
         imgUrl: undefined,
-        type: undefined
+        type: undefined,
+        beginTime:[],
+        createBy:''
       },
       zEngineeringInfoBo: {
         constructAddre: '',        // 施工地址
@@ -1318,13 +1358,15 @@ export default {
       ],
       zEngineeringNodeBo: {},
       currentEnginName: null,
-      currentCheckingEnginList: []
+      currentCheckingEnginList: [],
+      userList:[]
     };
   },
   created() {
     this.getList();
   },
   mounted() {
+    this.listAll()
   },
   computed: {
     currentContain(e) {
@@ -1332,6 +1374,20 @@ export default {
     }
   },
   methods: {
+    querySearch(queryString, cb) {
+      var restaurants = this.userList;
+      var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+      // 调用 callback 返回建议列表的数据
+      cb(results);
+    },
+    handleSelect(item) {
+      console.log(item);
+    },
+    createFilter(queryString) {
+      return (restaurant) => {
+        return (restaurant.userName.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+      };
+    },
     enginNodeStatusExecuted(item) {
       try {
         let flag
@@ -1374,6 +1430,12 @@ export default {
           }
       })
     },
+    listAll()
+    {
+      listAll({status:0}).then(res=>{
+        this.userList=res.data
+      })
+    },
   checkingAllSubmit() {
       this.$refs.checkingFormAll.validate(valid => {
         if (valid) {
@@ -1697,6 +1759,7 @@ export default {
         this.total = response.total;
         this.loading = false;
       });
+
     },
     // 取消按钮
     cancel() {
@@ -2061,4 +2124,23 @@ export default {
     height: 115px;
   }
 }
+.my-autocomplete {
+  li {
+    line-height: normal;
+    padding: 7px;
+
+    .name {
+      text-overflow: ellipsis;
+      overflow: hidden;
+    }
+    .addr {
+      font-size: 12px;
+      color: #b4b4b4;
+    }
+
+    .highlighted .addr {
+      color: #ddd;
+    }
+  }
+}
 </style>