bug修复

src/styles/app/element.scss

@@ -109,6 +109,18 @@
 .el-form {
     position: relative;
     overflow: hidden;
+    .hc-form-item {
+        position: relative;
+        display: flex;
+        .el-form-item {
+            flex: 1;
+            margin-right: 12px;
+        }
+        .el-form-item + .el-form-item {
+            margin-right: 0;
+            margin-left: 12px;
+        }
+    }
 }
 
 //滚动条
@@ -406,19 +418,36 @@
 }
 
 //伪表单
-.el-form-item--large .el-form-item__content .form-item-div {
-    position: relative;
-    color: #606266;
-    font-size: 14px;
-    padding: 0 12px;
-    height: 40px;
-    width: 100%;
-    border: 1px solid #e0e0e6;
-    border-radius: 4px;
-    display: flex;
-    align-items: center;
+.el-form-item--large .el-form-item__content {
+    .form-item-div, .form-item-dashed {
+        position: relative;
+        color: #606266;
+        font-size: 14px;
+        padding: 0 12px;
+        height: 40px;
+        width: 100%;
+        border-radius: 4px;
+        display: flex;
+        align-items: center;
+        &.hover{
+            cursor: pointer;
+            transition: border 0.2s cubic-bezier(0.645, 0.045, 0.355, 1)
+        }
+    }
+    .form-item-div {
+        border: 1px solid #dddfe6;
+    }
+    .form-item-dashed {
+        border: 1px dashed #dddfe6;
+    }
+    .form-item-div.hover, .form-item-dashed.hover {
+        &:hover {
+            border-color: var(--el-color-primary);
+        }
+    }
 }
 
+
 //无名称
 .el-form-item[no-label] .el-form-item__label-wrap {
     margin-left: 0 !important;

src/views/ledger/components/table-form.vue

@@ -63,19 +63,19 @@
                 </el-button>
             </HcTooltip>
             <HcTooltip keys="ledger_query_copy_form">
-                <el-button hc-btn :disabled="!isTableForm || taskStatus === 1  || taskStatus === 3 || taskStatus === 4" @click="copyTableFormClick">
+                <el-button hc-btn :disabled="!isTableForm || taskStatus === 3 || taskStatus === 4" @click="copyTableFormClick">
                     <HcIcon name="file-copy-2"/>
                     <span>复制当前表格及内容</span>
                 </el-button>
             </HcTooltip>
             <HcTooltip keys="ledger_query_time_form">
-                <el-button hc-btn :disabled="!isTableForm || taskStatus === 1  || taskStatus === 3 || taskStatus === 4" @click="copyTimeLogModal">
+                <el-button hc-btn :disabled="!isTableForm || taskStatus === 3 || taskStatus === 4" @click="copyTimeLogModal">
                     <HcIcon name="file-copy-2"/>
                     <span>复制任意时间</span>
                 </el-button>
             </HcTooltip>
             <HcTooltip keys="ledger_query_add_form">
-                <el-button hc-btn :disabled="!isTableForm || taskStatus === 1  || taskStatus === 3 || taskStatus === 4" @click="addTableFormClick">
+                <el-button hc-btn :disabled="!isTableForm || taskStatus === 3 || taskStatus === 4" @click="addTableFormClick">
                     <HcIcon name="add-circle"/>
                     <span>新增表格</span>
                 </el-button>

src/views/tentative/material/approach.vue

@@ -3,13 +3,13 @@
         <HcCard>
             <template #header>
                 <HcTooltip keys="tentative_material_approach_add">
-                    <el-button type="primary" hc-btn>
+                    <el-button type="primary" hc-btn @click="addFormModalClick">
                         <HcIcon name="add-circle"/>
                         <span>新增</span>
                     </el-button>
                 </HcTooltip>
                 <HcTooltip keys="tentative_material_approach_edit">
-                    <el-button hc-btn>
+                    <el-button hc-btn @click="editFormModalClick">
                         <HcIcon name="edit"/>
                         <span>编辑</span>
                     </el-button>
@@ -72,6 +72,72 @@
                 <HcPages :pages="searchForm" @change="pageChange"/>
             </template>
         </HcCard>
+
+        <!--新增/编辑-->
+        <HcDialog :show="addEditFormModal" title="新增/编辑 材料进场" widths="45rem" :loading="addEditFormLoading" @close="addEditFormModalClose" @save="addEditFormClick">
+            <el-form ref="addEditFormRef" :model="addEditFormModel" :rules="addEditFormRules" label-width="auto" size="large">
+                <div class="hc-form-item">
+                    <el-form-item label="材料类型">
+                        <el-select v-model="addEditFormModel.key1" block>
+                            <el-option v-for="item in typeData" :label="item.label" :value="item.value"/>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="材料单价" prop="key2">
+                        <el-input v-model="addEditFormModel.key2"/>
+                    </el-form-item>
+                </div>
+                <div class="hc-form-item">
+                    <el-form-item label="材料名称" prop="key3">
+                        <el-input v-model="addEditFormModel.key3"/>
+                    </el-form-item>
+                    <el-form-item label="材料数量" prop="key4">
+                        <el-input v-model="addEditFormModel.key4"/>
+                    </el-form-item>
+                </div>
+                <div class="hc-form-item">
+                    <el-form-item label="规格型号" prop="key5">
+                        <el-input v-model="addEditFormModel.key5"/>
+                    </el-form-item>
+                    <el-form-item label="计算单位" prop="key6">
+                        <el-input v-model="addEditFormModel.key6"/>
+                    </el-form-item>
+                </div>
+                <div class="hc-form-item">
+                    <el-form-item label="材料编号" prop="key7">
+                        <el-input v-model="addEditFormModel.key7"/>
+                    </el-form-item>
+                    <el-form-item label="生产批号" prop="key8">
+                        <el-input v-model="addEditFormModel.key8"/>
+                    </el-form-item>
+                </div>
+                <div class="hc-form-item">
+                    <el-form-item label="进场日期" prop="key9">
+                        <el-date-picker type="date" v-model="addEditFormModel.key9" class="block" value-format="YYYY-MM-DD" :clearable="false"/>
+                    </el-form-item>
+                    <el-form-item label="拟用部位" prop="key10">
+                        <el-input v-model="addEditFormModel.key10"/>
+                    </el-form-item>
+                </div>
+                <div class="hc-form-item">
+                    <el-form-item label="供应商单位" prop="key11">
+                        <el-input v-model="addEditFormModel.key11"/>
+                    </el-form-item>
+                    <el-form-item label="生产地/厂家" prop="key12">
+                        <el-input v-model="addEditFormModel.key12"/>
+                    </el-form-item>
+                </div>
+                <el-form-item label="生产合格证" prop="key13">
+                    <div class="form-item-dashed hover">上传文件（待定，看后端接口后，再定）</div>
+                </el-form-item>
+                <el-form-item label="厂家质检报告" prop="key13">
+                    <div class="form-item-dashed hover">上传文件（待定，看后端接口后，再定）</div>
+                </el-form-item>
+                <el-form-item label="其他附件" prop="key13">
+                    <div class="form-item-dashed hover">上传文件（待定，看后端接口后，再定）</div>
+                </el-form-item>
+            </el-form>
+        </HcDialog>
+
     </div>
 </template>
 
@@ -90,7 +156,6 @@ const useAppState = useAppStore()
 const projectId = ref(useAppState.getProjectId);
 const contractId = ref(useAppState.getContractId);
 
-
 const typeData = ref([
     {label: '水泥', value: '1'}
 ])
@@ -161,6 +226,36 @@ const tableSelection = (rows) => {
         return (item??'') !== '';
     })
 }
+
+//新增/编辑 材料进场
+const addEditFormModal = ref(false)
+const addFormModalClick = () => {
+    addEditFormModal.value = true
+}
+const editFormModalClick = () => {
+    addEditFormModal.value = true
+}
+const addEditFormModalClose = () => {
+    addEditFormModal.value = false
+}
+
+//新增/编辑 表单
+const addEditFormRef = ref(null)
+const addEditFormModel = ref({})
+const addEditFormRules = {
+    key2: {
+        required: true,
+        trigger: 'blur',
+        message: "请输入"
+    },
+}
+
+//新增/编辑 保存
+const addEditFormLoading = ref(false)
+const addEditFormClick = () => {
+
+}
+
 </script>
 
 <style lang="scss" scoped>