From 2365a272f1883143294cc36b10e62d4a240e7df6 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 18 七月 2026 09:58:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁
---
src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue | 24 ++++++++----
src/views/procurementManagement/procurementLedger/index.vue | 3 +
src/views/equipmentManagement/spareParts/index.vue | 2
src/views/salesManagement/salesLedger/index.vue | 2
src/views/basicData/supplierManage/components/BlacklistTab.vue | 44 +++++++++++-----------
src/views/basicData/supplierManage/components/HomeTab.vue | 43 +++++++++++----------
6 files changed, 64 insertions(+), 54 deletions(-)
diff --git a/src/views/basicData/supplierManage/components/BlacklistTab.vue b/src/views/basicData/supplierManage/components/BlacklistTab.vue
index 952d9b7..9e5a75f 100644
--- a/src/views/basicData/supplierManage/components/BlacklistTab.vue
+++ b/src/views/basicData/supplierManage/components/BlacklistTab.vue
@@ -96,7 +96,7 @@
</el-col>
</el-row>
<el-row :gutter="30">
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="渚涘簲鍟嗙被鍨嬶細"
prop="supplierType">
<el-select v-model="form.supplierType"
@@ -112,7 +112,7 @@
value="涓�" />
</el-select>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="12">
<el-form-item label="鏄惁鐧藉悕鍗曪細"
prop="isWhite">
@@ -203,22 +203,22 @@
{
label: "渚涘簲鍟嗗悕绉�",
prop: "supplierName",
- width: 250,
+ // width: 250,
},
- {
- label: "渚涘簲鍟嗙被鍨�",
- prop: "supplierType",
- width: 120,
- },
+ // {
+ // label: "渚涘簲鍟嗙被鍨�",
+ // prop: "supplierType",
+ // width: 120,
+ // },
{
label: "绾崇◣浜鸿瘑鍒彿",
prop: "taxpayerIdentificationNum",
- width: 230,
+ // width: 230,
},
{
label: "鍏徃鍦板潃",
prop: "companyAddress",
- width: 220,
+ // width: 300,
},
{
label: "缁存姢浜�",
@@ -228,7 +228,7 @@
{
label: "缁存姢鏃堕棿",
prop: "maintainTime",
- width: 100,
+ // width: 100,
},
{
dataType: "action",
@@ -244,14 +244,14 @@
openForm("edit", row);
},
},
- {
- //璧勮川闄勪欢
- name: "璧勮川鏂囦欢",
- type: "text",
- clickFun: row => {
- openFileDialog(row);
- },
- },
+ // {
+ // //璧勮川闄勪欢
+ // name: "璧勮川鏂囦欢",
+ // type: "text",
+ // clickFun: row => {
+ // openFileDialog(row);
+ // },
+ // },
],
},
]);
@@ -290,9 +290,9 @@
companyAddress: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
maintainUserId: [{ required: false, message: "璇烽�夋嫨", trigger: "change" }],
maintainTime: [{ required: false, message: "璇烽�夋嫨", trigger: "change" }],
- supplierType: [
- { required: true, message: "璇烽�夋嫨渚涘簲鍟嗙被鍨�", trigger: "change" },
- ],
+ // supplierType: [
+ // { required: true, message: "璇烽�夋嫨渚涘簲鍟嗙被鍨�", trigger: "change" },
+ // ],
},
});
const { searchForm, form, rules } = toRefs(data);
diff --git a/src/views/basicData/supplierManage/components/HomeTab.vue b/src/views/basicData/supplierManage/components/HomeTab.vue
index 7edf87b..2c78f95 100644
--- a/src/views/basicData/supplierManage/components/HomeTab.vue
+++ b/src/views/basicData/supplierManage/components/HomeTab.vue
@@ -102,7 +102,7 @@
</el-col>
</el-row>
<el-row :gutter="30">
- <el-col :span="12">
+ <!-- <el-col :span="12">
<el-form-item label="渚涘簲鍟嗙被鍨嬶細"
prop="supplierType">
<el-select v-model="form.supplierType"
@@ -118,7 +118,7 @@
value="涓�" />
</el-select>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="12">
<el-form-item label="鏄惁鐧藉悕鍗曪細"
prop="isWhite">
@@ -209,26 +209,27 @@
{
label: "渚涘簲鍟嗗悕绉�",
prop: "supplierName",
- width: 250,
+ // width: 250,
},
- {
- label: "渚涘簲鍟嗙被鍨�",
- prop: "supplierType",
- width: 120,
- },
+ // {
+ // label: "渚涘簲鍟嗙被鍨�",
+ // prop: "supplierType",
+ // width: 120,
+ // },
{
label: "绾崇◣浜鸿瘑鍒彿",
prop: "taxpayerIdentificationNum",
- width: 230,
+ // width: 230,
},
{
label: "鍏徃鍦板潃",
prop: "companyAddress",
- width: 220,
+ // width: 220,
},
{
label: "缁存姢浜�",
prop: "maintainUserName",
+ // width: 220,
},
{
@@ -250,14 +251,14 @@
openForm("edit", row);
},
},
- {
- //璧勮川闄勪欢
- name: "璧勮川鏂囦欢",
- type: "text",
- clickFun: row => {
- openFileDialog(row);
- },
- },
+ // {
+ // //璧勮川闄勪欢
+ // name: "璧勮川鏂囦欢",
+ // type: "text",
+ // clickFun: row => {
+ // openFileDialog(row);
+ // },
+ // },
],
},
]);
@@ -296,9 +297,9 @@
companyAddress: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
maintainUserId: [{ required: false, message: "璇烽�夋嫨", trigger: "change" }],
maintainTime: [{ required: false, message: "璇烽�夋嫨", trigger: "change" }],
- supplierType: [
- { required: true, message: "璇烽�夋嫨渚涘簲鍟嗙被鍨�", trigger: "change" },
- ],
+ // supplierType: [
+ // { required: true, message: "璇烽�夋嫨渚涘簲鍟嗙被鍨�", trigger: "change" },
+ // ],
},
});
const { searchForm, form, rules } = toRefs(data);
diff --git a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
index 6a4b767..e4cc4c0 100644
--- a/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
+++ b/src/views/collaborativeApproval/approvalProcess/components/approvalDia.vue
@@ -22,14 +22,10 @@
<el-row>
<el-col :span="24">
<el-form-item label="鐢宠閮ㄩ棬锛�">
- <el-select disabled
- v-model="form.approveDeptId"
- placeholder="閫夋嫨閮ㄩ棬">
- <el-option v-for="user in productOptions"
- :key="user.deptId"
- :label="user.deptName"
- :value="user.deptId" />
- </el-select>
+ <el-input v-model="form.approveDeptName"
+ placeholder=""
+ clearable
+ disabled />
</el-form-item>
</el-col>
</el-row>
@@ -45,6 +41,18 @@
</el-form-item>
</el-col>
</el-row>
+ <el-row v-if="Number(props.approveType) === 4">
+ <el-col :span="24">
+ <el-form-item label="鎶ラ攢閲戦锛�">
+ <el-input-number v-model="form.price"
+ disabled
+ :min="0"
+ :precision="2"
+ style="width: 100%"
+ placeholder="" />
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
<!-- 鎶ヤ环瀹℃壒锛氬睍绀烘姤浠疯鎯咃紙澶嶇敤閿�鍞姤浠�"鏌ョ湅璇︽儏瀵硅瘽妗�"鍐呭缁撴瀯锛� -->
<div v-if="isQuotationApproval"
diff --git a/src/views/equipmentManagement/spareParts/index.vue b/src/views/equipmentManagement/spareParts/index.vue
index f3509e1..a1a4026 100644
--- a/src/views/equipmentManagement/spareParts/index.vue
+++ b/src/views/equipmentManagement/spareParts/index.vue
@@ -96,7 +96,7 @@
</el-dialog>
</el-tab-pane>
- <el-tab-pane label="澶囦欢棰嗙敤璁板綍" name="usage">
+ <el-tab-pane label="澶囦欢浣跨敤璁板綍" name="usage">
<div class="search_form">
<el-form :inline="true" :model="usageQuery" class="search-form">
<el-form-item label="澶囦欢鍚嶇О">
diff --git a/src/views/procurementManagement/procurementLedger/index.vue b/src/views/procurementManagement/procurementLedger/index.vue
index c0978ef..77c70a3 100644
--- a/src/views/procurementManagement/procurementLedger/index.vue
+++ b/src/views/procurementManagement/procurementLedger/index.vue
@@ -161,7 +161,7 @@
<el-row :gutter="30">
<el-col :span="12">
<el-form-item label="褰曞叆浜猴細" prop="recorderId">
- <el-select v-model="form.recorderId" placeholder="璇烽�夋嫨" clearable filterable>
+ <el-select v-model="form.recorderId" placeholder="璇烽�夋嫨" clearable filterable disabled>
<el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
</el-select>
</el-form-item>
@@ -1026,6 +1026,7 @@
);
form.value.entryDate = getCurrentDate();
+ form.value.recorderId = userStore.id;
if (type === "add") {
// 鏂板鏃剁敓鎴愰噰璐悎鍚屽彿
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index ee3e4c0..be5d297 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -379,7 +379,7 @@
:reserve-keyword="false"
placeholder="璇烽�夋嫨"
clearable
- :disabled="operationType === 'view'"
+ disabled
@change="changs">
<el-option v-for="item in userList"
:key="item.userId"
--
Gitblit v1.9.3