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

src/components/ConstructionDetails/index.vue

@@ -50,7 +50,7 @@
                 <el-form :model="nodeInfo" class="nodeForm">
                     <el-form-item
                       :prop="i.materialQuality"
-                      label-width="100px"
+                      :class="enginType != '基建工程' && enginType != '民用工程' ? 'labelWidth' : '' "
                       label="材质"
                       v-show="i.materialQuality != null"
                       >
@@ -67,7 +67,7 @@
                     </el-form-item>
                     <el-form-item
                       :prop="i.specifications"
-                      label-width="100px"
+                      :class="enginType != '基建工程' && enginType != '民用工程' ? 'labelWidth' : '' "
                       label="规格"
                       v-show="i.specifications != null"
 
@@ -83,7 +83,7 @@
                     </el-form-item>
                     <el-form-item
                       :prop="i.number + ''"
-                      label-width="100px"
+                      :class="enginType != '基建工程' && enginType != '民用工程' ? 'labelWidth' : '' "
                       label="数量"
                       v-show="i.number != null"
                       >
@@ -111,7 +111,6 @@
                     </el-form-item>
                     <el-form-item
                       :prop="i.visitType"
-                      label-width="50px"
                       label="上门类型"
                       v-show="i.visitType != null"
 
@@ -129,7 +128,6 @@
                     </el-form-item>
                     <el-form-item
                       :prop="i.selfClosingValveType"
-                      label-width="50px"
                       label="自闭阀类型"
                       v-show="i.selfClosingValveType != null"
 
@@ -162,7 +160,7 @@
             </div>
             <!-- <el-form-item label="照片" prop="zEngiineeringPhotoBoList" class="obsImage"> -->
               <ObsImageUpload
-                :class=" status == 'read-only' ? '' : 'obsImageUploads'"
+                :class=" status == 'read-only' ? 'obsImageUploads' : '' "
                 ref="obsImageUpload"
                 :limit="11"
                 :fileType="['png', 'jpg', 'jpeg']"
@@ -427,7 +425,17 @@ export default {
   }
 }
 
+::v-deep .labelWidth{
+  .el-form-item__label{
+    width: 100px;
+  }
+}
 
