From 17d7e2b918d669789ba42d457a676bc950c03950 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期二, 13 八月 2024 15:19:37 +0800
Subject: [PATCH] 1.BOM页面  开发完成 35%

---
 src/views/basicSettings/roleList.vue       |    8 
 src/api/ProductModel.js                    |   44 ++++-
 src/views/materialManager/materialList.vue |  399 +++++++++++++++++++++----------------------------
 3 files changed, 213 insertions(+), 238 deletions(-)

diff --git a/src/api/ProductModel.js b/src/api/ProductModel.js
index 34ea5c9..96ff5d7 100644
--- a/src/api/ProductModel.js
+++ b/src/api/ProductModel.js
@@ -1,14 +1,5 @@
 import request from '@/utils/request'
 
-// 缁勭粐鏋舵瀯,鏌ヨ缁勭粐淇℃伅
-// export function STorgData(data) {
-//   return request({
-//     url: 'BasicSetting/STorgData',
-//     method: 'get',
-//     params: data
-//   })
-// }
-
 // 璁¢噺鍗曚綅缁勪俊鎭�
 export function TUnitGroup(data) {
   return request({
@@ -133,3 +124,38 @@
   })
 }
 
+// 鐗╂枡娓呭崟淇℃伅鍒楄〃
+export function BomMainData(data) {
+  return request({
+    url: 'ProductModel/BomMainData',
+    method: 'get',
+    params: data
+  })
+}
+
+// 鐗╂枡娓呭崟鏂板淇敼鑾峰彇鐖朵欢淇℃伅-T+鐣呮嵎閫氭ā寮�
+export function AddUpdateTBomParentData(data) {
+  return request({
+    url: 'ProductModel/AddUpdateTBomParentData',
+    method: 'get',
+    params: data
+  })
+}
+
+// 鐗╂枡娓呭崟鏂板淇敼鏍规嵁鐖朵欢淇℃伅鐨勮閲忓崟浣嶇粍缂栫爜鏌ユ壘璁¢噺鍗曚綅缁勪俊鎭�-T+鐣呮嵎閫氭ā寮�
+export function AddUpdateTBomUnitGroup(data) {
+  return request({
+    url: 'ProductModel/AddUpdateTBomUnitGroup',
+    method: 'get',
+    params: data
+  })
+}
+
+// 鐗╂枡娓呭崟鏂板鏃惰幏鍙栨渶澶х増鏈彿
+export function AddUpdateTBomMaxVsion(data) {
+  return request({
+    url: 'ProductModel/AddUpdateTBomMaxVsion',
+    method: 'get',
+    params: data
+  })
+}
diff --git a/src/views/basicSettings/roleList.vue b/src/views/basicSettings/roleList.vue
index c940480..f8e3c19 100644
--- a/src/views/basicSettings/roleList.vue
+++ b/src/views/basicSettings/roleList.vue
@@ -16,10 +16,10 @@
         >
           <div class="elForm">
             <el-form-item label="瑙掕壊缂栫爜" style=" display: flex;">
-              <el-input v-model="form.storg_code" placeholder="璇疯緭鍏�" style="width: 200px" />
+              <el-input v-model="form.role_code" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
             <el-form-item label="瑙掕壊鍚嶇О" style=" display: flex;">
-              <el-input v-model="form.storg_name" placeholder="璇疯緭鍏�" style="width: 200px" />
+              <el-input v-model="form.role_name" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
           </div>
           <div
@@ -369,8 +369,8 @@
     },
     // 閲嶇疆
     reset() {
-      this.form.storg_code = ''
-      this.form.storg_name = ''
+      this.form.role_code = ''
+      this.form.role_name = ''
       this.getRoleData()
     },
     // 鏂板鎸夐挳
diff --git a/src/views/materialManager/materialList.vue b/src/views/materialManager/materialList.vue
index 51b54dc..3eac471 100644
--- a/src/views/materialManager/materialList.vue
+++ b/src/views/materialManager/materialList.vue
@@ -3,7 +3,7 @@
     <div class="body" :style="{height:mainHeight+'px'}">
       <div class="bodyTopButtonGroup" style="justify-content: space-between">
         <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
