合同材料

src/views/debit-pay/material/components/material/dataModal.vue

@@ -22,12 +22,6 @@
                         </hc-info-table-td>
                     </tr>
                     <tr>
-                        <hc-info-table-td is-title width="10%">调差月份：</hc-info-table-td>
-                        <hc-info-table-td>
-                            <el-form-item>
-                                <el-date-picker v-model="formModel.adjustMonth" class="block" type="month" format="YYYY-MM" value-format="YYYY-MM" />
-                            </el-form-item>
-                        </hc-info-table-td>
                         <hc-info-table-td is-title width="10%">材料名称：</hc-info-table-td>
                         <hc-info-table-td>
                             <el-form-item prop="contractMaterialId">
@@ -36,16 +30,6 @@
                                 </el-select>
                             </el-form-item>
                         </hc-info-table-td>
-                    </tr>
-                    <tr>
-                        <hc-info-table-td is-title width="10%">材料基准价格：</hc-info-table-td>
-                        <hc-info-table-td>
-                            <el-form-item>
-                                <el-input v-model="formModel.materialPrice" disabled>
-                                    <template #suffix>元</template>
-                                </el-input>
-                            </el-form-item>
-                        </hc-info-table-td>
                         <hc-info-table-td is-title width="10%">施工期市场价格：</hc-info-table-td>
                         <hc-info-table-td>
                             <el-form-item prop="currentPrice">
@@ -62,20 +46,36 @@
                         </hc-info-table-td>
                     </tr>
                     <tr>
-                        <hc-info-table-td is-title width="10%">价差幅度：</hc-info-table-td>
+                        <hc-info-table-td is-title width="10%">调差月份：</hc-info-table-td>
                         <hc-info-table-td>
                             <el-form-item>
-                                <el-input v-model="formModel.rangePriceRatio" disabled>
-                                    <template #suffix>%</template>
+                                <el-date-picker v-model="formModel.adjustMonth" class="block" type="month" format="YYYY-MM" value-format="YYYY-MM" />
+                            </el-form-item>
+                        </hc-info-table-td>
+                        <hc-info-table-td is-title width="10%">材料基准价格：</hc-info-table-td>
+                        <hc-info-table-td>
+                            <el-form-item>
+                                <el-input v-model="formModel.materialPrice" disabled>
+                                    <template #suffix>元</template>
                                 </el-input>
                             </el-form-item>
                         </hc-info-table-td>
+                    </tr>
+                    <tr>
                         <hc-info-table-td is-title width="10%">材料数量：</hc-info-table-td>
                         <hc-info-table-td>
                             <el-form-item prop="materialTotal">
                                 <el-input v-model="formModel.materialTotal" />
                             </el-form-item>
                         </hc-info-table-td>
+                        <hc-info-table-td is-title width="10%">价差幅度：</hc-info-table-td>
+                        <hc-info-table-td>
+                            <el-form-item>
+                                <el-input v-model="formModel.rangePriceRatio" disabled>
+                                    <template #suffix>%</template>
+                                </el-input>
+                            </el-form-item>
+                        </hc-info-table-td>
                     </tr>
                     <tr>
                         <hc-info-table-td is-title width="10%">调差金额：</hc-info-table-td>
