Browse Source

Merge remote-tracking branch 'origin/master'

ZaiZai 3 months ago
parent
commit
222130150d
2 changed files with 41 additions and 16 deletions
  1. 15 1
      src/views/data-fill/division.vue
  2. 26 15
      src/views/data-fill/wbs.vue

+ 15 - 1
src/views/data-fill/division.vue

@@ -230,7 +230,21 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
-                <el-form-item label="划分编号">
+                <el-tooltip
+                    v-if="formEditNodeModel?.isReferenceNumber === 0"
+                    class="item"
+                    effect="light"
+                    content="当前合同段未开启引用标号功能,表格无法获取,请联系维护人员处理"
+                    placement="top"
+                >
+                    <el-form-item label="划分编号">
+                        <el-input
+                            v-model="formEditNodeModel.partitionCode"
+                            placeholder="请输入划分编号"
+                        />
+                    </el-form-item>
+                </el-tooltip>
+                <el-form-item label="划分编号" v-else>
                     <el-input
                         v-model="formEditNodeModel.partitionCode"
                         placeholder="请输入划分编号"

+ 26 - 15
src/views/data-fill/wbs.vue

@@ -248,22 +248,18 @@
                             >
                                 同步质检资料
                             </el-button>
+                            <el-button
+                                v-if="nodeDataInfo?.majorDataType == 2"
+                                hc-btn
+                                color="#12C060"
+                                style="color: white"
+                                :loading="syncWorkloading"
+                                @click="syncWork"
+                            >
+                                同步工序资料
+                            </el-button>
                         </HcTooltip>
 
-                        <el-button
-                            hc-btn
-                            color="#12C060"
-                            style="color: white"
-                            :loading="syncWorkloading"
-                            @click="syncWork"
-                            v-if="
-                                nodeDataInfo.majorDataType !== 2 &&
-                                nodeDataInfo?.nodeClass == 2
-                            "
-                        >
-                            同步工序资料
-                        </el-button>
-
                         <HcTooltip v-if="NodeStatus !== '3'" keys="wbs_save">
                             <el-button
                                 v-if="nodeDataInfo?.nodeClass !== 2"
@@ -581,12 +577,27 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
-                <el-form-item label="划分编号">
+                <el-tooltip
+                    v-if="formEditNodeModel?.isReferenceNumber === 0"
+                    class="item"
+                    effect="light"
+                    content="当前合同段未开启引用标号功能,表格无法获取,请联系维护人员处理"
+                    placement="top"
+                >
+                    <el-form-item label="划分编号">
+                        <el-input
+                            v-model="formEditNodeModel.partitionCode"
+                            placeholder="请输入划分编号"
+                        />
+                    </el-form-item>
+                </el-tooltip>
+                <el-form-item label="划分编号" v-else>
                     <el-input
                         v-model="formEditNodeModel.partitionCode"
                         placeholder="请输入划分编号"
                     />
                 </el-form-item>
+
                 <el-form-item class="hc-position-input-icon" label="模板位置">
                     <el-input
                         v-model="formEditNodeModel.position"