-        <el-button v-waves icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+        <!--        <el-button v-waves icon="el-icon-download" @click="upload">瀵煎叆</el-button>-->
       </div>
 
       <div class="bodyTopFormGroup">
@@ -24,17 +24,18 @@
             <el-form-item label="姣嶄欢瑙勬牸" style=" display: flex;">
               <el-input v-model="form.parentpartspec" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
-            <el-form-item label="瀛樿揣绫诲瀷" style=" display: flex;">
-              <el-select v-model="form.parttype" style="width: 200px" placeholder="璇烽�夋嫨">
-                <el-option
-                  v-for="item in parttypeArr"
-                  :key="item.code"
-                  :label="item.name"
-                  :value="item.code"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item v-show="isExpandForm" label="鐗堟湰缂栧彿" style=" display: flex;">
+            <!--            <el-form-item label="瀛樿揣绫诲瀷" style=" display: flex;">-->
+            <!--              <el-select v-model="form.parttype" style="width: 200px" placeholder="璇烽�夋嫨">-->
+            <!--                <el-option-->
+            <!--                  v-for="item in parttypeArr"-->
+            <!--                  :key="item.code"-->
+            <!--                  :label="item.name"-->
+            <!--                  :value="item.code"-->
+            <!--                />-->
+            <!--              </el-select>-->
+            <!--            </el-form-item>-->
+
+            <el-form-item label="鐗堟湰缂栧彿" style=" display: flex;">
               <el-input v-model="form.version" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
             <el-form-item v-show="isExpandForm" label="鍒涘缓浜哄憳" style=" display: flex;">
@@ -92,10 +93,10 @@
       </div>
 
       <div class="elTableDiv">
-        <TableColumnSettings
-          :list1="tableColumnSettingsArray"
-          @tableColumnUpdate="tableColumnUpdate"
-        />
+        <!--        <TableColumnSettings-->
+        <!--          :list1="tableColumnSettingsArray"-->
+        <!--          @tableColumnUpdate="tableColumnUpdate"-->
+        <!--        />-->
         <el-table
           ref="tableDataRef"
           :key="tableTimeStampKey"
@@ -126,7 +127,7 @@
             <template slot-scope="{row}">
               <div v-if="!row[item.prop]">/</div>
 
-              <div v-else-if="item.prop==='startdate'">{{ row.startdate.substring(0,11) }}</div>
+              <div v-else-if="item.prop==='startdate'">{{ row.startdate.substring(0, 11) }}</div>
               <div v-else-if="item.prop==='status'">
                 <div v-if="row[item.prop]==='Y'">
                   <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
@@ -289,7 +290,7 @@
         align="right"
         layout="total,prev, pager, next,sizes"
         popper-class="select_bottom"
-        @pagination="getBoIventorySelect"
+        @pagination="getBomMainData"
       />
     </div>
 
@@ -318,7 +319,7 @@
           <el-form-item label="姣嶄欢缂栫爜" prop="parentpartcode">
             <el-select
               v-model="dialogForm.parentpartcode"
-              style="width: 200px"
+              style="width: 490px"
               placeholder="璇烽�夋嫨"
               :popper-append-to-body="false"
               :disabled="operation!=='add'"
@@ -328,47 +329,33 @@
               <el-option
                 v-for="item in PartSelectArr"
                 :key="item.partcode"
-                :label="item.partcode"
+                :label="item.partcode+' / '+item.partname"
                 :value="item.partcode"
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="姣嶄欢鍚嶇О" prop="parentpartname">
-            <el-select
-              v-model="dialogForm.parentpartname"
-              style="width: 200px"
-              placeholder="璇烽�夋嫨"
-              filterable
-              :disabled="operation!=='add'"
-              :popper-append-to-body="false"
-              @change="partSelectChange"
-            >
-              <el-option
-                v-for="item in PartSelectArr"
-                :key="item.partcode"
-                :label="item.partname"
-                :value="item.partcode"
-              />
-            </el-select>
-          </el-form-item>
+
           <el-form-item label="姣嶄欢瑙勬牸" prop="parentpartspec">
             <el-input v-model="dialogForm.parentpartspec" disabled style="width: 200px" />
