ZaiZai 1 jaar geleden
bovenliggende
commit
83dbfceed1

+ 8 - 0
src/styles/app/element.scss

@@ -62,3 +62,11 @@
     align-items: center;
     margin-bottom: 0;
 }
+.el-form-item.input-link-item .el-form-item__content {
+    .el-input {
+        flex: 1;
+    }
+    .el-link {
+        margin-left: 10px;
+    }
+}

+ 14 - 8
src/views/alter/admin/components/plan/addModal.vue

@@ -66,10 +66,10 @@
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="24">
-                                    <el-form-item label="引用预变更:">
+                                    <el-form-item class="input-link-item" label="引用预变更:">
                                         <el-input v-model="baseForm.key6" disabled />
-                                        <el-link type="primary">引用</el-link>
-                                        <el-link type="danger" class="ml-3">删除引用</el-link>
+                                        <el-link type="primary" @click="quoteClick">引用</el-link>
+                                        <el-link type="danger">删除引用</el-link>
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="24">
@@ -118,7 +118,11 @@
                 </el-scrollbar>
             </div>
         </div>
-        <ChangePre v-model="isChangeShow" />
+
+        <!-- 引用预变更 -->
+        <ChangePre v-model="isChangeQuoteShow" />
+
+        <!-- 变更申请清单 -->
         <ChangeRequest v-model="isChangeShow" />
     </hc-dialog>
 </template>
@@ -227,8 +231,10 @@ const isChangeShow = ref(false)
 const changeShowClick = () => {
     isChangeShow.value = true
 }
-</script>
 
-<style scoped lang="scss">
-
-</style>
+//引用预变更的弹窗
+const isChangeQuoteShow = ref(false)
+const quoteClick = () => {
+    isChangeQuoteShow.value = true
+}
+</script>

+ 7 - 16
src/views/alter/admin/components/plan/changePre.vue

@@ -1,14 +1,11 @@
 <template>
-    <hc-dialog is-to-body is-table is-footer-center widths="90%" :show="isShow" title="预变更清单添加" @save="addModalSave" @close="addModalClose">
+    <hc-dialog is-to-body is-table is-footer-center widths="90%" :show="isShow" title="引用预变更" @save="addModalSave" @close="addModalClose">
         <hc-card-item>
             <template #header>
                 <div class="w-60">
-                    <el-input v-model="searchForm.key1" placeholder="清单编号" />
+                    <el-input v-model="searchForm.key1" placeholder="变更方案编号" />
                 </div>
             </template>
-            <template #extra>
-                <el-link type="primary">显示已分解</el-link>
-            </template>
             <hc-table :column="tableColumn" :datas="tableData" :loading="tableLoading" is-check @selection-change="tableCheckChange" />
             <template #action>
                 <hc-pages :pages="searchForm" @change="pageChange" />
@@ -64,13 +61,11 @@ const pageChange = ({ current, size }) => {
 //表格数据
 const tableLoading = ref(false)
 const tableColumn = ref([
-    { key: 'key1', name: '清单编号' },
-    { key: 'key2', name: '清单名称' },
-    { key: 'key3', name: '现行单价(元)' },
-    { key: 'key4', name: '合同数量' },
-    { key: 'key5', name: '合同变更后数量' },
-    { key: 'key6', name: '已分解量' },
-    { key: 'key7', name: '是否增补' },
+    { key: 'key1', name: '预变更编号' },
+    { key: 'key2', name: '预变更名称' },
+    { key: 'key3', name: '业务日期' },
+    { key: 'key4', name: '变更类型' },
+    { key: 'key5', name: '变更申请金额' },
 ])
 const tableData = ref([
     { key1: '1111' },
@@ -91,7 +86,3 @@ const addModalClose = () => {
     emit('close')
 }
 </script>
-
-<style scoped lang="scss">
-
-</style>

+ 2 - 0
src/views/alter/admin/plan.vue

@@ -101,8 +101,10 @@
                 </el-scrollbar>
             </div>
         </div>
+
         <!-- 上报弹窗 -->
         <hc-report-dialog v-model="isReport" />
+
         <!-- 新增修改的弹窗 -->
         <addModal v-model="isAddShow" />
     </hc-card>