去除工程周期

src/api/zdsz/overhead.js

@@ -31,7 +31,7 @@ export function getEnginSpecificationsList(materId) {
 }
 export function getsumStatus(materId) {
   return request({
-    url: `/zdsz/engineeringCivil/getsumStatus?enginCycle=${materId}`,
+    url: `/zdsz/engineeringCivil/getsumStatus?enginCycle=0`,
     method: 'get',
   })
 }

src/views/zdsz/enginee/material/echarts_statistics/index.vue

@@ -10,18 +10,18 @@
     <!--        <div class="topContain">-->
     <div style="width: 100%;height: 100%;display: flex;">
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-    <el-form-item label="工程周期" prop="enginCycle">
-      <el-select v-model="queryParams.enginCycle" filterable clearable placeholder="请选择工程周期"
-                 @change="getsumStatus(queryParams.enginCycle)"
-      >
-        <el-option
-          v-for="dict in dict.type.engin_cycle"
-          :key="dict.value"
-          :label="dict.label"
-          :value="dict.value"
-        />
-      </el-select>
-    </el-form-item>
+<!--    <el-form-item label="工程周期" prop="enginCycle">-->
+<!--      <el-select v-model="queryParams.enginCycle" filterable clearable placeholder="请选择工程周期"-->
+<!--                 @change="getsumStatus(queryParams.enginCycle)"-->
+<!--      >-->
+<!--        <el-option-->
+<!--          v-for="dict in dict.type.engin_cycle"-->
+<!--          :key="dict.value"-->
+<!--          :label="dict.label"-->
+<!--          :value="dict.value"-->
+<!--        />-->
+<!--      </el-select>-->
+<!--    </el-form-item>-->
       </el-form>
   </div>
     <div style="height: 800px;width: 1700px">

src/views/zdsz/enginee/material/material_statistics/index.vue

@@ -58,17 +58,17 @@
                     </el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item label="工程周期" prop="enginCycle" label-width="80px">
-                  <el-select v-model="queryParams.enginCycle" filterable clearable placeholder="请选择规格"
-                  >
-                    <el-option
-                      v-for="dict in dict.type.engin_cycle"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
-                  </el-select>
-                </el-form-item>
+<!--                <el-form-item label="工程周期" prop="enginCycle" label-width="80px">-->
+<!--                  <el-select v-model="queryParams.enginCycle" filterable clearable placeholder="请选择规格"-->
+<!--                  >-->
+<!--                    <el-option-->
+<!--                      v-for="dict in dict.type.engin_cycle"-->
+<!--                      :key="dict.value"-->
+<!--                      :label="dict.label"-->
+<!--                      :value="dict.value"-->
+<!--                    />-->
+<!--                  </el-select>-->
+<!--                </el-form-item>-->
 
                 <el-form-item>
                   <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -112,10 +112,10 @@
                 prop="realitySize"
                 label="实际用料">
               </el-table-column>
-              <el-table-column
-                prop="enginCycle"
-                label="工程周期">
-              </el-table-column>
+<!--              <el-table-column-->
+<!--                prop="enginCycle"-->
+<!--                label="工程周期">-->
+<!--              </el-table-column>-->
             </el-table>
 
         </div>
@@ -206,7 +206,7 @@ export default {
             areaId:undefined,
             realityQuality:undefined,
             realitySpecifications:undefined,
-            enginCycle:null
+            enginCycle:0
           },
           EnginMaterialQualityList:[],
           EnginSpecificationsList:[],
@@ -218,9 +218,6 @@ export default {
               areaId: [
                   {required: true, message: "小区不能为空", trigger: ['change']}
               ],
-              enginCycle: [
-                  {required: true, message: "工程周期不能为空", trigger: ['change']}
-              ],
           }
 
         }
@@ -271,7 +268,7 @@ export default {
             areaId:undefined,
             realityQuality:undefined,
             realitySpecifications:undefined,
-            enginCycle:null
+            enginCycle:0
           },
         this.tableData=[]
         //this.handleQuery();

src/views/zdsz/enginee/material/progres_statistics/progres_statistics.vue