-            <!--          <el-select-->
-            <!--            v-model="dialogForm.parentpartspec"-->
-            <!--            style="width: 200px"-->
-            <!--            placeholder="璇烽�夋嫨"-->
-            <!--            :popper-append-to-body="false"-->
-            <!--          >-->
-            <!--            <el-option-->
-            <!--              v-for="item in PartSelectArr"-->
-            <!--              :key="item.partcode"-->
-            <!--              :label="item.partcode"-->
-            <!--              :value="item.partcode"-->
-            <!--            />-->
-            <!--          </el-select>-->
           </el-form-item>
           <el-form-item label="璁¢噺鍗曚綅">
-            <el-input v-model="dialogForm.uomname" disabled style="width: 200px" />
+            <!--            <el-input v-model="dialogForm.uomname"  style="width: 200px" />-->
+
+            <el-select
+              v-model="dialogForm.uomcode"
+              :disabled="UnitGroupArr.length<2"
+              style="width: 200px"
+              placeholder="璇烽�夋嫨"
+              :popper-append-to-body="false"
+            >
+              <el-option
+                v-for="item in UnitGroupArr"
+                :key="item.unitcode"
+                :label="item.unitname"
+                :value="item.unitcode"
+              />
+            </el-select>
+
           </el-form-item>
           <!--          <el-form-item label="瀛樿揣绫诲瀷">-->
           <!--            <el-input v-model="dialogForm.chlx" readonly style="width: 200px" />-->
@@ -448,7 +435,7 @@
         />
         <el-table-column
           prop="SMATERIRL_CODE"
-          label="瀛愪欢缂栫爜"
+          label="瀛愪欢缂栫爜/鍚嶇О"
           show-tooltip-when-overflow
         >
           <template slot-scope="{row}">
@@ -456,60 +443,53 @@
               v-if="row.isVisible===1"
               v-model="row.SMATERIRL_CODE"
               filterable
-              placeholder="璇烽�夋嫨"
-              @change="val=>tableChange(val,row)"
-            >
-              <el-option
-                v-for="item in PartSelectArr"
-                :key="item.partname"
-                :label="item.partcode"
-                :value="item.partname"
-              />
-            </el-select>
-            <div v-if="row.isVisible===0">{{ row.SMATERIRL_CODE }}</div>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="SMATERIRL_NAME"
-          label="瀛愪欢鍚嶇О"
-          filterable
-          show-tooltip-when-overflow
-        >
-
-          <template slot-scope="{row}">
-            <el-select
-              v-if="row.isVisible===1"
-              v-model="row.SMATERIRL_NAME"
+              style="width: 100%;"
               placeholder="璇烽�夋嫨"
               @change="val=>tableChange(val,row)"
             >
               <el-option
                 v-for="item in PartSelectArr"
                 :key="item.partcode"
-                :label="item.partname"
+                :label="item.partcode+' / '+item.partname"
                 :value="item.partcode"
               />
             </el-select>
-            <div v-if="row.isVisible===0">{{ row.SMATERIRL_NAME }}</div>
+            <div v-if="row.isVisible===0">{{ row.SMATERIRL_CODE }}</div>
           </template>
         </el-table-column>
+
         <el-table-column
           prop="SMATERIRL_SPEC"
           label="瀛愪欢瑙勬牸"
           width="110"
           show-tooltip-when-overflow
         >
-          <template slot-scope="{row}">
-            <div v-if="row.SMATERIRL_SPEC">{{ row.SMATERIRL_SPEC }}</div>
-            <div v-else>/</div>
-          </template>
+          <!--          <template slot-scope="{row}">-->
+          <!--            <div v-if="row.SMATERIRL_SPEC">{{ row.SMATERIRL_SPEC }}</div>-->
+          <!--            <div v-else>/</div>-->
+          <!--          </template>-->
         </el-table-column>
         <el-table-column
           prop="uomname"
           label="璁¢噺鍗曚綅"
           width="110"
           show-tooltip-when-overflow
