zianxin/pj_admin_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改细节

Browse Source
This commit is contained in:
zjf committed 2025-02-23 20:51:53 +08:00
1 parent 52db784df2
commit 274050ac09
4 files changed
+11 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/views/supermarketerp/smErpCgBack/smErpCgBackOption.vue
+5 -8
View File
@@ -11,13 +11,13 @@
<el-input v-model.trim="baseDataForm.inventoryDate" readonly style="width: 200px" />
</el-form-item>
<el-form-item label="关联采购订单" prop="linkCode">
<el-form-item label="关联入库单" prop="linkCode">
<el-input
v-model="baseDataForm.linkCode"
:suffix-icon="Search"
@click="handleClickLinkCode"
readonly
placeholder="请选择采购订单"
placeholder="请选择采购入库单"
style="width: 200px"
/>
</el-form-item>
@@ -26,9 +26,6 @@
<SelectHandlerUser v-model.trim="baseDataForm.handlerUserId" placeholder="请选择经办人" style="width: 200px" />
</el-form-item>
<el-form-item label="审批状态" prop="checkStatus">
<el-input v-model.trim="baseDataForm.checkStatus" placeholder="请输入审批状态" style="width: 200px" />
</el-form-item>
<el-form-item label="货商" prop="supplierId">
<el-select v-model="baseDataForm.supplierId" placeholder="请选择货商" style="width: 200px">
@@ -202,7 +199,7 @@ const baseDataForm = reactive<any>({
id: "",
inventoryCode: "",
inventoryDate: formatDate(new Date(), "YYYY-mm-dd"),
inventoryType: "3",
inventoryType: "4",
sourceId: "",
warehouseId: "",
handlerUserId: "",
@@ -213,7 +210,7 @@ const baseDataForm = reactive<any>({
deptId: "",
supplierId: "",
remark: "",
orderType: "1",
orderType: "2",
totalAmount: "",
})
const state = reactive<{
@@ -273,7 +270,7 @@ const getInitData = async () => {
const [erpSpuSimpleAll, supplierTypeOptions, planCode] = await Promise.allSettled([
getErpSpuSimpleAll(),
getSupplierTypeOptions(),
getPlanCode({ type: 3 }),
getPlanCode({ type: 4 }),
]).then((results) => results.map((result) => (result.status === "fulfilled" ? result.value : null)))
erpSpuSimpleAll && erpSpuSimpleAll.code === 0 && (state.erpSpuSimpleAll = erpSpuSimpleAll.data)
supplierTypeOptions && supplierTypeOptions.code === 0 && (supplierTypeDict.value = supplierTypeOptions.data)
src/views/supermarketerp/smErpCgDd/index.vue
+2 -2
View File
@@ -39,7 +39,7 @@
<el-table-column type="selection" width="40" align="center" />
<el-table-column type="index" label="#" width="40" />
<el-table-column prop="code" label="编号" show-overflow-tooltip />
<el-table-column prop="dDate" label="单据日期" show-overflow-tooltip />
<el-table-column prop="ddDate" label="单据日期" show-overflow-tooltip />
<el-table-column prop="productName" label="商品信息" show-overflow-tooltip />
<el-table-column prop="handlerUserId" label="经办人" show-overflow-tooltip />
<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip>
@@ -47,7 +47,7 @@
<dict-tag :options="check_status" :value="scope.row.checkStatus"></dict-tag>
</template>
</el-table-column>
<el-table-column prop="totalAmount" label="金额合计" show-overflow-tooltip />
<!-- <el-table-column prop="totalAmount" label="金额合计" show-overflow-tooltip />-->
<el-table-column prop="supplierId" label="货商" show-overflow-tooltip />
<el-table-column prop="remark" label="备注" show-overflow-tooltip />
<el-table-column label="操作" width="150">
src/views/supermarketerp/smErpCgDd/smErpCgDdOption.vue
+3 -3
View File
@@ -8,7 +8,7 @@
</el-form-item>
<el-form-item label="单据日期" prop="dDate">
<el-input v-model="baseDataForm.dDate" readonly style="width: 200px" />
<el-input v-model="baseDataForm.ddDate" readonly style="width: 200px" />
</el-form-item>
<el-form-item label="经办人" prop="handlerUserId">
@@ -201,7 +201,7 @@ const supplierTypeDict = ref<any[]>([]) // 货商下拉选项
const baseDataForm = reactive<any>({
id: "",
code: "",
dDate: formatDate(new Date(), "YYYY-mm-dd"),
ddDate: formatDate(new Date(), "YYYY-mm-dd"),
warehouseId: "",
handlerUserId: "",
linkCode: "",
@@ -240,7 +240,7 @@ const state = reactive<{
// 基本信息表单校验规则
const dataRules = ref({
code: [{ required: true, message: "采购订单编号不能为空", trigger: "blur" }],
dDate: [{ required: true, message: "采购订单单据日期不能为空", trigger: "blur" }],
ddDate: [{ required: true, message: "采购订单单据日期不能为空", trigger: "blur" }],
handlerUserId: [{ required: true, message: "经办人不能为空", trigger: "blur" }],
supplierId: [{ required: true, message: "货商不能为空", trigger: "blur" }],
})
src/views/supermarketerp/smErpCgPlan/index.vue
+1 -1
View File
@@ -64,7 +64,7 @@
<el-table-column type="index" label="#" width="50" />
<el-table-column prop="planCode" label="编号" show-overflow-tooltip />
<el-table-column prop="planDate" label="单据日期" show-overflow-tooltip />
<el-table-column prop="prodouctName" label="商品信息" show-overflow-tooltip />
<el-table-column prop="productName" label="商品信息" show-overflow-tooltip />
<el-table-column prop="handlerUserId" label="经办人" show-overflow-tooltip />
<el-table-column prop="checkStatus" label="审批状态" show-overflow-tooltip />
<el-table-column prop="remark" label="备注" show-overflow-tooltip />