@@ -34,16 +34,16 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="工程周期" prop="enginCycle" label-width="80px">
-              <el-select v-model="queryParams.enginCycle" filterable clearable placeholder="请选择规格">
-                <el-option
-                  v-for="dict in dict.type.engin_cycle"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
+<!--            <el-form-item label="工程周期" prop="enginCycle" label-width="80px">-->
+<!--              <el-select v-model="queryParams.enginCycle" filterable clearable placeholder="请选择规格">-->
+<!--                <el-option-->
+<!--                  v-for="dict in dict.type.engin_cycle"-->
+<!--                  :key="dict.value"-->
+<!--                  :label="dict.label"-->
+<!--                  :value="dict.value"-->
+<!--                />-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
               <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -134,9 +134,9 @@ export default {
                 areaId: [
                     {required: true, message: "小区不能为空", trigger: ['change']}
                 ],
-                enginCycle: [
-                    {required: true, message: "工程周期不能为空", trigger: ['change']}
-                ],
+                // enginCycle: [
+                //     {required: true, message: "工程周期不能为空", trigger: ['change']}
+                // ],
             }
         }
     },

src/views/zdsz/enginee/material/progres_visual/index.vue

@@ -65,20 +65,20 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="工程周期" prop="enginCycle" style="width: 218px;">
-          <el-select
-            :disabled="title == '添加用料' "
-            v-model="searchParam.enginCycle"
-            placeholder="请填写工程周期"
-          >
-            <el-option
-              v-for="e in dict.type.engin_cycle"
-              :key="e.value"
-              :label="e.label"
-              :value="e.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="工程周期" prop="enginCycle" style="width: 218px;">-->
+<!--          <el-select-->
+<!--            :disabled="title == '添加用料' "-->
+<!--            v-model="searchParam.enginCycle"-->
+<!--            placeholder="请填写工程周期"-->
+<!--          >-->
+<!--            <el-option-->
+<!--              v-for="e in dict.type.engin_cycle"-->
+<!--              :key="e.value"-->
+<!--              :label="e.label"-->
+<!--              :value="e.value"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
       </el-form>
       <!-- <div style="width: 100%;height: 100%;">
           <el-select
@@ -280,7 +280,7 @@ export default {
       },
       searchParam: {
         district: null,
-        enginCycle: null,
+        enginCycle: 0,
         areaId: null,
         buildingId: null,
         unitId: null,
@@ -297,9 +297,9 @@ export default {
         areaId: [
           {required: true, message: "小区不能为空", trigger: ['change']}
         ],
-        enginCycle: [
-          {required: true, message: "工程周期不能为空", trigger: ['change']}
-        ],
+        // enginCycle: [
+        //   {required: true, message: "工程周期不能为空", trigger: ['change']}
+        // ],
       }
     }
   },