-        />
+        >
+          <template slot-scope="{row}">
+            <el-select
+              v-model="row.uomcode"
+              :disabled="row.UnitGroupArr.length<2"
+              placeholder="璇烽�夋嫨"
+            >
+              <el-option
+                v-for="item in row.UnitGroupArr"
+                :key="item.unitcode"
+                :label="item.unitname"
+                :value="item.unitcode"
+              />
+            </el-select>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="BASE_QUANTITY"
           label="鍩烘湰鐢ㄩ噺"
@@ -550,45 +530,24 @@
           show-tooltip-when-overflow
           width="110"
         />
-        <el-table-column
-          prop="PN_TYPE"
-          label="灞炴��"
-          show-tooltip-when-overflow
-          width="110"
-        >
-          <template slot-scope="{row}">
-            <el-select
-              v-if="row.isVisible===1"
-              v-model="row.PN_TYPE"
-              :disabled="row.PN_TYPE==='Z'"
-              placeholder="璇烽�夋嫨"
-              @change="val=>changeType(val,row)"
-            >
-              <el-option
-                v-for="item in sxArr"
-                :key="item.code"
-                :label="item.name"
-                :value="item.code"
-              />
-            </el-select>
-            <div v-if="row.isVisible===0">{{ row.PN_TYPE === 'Z' ? '涓绘枡' : '杈呮枡' }}</div>
-          </template>
-        </el-table-column>
+
         <el-table-column
           v-if="operation!=='preview'"
           label="鎿嶄綔"
-          width="120"
+          width="80"
           fixed="right"
         >
           <template slot-scope="{row}">
             <div class="operationClass">
-              <el-button v-if="row.isVisible===1" v-waves type="text" @click="saveRow(row)">纭畾</el-button>
-              <el-button v-if="row.isVisible===1" v-waves type="text" @click="cancelRow(row)">鍙栨秷</el-button>
-              <el-button v-if="row.isVisible===0" v-waves type="text" @click="editRow(row)">缂栬緫</el-button>
-              <el-button v-if="row.isVisible===0" v-waves type="text" @click="delRow(row)">鍒犻櫎</el-button>
+              <!--                      <el-button v-if="row.isVisible===1" v-waves type="text" @click="saveRow(row)">纭畾</el-button>-->
+              <!--                      <el-button v-if="row.isVisible===1" v-waves type="text" @click="cancelRow(row)">鍙栨秷</el-button>-->
+              <!--                      <el-button v-if="row.isVisible===0" v-waves type="text" @click="editRow(row)">缂栬緫</el-button>-->
+              <!--                      <el-button v-if="row.isVisible===0" v-waves type="text" @click="delRow(row)">鍒犻櫎</el-button>-->
+              <el-button v-waves type="text" @click="delRow(row)">鍒犻櫎</el-button>
             </div>
           </template>
         </el-table-column>
+
       </el-table>
 
       <span slot="footer" class="dialog-footer">
@@ -613,17 +572,15 @@
 <script>
 import Pagination from '@/components/Pagination'
 import { handleDatetime } from '@/utils/global'
-// import {
-//   AddUpdateBoIventory,
-//   BoIventorySelect,
-//   BoIventorySelectView,
-//   DeleteBoIventory, MaterielDetailedVsion,
-//   PartSelect,
-//   StockTypeSelect
-// } from '@/api/makeModel'
 import elDragDialog from '@/directive/el-drag-dialog'
 import waves from '@/directive/waves'
 import TableColumnSettings from '@/components/TableColumnSettings'
+import {
+  AddUpdateTBomUnitGroup,
+  BomMainData,
+  AddUpdateTBomParentData,
+  TMaterielClassTree, AddUpdateTBomMaxVsion
+} from '@/api/ProductModel'
 
 export default {
   name: 'Zzjg',
@@ -784,7 +741,7 @@
         uomname: '',
         // chlx: '',
         quantity: '',
-        status: '',
+        status: 'Y',
         startdate: '',
         version: ''
       },
@@ -820,16 +777,15 @@
         { code: 'Z', name: '涓绘枡' },
         { code: 'F', name: '杈呮枡' }
       ],