+::v-deep .obsImageUploads{
+  .el-upload--picture-card{
+    display: none;
+  }
+}
 .ConstructionDetailsDialog {
   position: absolute;
 

src/components/EnginNodeInfo/index.vue

@@ -67,7 +67,7 @@
         <!-- <el-button :loading="buttonLoading" type="primary" @click="submitForm">提交</el-button>
         <el-button @click="nodeCancel">取 消</el-button> -->
       </div>
-      <el-row v-for="(item, index) in zEngineeringMaterialBo" :key="index" style="left: 13%;" :class=" enginType == '基建工程' ? 'rowStructure' : '' ">
+      <el-row v-for="(item, index) in zEngineeringMaterialBo" :key="index" style="left: 13.5%;" :class=" enginType == '基建工程' ? 'rowStructure' : '' ">
         <!-- 在此处添加默认的行内容 -->
         <template v-if="index === null">
           <div>默认的行内容</div>
@@ -147,10 +147,10 @@
             <!--                  <el-input v-model="item.specifications" placeholder="请输入规格" style="width: 100%"/>-->
             <el-select v-model="item.brand" placeholder="请选择品牌" style="width: 100%">
               <el-option
-                v-for="e in specificationsList"
-                :key="e.id"
-                :label="e.name"
-                :value="e.id"
+                v-for="e in dict.type.brand"
+                :key="e.value"
+                :label="e.label"
+                :value="e.value"
               ></el-option>
             </el-select>
           </el-form-item>
@@ -221,6 +221,7 @@ export default {
   dicts:[
     'visit_type',
     'self_closing_valve_type',
+    'brand'
 
   ],
   data(){

src/views/zdsz/engineeringCivil/index.vue

@@ -621,9 +621,7 @@ export default {
           name: '报警器切断阀',
           components: [
             [
-              'materialQuality',                       // 材质
-              'specifications',                        // 规格
-              'number',                                // 数量
+              'brand',                                 // 品牌
             ],
             'constructTime',                           // 施工时间
             'zEngiineeringPhotoBoList',                // 照片

src/views/zdsz/engineeringInfrastructure/index.vue

@@ -10,7 +10,7 @@
   <div class="app-container">
     <el-form :model="searchParams" ref="searchForm" size="small" :inline="true" label-width="110px">
       <el-form-item label="工程名称" prop="enginName">
-        <el-input v-model="searchParams.enginName" placeholder="请输入工程名称"></el-input>
+        <el-input v-model="searchParams.enginName" placeholder="请输入工程名称" ></el-input>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -137,16 +137,17 @@
     <el-dialog :title="title" ref="nodeForm" :visible.sync="open" append-to-body customClass="appendElDialog" @close="onClose">
       <el-form ref="form" :model="queryParams" :rules="rules" label-width="110px">
         <el-form-item label="工程名称" prop="enginName">
-          <el-input v-model="queryParams.enginName" placeholder="请输入工程名称" maxlength="50"></el-input>
+          <el-input v-model="queryParams.enginName" placeholder="请输入工程名称" maxlength="50" :disabled="title == '添加用料' "></el-input>
         </el-form-item>
         <el-form-item label="工程地址" prop="enginAddre">
-          <el-input v-model="queryParams.enginAddre" placeholder="请输入工程地址" maxlength="100"></el-input>
+          <el-input v-model="queryParams.enginAddre" placeholder="请输入工程地址" maxlength="100" :disabled="title == '添加用料' "></el-input>
         </el-form-item>
         <el-form-item label="建设单位" prop="constructUnit">
-          <el-input v-model="queryParams.constructUnit" placeholder="请输入建设单位" maxlength="100"></el-input>
+          <el-input v-model="queryParams.constructUnit" placeholder="请输入建设单位" maxlength="100" :disabled="title == '添加用料' "></el-input>
         </el-form-item>
         <el-form-item label="开工时间" prop="startTime">
           <el-date-picker
+            :disabled="title == '添加用料' "
             v-model="queryParams.startTime"
             value-format="yyyy-MM-dd hh:mm:ss"
             type="datetime"
@@ -155,6 +156,7 @@
         </el-form-item>
         <el-form-item label="竣工时间" prop="completedTime">
           <el-date-picker
+            :disabled="title == '添加用料' "
             v-model="queryParams.completedTime"
             value-format="yyyy-MM-dd hh:mm:ss"
             type="datetime"
@@ -162,19 +164,20 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="计划工期" prop="plannedDuration">
-          <el-input v-model="queryParams.plannedDuration" placeholder="请输入计划工期" maxlength="50"></el-input>
+          <el-input v-model="queryParams.plannedDuration" placeholder="请输入计划工期" maxlength="50" :disabled="title == '添加用料' "></el-input>
         </el-form-item>
         <el-form-item label="文件" prop="files" v-if="queryParams.id">
           <ObsFileUpload ref="obsFileUpload" :file-size="100" :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg','mp4']" :limit="9999"  :value="queryParams.pics" @input="filesUpload"
           ></ObsFileUpload>
         </el-form-item>
         <el-form-item label="文件" prop="files" v-else>
-          <ObsFileUpload ref="obsFileUpload" :file-size="100" :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg','mp4']" :limit="9999"  :value="queryParams.files" @input="filesUpload"
+          <ObsFileUpload :disabled="title == '添加用料' " ref="obsFileUpload" :file-size="100" :file-type="['dwg','dwt','doc','docx','xls','xlsx','png', 'jpg', 'jpeg','mp4']" :limit="9999"  :value="queryParams.files" @input="filesUpload"
           ></ObsFileUpload>
         </el-form-item>
 
         <el-form-item label="工程内容" prop="enginContent">
           <el-input
+            :disabled="title == '添加用料' "
             v-model="queryParams.enginContent"
             type="textarea"
             placeholder="请输入内容"