@@ -310,6 +310,7 @@ export default {
       // 拼接字典
       console.log(e)
       console.log(e.enginCycle)
+      e.enginCycle = 0
       console.log(this.dict.type[e.enginCycle])
       this.dict.type[e.enginCycle].forEach(v => {
         if (v.label.includes('室内')) {

src/views/zdsz/engineeringCivil/index.vue

@@ -74,17 +74,17 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="工程周期" prop="enginCycle">
-        <el-select v-model="queryParams1.enginCycle" placeholder="请选择工程周期" clearable
-                   @clear="">
-          <el-option
-            v-for="dict in dict.type.engin_cycle"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item label="工程周期" prop="enginCycle">-->
+<!--        <el-select v-model="queryParams1.enginCycle" placeholder="请选择工程周期" clearable-->
+<!--                   @clear="">-->
+<!--          <el-option-->
+<!--            v-for="dict in dict.type.engin_cycle"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
 
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -170,11 +170,11 @@
         </template>
       </el-table-column>
       <el-table-column label="工程分类" align="center" prop="enginClassificationName"/>
-      <el-table-column label="工程周期" align="center" prop="enginCycle">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.engin_cycle" :value="scope.row.enginCycle"/>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="工程周期" align="center" prop="enginCycle">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.engin_cycle" :value="scope.row.enginCycle"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <!--      <el-table-column label="完工状态" align="center" prop="completionStatus"/>-->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300">
         <template slot-scope="scope">
@@ -380,22 +380,22 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="工程周期" prop="enginCycle">
-              <el-select
-                :disabled="title == '添加用料' "
-                v-model="queryParams.enginCycle"
-                placeholder="请填写工程周期"
-              >
-                <el-option
-                  v-for="e in dict.type.engin_cycle"
-                  :key="e.value"
-                  :label="e.label"
-                  :value="e.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="工程周期" prop="enginCycle">-->
+<!--              <el-select-->
+<!--                :disabled="title == '添加用料' "-->
+<!--                v-model="queryParams.enginCycle"-->
+<!--                placeholder="请填写工程周期"-->
+<!--              >-->
+<!--                <el-option-->
+<!--                  v-for="e in dict.type.engin_cycle"-->
+<!--                  :key="e.value"-->
+<!--                  :label="e.label"-->
+<!--                  :value="e.value"-->
+<!--                ></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
         <el-row>
           <el-col :span="24" v-if="title!=='修改民用工程'">
@@ -882,7 +882,7 @@ export default {
         unitId: undefined,
         houseId: undefined,
         enginType: undefined,
-        enginCycle: undefined,
+        enginCycle: 0,
         completionStatus: undefined,
         enginClassification: undefined,
         imgUrl: undefined,
@@ -915,7 +915,7 @@ export default {
         houseId: undefined,
         enginType: undefined,
         enginClassification: undefined,
-        enginCycle: undefined,
+        enginCycle: 0,
         completionStatus: undefined,
         imgUrl: undefined,
       },
@@ -964,9 +964,9 @@ export default {
         enginClassification: [
           {required: true, message: "工程分类不能为空", trigger: "change"}
         ],
-        enginCycle: [
-          {required: true, message: "工程周期不能为空", trigger: "change"}
-        ],
+        // enginCycle: [
+        //   {required: true, message: "工程周期不能为空", trigger: "change"}
+        // ],
         completionStatus: [
           {required: true, message: "完工状态不能为空", trigger: "change"}
         ],
@@ -1132,9 +1132,9 @@ export default {
       console.log(this.currentEnginName )
       viewEngineeringCivilSource({
         id: this.enginId,
-        type: e || this.currentEnginName 
+        type: e || this.currentEnginName
       }).then(res => {
-        console.log('______', res) 
+        console.log('______', res)
         this.createTime = res.data.createTime
         try {
           this.updateParams = res.data
@@ -1353,7 +1353,7 @@ export default {
         houseId: undefined,
         enginType: undefined,
         enginClassification: undefined,
-        enginCycle: undefined,
+        enginCycle: 0,
         completionStatus: undefined,
         version: undefined,
         imgUrl: undefined,
@@ -1372,7 +1372,7 @@ export default {
         houseId: undefined,
         enginType: undefined,
         enginClassification: undefined,
-        enginCycle: undefined,
+        enginCycle: 0,
         completionStatus: undefined,
         imgUrl: undefined,
         // zEngineeringNodeBo: {
@@ -1438,7 +1438,7 @@ export default {
               console.log('nodeCollection:', nodeItem)
             console.log('nodeCollection:', this.$refs['EnginNodeInfo' + idx][0])
             },2000)
-            
+
           })
           this.queryParams.zEngineeringNodeBoList = nodeCollection
           if (this.enginNodeStatus == '修改') {
@@ -1502,7 +1502,7 @@ export default {
           // this.$message.error(`请完善信息!`);
         }
       })
-      
+
 
       return
       getDictList({enginType: ['new_built', 'old_renovation']}).then(res => {

src/views/zdsz/engineeringInfrastructure/index.vue

@@ -710,7 +710,7 @@ export default {
   methods: {
     enginNodeStatusExecuted(item){
       try {
-        let flag  
+        let flag
         if(this.currentCheckingEnginList.filter(e => e.label == item.label)[0].status == '1') return true
       } catch (error) {
         return false
@@ -900,7 +900,7 @@ export default {
       this.nodeDetailVisible = false
     },
     toNodeDetail(){
-      this.$refs.form.validate(valid => { 
+      this.$refs.form.validate(valid => {
         if(valid){
           let nodeCollection = []
           // 收集节点信息
@@ -980,7 +980,7 @@ export default {
 
         }
       })
-      
+
       return
       getDictList({enginType:['engineering_infrastructure']}).then(res => {
         this.nodeList = res.data
@@ -1094,7 +1094,7 @@ export default {
         houseId: undefined,
         enginType: undefined,
         enginClassification: undefined,
-        enginCycle: undefined,
+        enginCycle: 0,
         completionStatus: undefined,
         version: undefined,
         imgUrl: undefined,
@@ -1113,7 +1113,7 @@ export default {
         houseId: undefined,
         enginType: undefined,
         enginClassification: undefined,
-        enginCycle: undefined,
+        enginCycle: 0,
         completionStatus: undefined,
         imgUrl: undefined,
         files:[],

src/views/zdsz/engineeringMaterialsResets/index.vue

@@ -77,11 +77,11 @@
       <el-table-column label="材质" align="center" prop="materialQualityName" />
       <el-table-column label="规格" align="center" prop="estimatedSpecificationsName" />
       <el-table-column label="预估尺寸（米）" align="center" prop="estimatedSize" />
-      <el-table-column label="工程周期" align="center" prop="enginCycle" >
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.engin_cycle" :value="scope.row.enginCycle"/>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="工程周期" align="center" prop="enginCycle" >-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.engin_cycle" :value="scope.row.enginCycle"/>-->
+<!--        </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">
@@ -127,17 +127,17 @@
         <el-form-item label="预估尺寸（米）" prop="estimatedSize" class="estimatedSizeStyle">
           <el-input-number @input.native="changeInput($event)" v-model="form.estimatedSize" controls-position="right" placeholder="请输入预估尺寸" style="width: 100%"   :max="999999999"/>
         </el-form-item>
-        <el-form-item label="工程周期" prop="enginCycle">
-<!--          <el-input-number  v-model="form.enginCycle" controls-position="right" placeholder="请输入工程周期" style="width: 100%" />-->
-          <el-select v-model="form.enginCycle" placeholder="请选择工程周期" filterable style="width: 100%">
-            <el-option
-              v-for="obj in dict.type.engin_cycle"
-              :key="obj.value"
-              :label="obj.label"
-              :value="obj.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="工程周期" prop="enginCycle">-->
+<!--&lt;!&ndash;          <el-input-number  v-model="form.enginCycle" controls-position="right" placeholder="请输入工程周期" style="width: 100%" />&ndash;&gt;-->
+<!--          <el-select v-model="form.enginCycle" placeholder="请选择工程周期" filterable style="width: 100%">-->
+<!--            <el-option-->
+<!--              v-for="obj in dict.type.engin_cycle"-->
+<!--              :key="obj.value"-->
+<!--              :label="obj.label"-->
+<!--              :value="obj.value"-->
+<!--            ></el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item label="材质" prop="materialQuality">
 <!--          <el-input-number  v-model="form.materialQuality" controls-position="right" placeholder="请选择材质" style="width: 100%" />-->
           <el-select v-model="form.materialQuality" placeholder="请选择材质" style="width: 100%" @change="selectEstimated">
@@ -214,7 +214,7 @@ export default {
         materialQuality: undefined,
         estimatedSpecifications: undefined,
         estimatedSize: undefined,
-        enginCycle: undefined,
+        enginCycle: 0,
       },
       // 表单参数
       form: {},
@@ -235,9 +235,9 @@ export default {
         estimatedSize: [
           { required: true, message: "预估尺寸不能为空", trigger: "blur" }
         ],
-        enginCycle: [
-          { required: true, message: "工程周期不能为空", trigger: "change" }
-        ],
+        // enginCycle: [
+        //   { required: true, message: "工程周期不能为空", trigger: "change" }
+        // ],
         remark: [
           { required: false, message: "备注不能为空", trigger: "blur" }
         ],
@@ -255,7 +255,7 @@ export default {
   methods: {
     changeInput(e){
       if(e.target.value.indexOf('.') >= 0){
-        e.target.value = e.target.value.substring(0,e.target.value.indexOf('.') + 3); 
+        e.target.value = e.target.value.substring(0,e.target.value.indexOf('.') + 3);
       }
     },
     getAreaList() {
@@ -290,7 +290,7 @@ export default {
         materialQuality: undefined,
         estimatedSpecifications: undefined,
         estimatedSize: undefined,
-        enginCycle: undefined,
+        enginCycle: 0,
         remark: undefined,
         delFlag: 0,
         createBy: undefined,
@@ -401,4 +401,4 @@ export default {
   }
 }
 
-</style>
+</style>