-
-      title_value: '鏁版嵁瀵煎叆 / 鐗╂枡娓呭崟',
-      code: '21',
-      shows: false
+      UnitGroupArr: []// 璁¢噺鍗曚綅鏁扮粍
 
     }
   },
 
   created() {
-    // this.handleRequest()
+    this.getBomMainData()
+    this.getAddUpdateTBomParentData()
+    // this.getStockTypeSelect()
   },
   mounted() {
     window.addEventListener('resize', this.getHeight)
@@ -843,14 +799,7 @@
       this.tableTimeStampKey = new Date().getTime()
       this.$refs.tableDataRef.doLayout()
     },
-    handleRequest() {
-      this.getBoIventorySelect().then(res => {
-        if (res.code === '200') {
-          this.getStockTypeSelect()
-        }
-      })
-    },
-    async getBoIventorySelect() {
+    async getBomMainData() {
       let tempDate = this.form.createdate
       if (tempDate.length > 0) {
         tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
@@ -872,45 +821,45 @@
         rows: this.form.rows // 姣忛〉澶氬皯鏉�
       }
 
-      const res = await BoIventorySelect(data)
+      const res = await BomMainData(data)
       this.tableData = res.data
       this.total = res.count
       return { code: res.code }
     },
     // 鑾峰彇姣嶄欢缂栫爜鍚嶇О绛変笅鎷夋帴鍙�
-    async getPartSelect() {
-      const { data: res } = await PartSelect()
+    async getAddUpdateTBomParentData() {
+      const { data: res } = await AddUpdateTBomParentData()
       this.PartSelectArr = res
       this.PartSelectArrAll = res
     },
     // 鑾峰彇瀛樿揣绫诲瀷涓嬫媺鎺ュ彛
     async getStockTypeSelect() {
-      const { data: res } = await StockTypeSelect()
+      const { data: res } = await TMaterielClassTree()
       this.parttypeArr = res
     },
-    partSelectChange(val) {
+    async partSelectChange(val) {
       const res = this.PartSelectArr.find(item => item.partcode === val)
-      this.dialogForm.parentpartcode = res.partcode
+      // this.dialogForm.parentpartcode = res.partcode
       this.dialogForm.parentpartname = res.partname
       this.dialogForm.parentpartspec = res.partspec
-      // this.dialogForm.uomcode = res.uom_code
-      this.dialogForm.uomname = res.uom_name
+      this.dialogForm.uomcode = res.unitcode
+      this.dialogForm.uomname = res.unitname
 
-      if (this.PartSelectArrTemp.length > 0) {
-        this.PartSelectArr.unshift(this.PartSelectArrTemp[0])
-        this.PartSelectArrTemp.splice(0, 1)
+      this.UnitGroupArr = []
+      this.UnitGroupArr.push({
+        unitcode: res.unitcode,
+        unitname: res.unitname
+      })
+
+      if (res.idunitgroup) {
+        const { data: r } = await AddUpdateTBomUnitGroup({ idunitgroup: res.idunitgroup })
+        this.UnitGroupArr = r
       }
 
-      this.PartSelectArr.forEach((item, index) => {
-        if (item.partcode === val) {
-          this.PartSelectArrTemp.push(item)
-          this.PartSelectArr.splice(index, 1)
-        }
-      })
-      this.getMaterielDetailedVsion(this.dialogForm.parentpartcode)
+      await this.getAddUpdateTBomMaxVsion(this.dialogForm.parentpartcode)
     },
-    async getMaterielDetailedVsion(parentpartcode) {
-      const { data: res } = await MaterielDetailedVsion({ parentpartcode })
+    async getAddUpdateTBomMaxVsion(parentpartcode) {
+      const { data: res } = await AddUpdateTBomMaxVsion({ parentpartcode })
       this.dialogForm.version = res
     },
     // 鎺掑簭鏀瑰彉鏃�
@@ -924,20 +873,17 @@
       }
       this.form.order = order
       this.form.prop = prop
-      this.getBoIventorySelect()
+      this.getBomMainData()
     },
     // 鏌ヨ
     search() {
-      this.getBoIventorySelect()
+      this.getBomMainData()
     },
     // 瀵煎叆鎸夐挳
     upload() {
       this.shows = true
-      this.$refs.importPickerFunc.newDataFunc()
     },
-    colos() {
-      this.shows = false
-    },
+
     // 閲嶇疆
     reset() {
       this.form.parentpartcode = ''
@@ -948,24 +894,22 @@
       this.form.version = ''
       this.form.createusername = ''
       this.form.createdate = ''
-      this.getBoIventorySelect()
+      this.getBomMainData()
     },
 
     // 鏂板鎸夐挳
     add(operation) {
       this.operation = operation
       this.dialogVisible = true
-      this.getPartSelect()
 
       this.dialogForm.startdate = handleDatetime(new Date())
     },
     // 淇敼鎸夐挳
     async edit(operation, row) {
-      const res = await BoIventorySelectView({ bomid: row.id })
+      const res = await BomMainDataView({ bomid: row.id })
       if (res.code === '200') {
         this.operation = operation
         this.dialogVisible = true
-        await this.getPartSelect()
 
         const childrenArr = [] // 瀛愰泦鏁扮粍partcode
 
@@ -987,8 +931,8 @@
             uomname: item.uom_name,
             BASE_QUANTITY: item.base_quantity,
             LOSS_QUANTITY: item.loss_quantity,
-            TOTAL_QUANTITY: item.total_quantity,
-            PN_TYPE: item.pn_type
+            TOTAL_QUANTITY: item.total_quantity
+
           })
           childrenArr.push(item.partcode)
         })
@@ -1017,28 +961,30 @@
       }
     },
     // 瀵硅瘽妗嗚〃鏍间笅鎷夐�夋嫨鍊兼敼鍙樻椂