@@ -288,14 +288,14 @@ const realTimePriceClose = () => {
 
 //材料明细表格
 const tableColumn1 = [
-    { key: 'key1', name: '计量单编号' },
-    { key: 'key2', name: '清单编号' },
-    { key: 'key3', name: '清单名称' },
-    { key: 'key4', name: '单位', width: 120, align: 'center' },
-    { key: 'key5', name: '计量数量', width: 120, align: 'center' },
-    { key: 'key6', name: '可调量', width: 120, align: 'center' },
-    { key: 'key7', name: '调差系数', width: 120, align: 'center' },
-    { key: 'key8', name: '调差数量', width: 120, align: 'center' },
+    { key: 'meterNumber', name: '计量单编号' },
+    { key: 'formNumber', name: '清单编号' },
+    { key: 'formName', name: '清单名称' },
+    { key: 'unit', name: '单位', width: 120, align: 'center' },
+    { key: 'meterTotal', name: '计量数量', width: 120, align: 'center' },
+    { key: 'changeTotal', name: '可调量', width: 120, align: 'center' },
+    { key: 'adjustFactor', name: '调差系数', width: 120, align: 'center' },
+    { key: 'adjustTotal', name: '调差数量', width: 120, align: 'center' },
 ]
 const tableData1 = ref([])
 const tableLoading1 = ref(false)
@@ -320,15 +320,13 @@ const getMaterialDetail = async () => {
 
 //上传附件
 const tableColumn2 = [
-    { key: 'key1', name: '文件名称' },
-    { key: 'key2', name: '文件大小', align: 'center' },
-    { key: 'key3', name: '更新时间', align: 'center' },
-    { key: 'key4', name: '文件类型', align: 'center' },
+    { key: 'fileName', name: '文件名称' },
+    { key: 'fileSizeName', name: '文件大小', align: 'center' },
+    { key: 'updateTime', name: '更新时间', align: 'center' },
+    { key: 'fileSuffix', name: '文件类型', align: 'center' },
     { key: 'action', name: '操作', width: 120, align: 'center' },
 ]
-const tableData2 = ref([
-    {},
-])
+const tableData2 = ref([])
 const tableLoading2 = ref(false)
 
 //上传表单

src/views/debit-pay/material/material.vue

@@ -21,12 +21,12 @@
             </el-button>
         </template>
         <hc-table :column="tableColumn" :datas="tableData" :index-style="{ width: 60 }" :loading="tableLoading">
-            <template #key3="{ row }">
-                <el-link type="primary" @click="rowTop(row)">{{ row.key3 }}</el-link>
+            <template #materialName="{ row }">
+                <el-link type="primary" @click="rowTop(row)">{{ row.materialName }}</el-link>
             </template>
-            <template #key8="{ row }">
-                <span class="text-green">已完结</span>
-                <span class="text-gray">未完结</span>
+            <template #approveStatus="{ row }">
+                <span v-if="row.approveStatus === 1" class="text-green">已完结</span>
+                <span v-else class="text-gray">未完结</span>
             </template>
             <template #action="{ row }">
                 <el-link type="primary" @click="rowEditClick(row)">编辑</el-link>
@@ -86,14 +86,14 @@ const pageChange = ({ current, size }) => {
 
 //表格
 const tableColumn = [
-    { key: 'key1', name: '调差期', width: 100, align: 'center' },
-    { key: 'key2', name: '调差月份', width: 120, align: 'center' },
-    { key: 'key3', name: '材料名称' },
-    { key: 'key4', name: '基准价格（元）', width: 140, align: 'center' },
-    { key: 'key5', name: '施工期价格（元）', width: 140, align: 'center' },
+    { key: 'contractPeriodNumber', name: '调差期', width: 100, align: 'center' },
+    { key: 'adjustMonth', name: '调差月份', width: 120, align: 'center' },
+    { key: 'materialName', name: '材料名称' },
+    { key: 'materialPrice', name: '基准价格（元）', width: 140, align: 'center' },
+    { key: 'currentPrice', name: '施工期价格（元）', width: 140, align: 'center' },
     { key: 'key6', name: '调差数量', width: 140, align: 'center' },
-    { key: 'key7', name: '调差金额', width: 140, align: 'center' },
-    { key: 'key8', name: '状态', width: 120, align: 'center' },
+    { key: 'adjustMoney', name: '调差金额', width: 140, align: 'center' },
+    { key: 'approveStatus', name: '状态', width: 120, align: 'center' },
     { key: 'action', name: '操作', width: 100, align: 'center' },
 ]
 const tableData = ref([])