From 45bc572466273aa9fbfca6b993a3428394fa93ca Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Thu, 25 Jul 2024 18:56:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E6=96=B9=E7=89=A9=E6=96=99=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=88=90=E6=9C=AC=E6=94=B6=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/basicdata/TripartiteMaterial.js    | 31 +++++++++++
 .../basicdata/TripartiteMaterial/list.vue     | 53 +++++++++++++++++--
 2 files changed, 80 insertions(+), 4 deletions(-)

diff --git a/src/option/basicdata/TripartiteMaterial.js b/src/option/basicdata/TripartiteMaterial.js
index 045cd088..f0510ff6 100644
--- a/src/option/basicdata/TripartiteMaterial.js
+++ b/src/option/basicdata/TripartiteMaterial.js
@@ -36,6 +36,37 @@ export const columnList = [
     sortable: true,
     head: false,
   },
+  {
+    prop: 'typeNameS',
+    label: '结算类型',
+    type: 3,
+    values: '',
+    width: '150',
+    checkarr: [
+      {
+      label: '收入',
+      value:'1'
+    },
+    {
+      label: '成本',
+      value:'2'
+    },
+  ],
+    fixed: true,
+    sortable: true,
+    head: false,
+  },
+  {
+    prop: 'materielName',
+    label: '物料',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: true,
+    sortable: true,
+    head: false,
+  },
   {
     prop: 'firsts',
     label: '一级品',
diff --git a/src/views/basicdata/TripartiteMaterial/list.vue b/src/views/basicdata/TripartiteMaterial/list.vue
index a1dbc433..7e412231 100644
--- a/src/views/basicdata/TripartiteMaterial/list.vue
+++ b/src/views/basicdata/TripartiteMaterial/list.vue
@@ -164,16 +164,16 @@
 
         <!-- materialArr -->
         <el-form-item
-          label="干线结算品类"
+          label="结算品类"
           prop="categoryName"
-          :rules="[{ required: true, message: '请选择干线结算品类', trigger: ['blur', 'change'] }]"
+          :rules="[{ required: true, message: '请选择结算品类', trigger: ['blur', 'change'] }]"
         >
           <el-select
             class="w100"
             v-model="details.form.categoryName"
             filterable
             clearable
-            placeholder="请选择干线结算品类"
+            placeholder="请选择结算品类"
             style="width: 240px"
             :loading="loadingObj.loading"
             @change="handleChangeMaterial"
@@ -191,6 +191,31 @@
           </el-select>
         </el-form-item>
 
+        <el-form-item
+          label="结算类型"
+          prop="type"
+          :rules="[{ required: true, message: '请选择结算类型', trigger: ['blur', 'change'] }]"
+        >
+          <el-select
+            class="w100"
+            v-model="details.form.type"
+            filterable
+            clearable
+            placeholder="请选择结算类型"
+            style="width: 240px"
+            remote
+            reserve-keyword
+            default-first-option
+          >
+            <el-option
+              v-for="val in details.typeList"
+              :key="val.value"
+              :label="val.label"
+              :value="val.value"
+            />
+          </el-select>
+        </el-form-item>
+   
         <el-form-item label="一级品">
           <el-input placeholder="请输入一级品" v-model.trim="details.form.firsts"></el-input>
         </el-form-item>
@@ -202,6 +227,9 @@
         <el-form-item label="三级品">
           <el-input placeholder="请输入三级品" v-model.trim="details.form.thirds"></el-input>
         </el-form-item>
+        <el-form-item label="物料">
+          <el-input placeholder="物料" v-model.trim="details.form.materielName"></el-input>
+        </el-form-item>
       </el-form>
 
       <div class="dialog-footer">
@@ -354,6 +382,16 @@ const details = reactive<any>({
   brandArr: [],
   /** 物料数据 */
   materialArr: [],
+  typeList:[
+    {
+    label:'收入',
+    value:1
+    },
+    {
+    label:'成本',
+    value:2
+    },
+  ]
 });
 
 /** 表格实例 */
@@ -382,6 +420,13 @@ const onLoad = debounce(async (params = {}) => {
     const { code, data } = res.data;
     if (code !== 200) return;
     details.data = data.records;
+    details.data.forEach((item)=>{
+      if(item.type==1){
+        item.typeNameS ='收入'
+      }else if(item.type == 2){
+             item.typeNameS ='成本'
+      }
+    })
     details.page.total = data.total;
   } catch (error) {
     console.log('error :>> ', error);
@@ -448,7 +493,7 @@ const btnsc = () => {};
 
 /** 表格表头下拉框选择 */
 const selectsc = (index, row) => {
-  const _key = row.prop.replace('Name', '');
+  const _key = row.prop.replace('NameS', '');
 
   details.query[_key] = index;
   if (!index) delete details.query[_key];