-    tableChange(val, row) {
-      const res = this.PartSelectArr.find(item => item.partcode === val || item.partname === val)
+    async  tableChange(val, row) {
+      const res = this.PartSelectArr.find(item => item.partcode === val)
       row.SMATERIRL_CODE = res.partcode
       row.SMATERIRL_NAME = res.partname
       row.SMATERIRL_SPEC = res.partspec
-      row.uomcode = res.uom_code
-      row.uomname = res.uom_name
+      row.uomcode = res.unitcode
+      row.uomname = res.unitname
 
-      // this.PartSelectArr.forEach((item, index) => {
-      //   this.PartSelectArr.splice(index, 1)
-      // })
-    },
-    // 鐗╂枡娓呭崟灞炴�х被鍨嬪�兼敼鍙樻椂瑙﹀彂
-    changeType(val, row) {
-      this.dialogTableDataArr.forEach(item => {
-        item.PN_TYPE = item.SMATERIRL_CODE === row.SMATERIRL_CODE ? 'Z' : 'F'
+      row.UnitGroupArr = []
+      row.UnitGroupArr.push({
+        unitcode: res.unitcode,
+        unitname: res.unitname
       })
-    },
-    addDialog() {
-      if (this.dialogTableDataArr.find(item => item.isVisible === 1)) {
-        return this.$message.info('璇峰厛淇濆瓨鏈潯璁板綍锛�')
+
+      if (res.idunitgroup) {
+        const { data: r } = await AddUpdateTBomUnitGroup({ idunitgroup: res.idunitgroup })
+        row.UnitGroupArr = r
       }
+    },
+
+    addDialog() {
+      // if (this.dialogTableDataArr.find(item => item.isVisible === 1)) {
+      //   return this.$message.info('璇峰厛淇濆瓨鏈潯璁板綍锛�')
+      // }
 
       let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
       number = number === 0 ? (10 + Math.random()) : number
@@ -1051,14 +997,14 @@
         SMATERIRL_SPEC: '',
         uomcode: '',
         uomname: '',
+        UnitGroupArr: [],
         BASE_QUANTITY: '',
         LOSS_QUANTITY: '',
-        TOTAL_QUANTITY: '',
-        PN_TYPE: this.dialogTableDataArr.length === 0 ? 'Z' : 'F'
+        TOTAL_QUANTITY: ''
       })
     },
     saveRow(row) {
-      if (row.SMATERIRL_CODE === '' || row.BASE_QUANTITY === '' || row.LOSS_QUANTITY === '' || row.PN_TYPE === '') {
+      if (row.SMATERIRL_CODE === '' || row.BASE_QUANTITY === '' || row.LOSS_QUANTITY === '') {
         return this.$message.info('淇濆瓨澶辫触锛岃琛屽唴瀹规湭濉叏锛�')
       }
 
@@ -1083,15 +1029,11 @@
       })
     },
     delRow(row) {
-      if (row.PN_TYPE === 'Z') {
-        return this.$message.info('涓绘枡涓嶅彲鍒犻櫎锛�')
-      }
-
-      this.PartSelectArrAll.forEach(item => {
-        if (item.partcode === row.SMATERIRL_CODE) {
-          this.PartSelectArr.unshift(item)
-        }
-      })
+      // this.PartSelectArrAll.forEach(item => {
+      //   if (item.partcode === row.SMATERIRL_CODE) {
+      //     this.PartSelectArr.unshift(item)
+      //   }
+      // })
       this.dialogTableDataArr.forEach((item, index) => {
         if (item.SMATERIRL_CODE === row.SMATERIRL_CODE) {
           this.dialogTableDataArr.splice(index, 1)
@@ -1103,23 +1045,23 @@
     },
     // 鍒犻櫎鎸夐挳
     async del(row) {
-      this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
-        confirmButtonText: '纭畾',
-        cancelButtonText: '鍙栨秷',
-        type: 'warning'
-      }).then(() => {
-        DeleteBoIventory({ bomid: row.id }).then(res => {
-          if (res.code === '200') {
-            this.$message.success('鍒犻櫎鎴愬姛!')
-            if (this.form.page > 1 && this.tableData.length === 1) {
-              this.form.page--
-            }
-            this.getBoIventorySelect()
-          }
-        })
-      }).catch(() => {
-        this.$message.info('宸插彇娑堝垹闄�')
-      })
+      // this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+      //   confirmButtonText: '纭畾',
+      //   cancelButtonText: '鍙栨秷',
+      //   type: 'warning'
+      // }).then(() => {
+      //   DeleteBoIventory({ bomid: row.id }).then(res => {
+      //     if (res.code === '200') {
+      //       this.$message.success('鍒犻櫎鎴愬姛!')
+      //       if (this.form.page > 1 && this.tableData.length === 1) {
+      //         this.form.page--
+      //       }
+      //       this.getBomMainData()
+      //     }
+      //   })
+      // }).catch(() => {
+      //   this.$message.info('宸插彇娑堝垹闄�')
+      // })
     },
     // 瀵硅瘽妗嗗叧闂簨浠�
     handleClose() {
@@ -1130,7 +1072,7 @@
       this.dialogForm.uomname = ''
       // this.dialogForm.chlx = ''
       this.dialogForm.quantity = ''
-      this.dialogForm.status = ''
+      this.dialogForm.status = 'Y'
       this.dialogForm.startdate = ''
       this.dialogForm.version = ''
       this.PartSelectArr = []
@@ -1167,17 +1109,17 @@
           // console.log(data)
 
           this.$store.state.app.buttonIsDisabled = true
-          AddUpdateBoIventory(data).then(res => {
-            if (res.code === '200') {
-              this.dialogVisible = false
-              this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
-              this.getBoIventorySelect()
-              this.$store.state.app.buttonIsDisabled = false
-            } else {
-              this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
-              this.$store.state.app.buttonIsDisabled = false
-            }
-          })
+          // AddUpdateBoIventory(data).then(res => {
+          //   if (res.code === '200') {
+          //     this.dialogVisible = false
+          //     this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
+          //     this.getBomMainData()
+          //     this.$store.state.app.buttonIsDisabled = false
+          //   } else {
+          //     this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+          //     this.$store.state.app.buttonIsDisabled = false
+          //   }
+          // })
         }
       })
     },
@@ -1196,4 +1138,11 @@
   }
 }
 </script>
-
+<style scoped lang="scss">
+::v-deep .el-select__caret::before{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 34px;
+}
+</style>

--
Gitblit v1.9.3