Merge remote-tracking branch 'origin/master'

itdmWeb/src/views/module-iTDM/itdmGongdanMaster/uGantt.vue

@@ -38,10 +38,23 @@
             <el-input-number v-model="currentDbEdit.lastTime" @change="handleChange" :min="1"></el-input-number>
             <span style="padding-left: 10px;">{{currentDbEdit.end_date}}</span>
           </el-form-item>
-          <el-form-item label="报告编号" prop="reportNo" v-if="currentDbEdit.pid == null">
+          <!-- <el-form-item label="报告编号" prop="reportNo" v-if="currentDbEdit.pid == null">
             <el-input v-model="currentDbEdit.reportNo" placeholder="请输入报告编号"></el-input>
+          </el-form-item> -->
+          <el-form-item label="试验设备" prop="shebeiIdArray" v-if="currentDbEdit.pid == null">
+            <div class="eq-rili-view" style="display: flex;">
+              <el-select v-model="currentDbEdit.shebeiIdArray" placeholder="请选择试验设备" style="width: 100%;" multiple>
+                <el-option
+                  v-for="item in deviceOption"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+              <div class="search-btn" @click="handleEqCalendar">{{openRl == 1 ? '收起': '展开'}}</div>
+            </div>
           </el-form-item>
-          <el-form-item label="试验设备" prop="shebeiId">
+          <el-form-item label="试验设备" prop="shebeiId" v-if="currentDbEdit.pid != null">
             <div class="eq-rili-view" style="display: flex;">
               <el-select v-model="currentDbEdit.shebeiId" placeholder="请选择试验设备" style="width: 100%;">
                 <el-option

itdmWeb/src/views/module-iTDM/itdmGongdanMaster/uGantt2.vue

@@ -29,7 +29,7 @@
     <uGantt :configColumns="configColumns" :taskLists="taskLists" ref="uGantt" @dbclick="rowDblclick" :uStyle="uStyle" hasReality>
       <!-- 其他需要自定义的弹窗数据 -->
       <!-- 双击事件弹窗 -->
-      <el-dialog :title="title" :visible.sync="dialogVisible" width="35%">
+      <el-dialog :title="title" :visible.sync="dialogVisible" width="45%">
         <el-form ref="currentDbEdit" :model="currentDbEdit" :rules="rules" label-width="80px">
           <el-form-item label="开始时间" prop="start_date">
             <el-date-picker v-model="currentDbEdit.start_date" type="date" value-format="yyyy-MM-dd" placeholder="选择日期" @change="dataChange"></el-date-picker>
@@ -38,9 +38,9 @@
             <el-input-number v-model="currentDbEdit.lastTime" @change="handleChange" :min="1"></el-input-number>
             <span style="padding-left: 10px;">{{currentDbEdit.end_date}}</span>
           </el-form-item>
-          <el-form-item label="报告编号" prop="reportNo">
+          <!-- <el-form-item label="报告编号" prop="reportNo">
             <el-input v-model="currentDbEdit.reportNo" placeholder="请输入报告编号"></el-input>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="项目经理" prop="pm">
             <el-select v-model="currentDbEdit.pm" placeholder="请选择项目经理" style="width: 100%;">
               <el-option
@@ -51,9 +51,9 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="试验设备" prop="shebeiId">
+          <el-form-item label="试验设备" prop="shebeiIdArray">
             <div class="eq-rili-view" style="display: flex;">
-              <el-select v-model="currentDbEdit.shebeiId" placeholder="请选择试验设备" style="width: 100%;">
+              <el-select v-model="currentDbEdit.shebeiIdArray" placeholder="请选择试验设备" style="width: 100%;" multiple>
                 <el-option
                   v-for="item in deviceOption"
                   :key="item.value"
@@ -383,6 +383,7 @@ export default {
               pm: res.pm,
               reportNo: res.reportNo,
               chuanganqiArray:res.chuanganqiArray,
+              shebeiIdArray:res.shebeiIdArray,
               testPlanId:res.testPlanId,
               status:res.status,