From 7c75805905f8f574e6d0d9d6573c1f09f79a48f6 Mon Sep 17 00:00:00 2001
From: long <18782126717@163.com>
Date: Tue, 1 Nov 2022 18:00:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=80=BB=E5=BA=93=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=90=8D=E7=A7=B0=20=E4=BF=AE=E6=94=B9=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E6=B5=81=E7=A8=8B=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activiti/form/ProcessMaterialWarehousingForm.vue     | 9 ++++++++-
 src/views/activiti/todoManage.vue                        | 4 ++--
 .../processmaterials/ProcessUdgetPlanMaterialList.vue    | 8 ++++----
 .../suppliesstronger/ProcessSuppliesStrongerLists.vue    | 2 +-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
index 01a732a..623acaf 100644
--- a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
+++ b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
@@ -205,7 +205,14 @@ import JSelectCompany from '../../../components/jeecgbiz/JSelectCompany'
               title: '单价',
               key: 'materialPrice',
               type: FormTypes.inputNumber,
-              disabled: true,
+              width:"200px",
+              placeholder: '请输入${title}',
+              defaultValue:'',
+            },
+            {
+              title: '数量',
+              key: 'materialQuantity',
+              type: FormTypes.inputNumber,
               width:"200px",
               placeholder: '请输入${title}',
               defaultValue:'',
diff --git a/src/views/activiti/todoManage.vue b/src/views/activiti/todoManage.vue
index 16c10f1..6150f6a 100644
--- a/src/views/activiti/todoManage.vue
+++ b/src/views/activiti/todoManage.vue
@@ -172,8 +172,8 @@
           </a-form-item>
           <a-form-item label="消息通知">
             <a-checkbox v-model="form.sendMessage">站内消息通知</a-checkbox>
-            <a-checkbox v-model="form.sendSms" disabled>短信通知</a-checkbox>
-            <a-checkbox v-model="form.sendEmail" disabled>邮件通知</a-checkbox>
+           <!-- <a-checkbox v-model="form.sendSms" disabled>短信通知</a-checkbox>
+            <a-checkbox v-model="form.sendEmail" disabled>邮件通知</a-checkbox>-->
           </a-form-item>
         </a-form>
       </div>
diff --git a/src/views/processmaterials/ProcessUdgetPlanMaterialList.vue b/src/views/processmaterials/ProcessUdgetPlanMaterialList.vue
index b999412..efd38f0 100644
--- a/src/views/processmaterials/ProcessUdgetPlanMaterialList.vue
+++ b/src/views/processmaterials/ProcessUdgetPlanMaterialList.vue
@@ -180,11 +180,11 @@
             align:"center",
             dataIndex: 'librarySign'
           },*/
-          {
+         /* {
             title:'核算属性',
             align:"center",
             dataIndex: 'materialType_dictText'
-          },
+          },*/
           {
             title:'物料名称及规格型号',
             align:"center",
@@ -205,11 +205,11 @@
             align:"center",
             dataIndex: 'materialPrice'
           },
-          {
+         /* {
             title:'对比单价',
             align:"center",
             dataIndex: 'contrastPrice'
-          },
+          },*/
           {
             title:'数量',
             align:"center",
diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
index 750f451..34ad95c 100644
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue
@@ -226,7 +226,7 @@
             dataIndex: 'amount'
           },
           {
-            title:'单价',
+            title:'平均价格',
             align:"center",
             dataIndex: 'price'
           },