chris 2 gadi atpakaļ
vecāks
revīzija
35521cfb7a

+ 8 - 7
src/views/modules/common/material-component.vue

@@ -78,15 +78,16 @@
               return
             }
             data.data.records.forEach(item => {
-              this.options.push({
+              this.options.push({...item,
                 label: item.materialName,
                 value: item.materialId,
-                materialId: item.materialId,
-                cateId: item.cateId,
-                categoryName: item.categoryName,
-                specifications: item.specifications,
-                unitName: item.unitName,
-                lockCnt: item.lockCnt
+                // materialId: item.materialId,
+                // cateId: item.cateId,
+                // categoryName: item.categoryName,
+                // specifications: item.specifications,
+                specification: item.specifications
+                // unitName: item.unitName,
+                // lockCnt: item.lockCnt
               })
             })
           } else {

+ 4 - 1
src/views/modules/sale/add-material.vue

@@ -7,7 +7,8 @@
       :visible.sync="visible">
       <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="100px">
         <el-form-item label="物品名称" prop="materialName">
-          <el-input v-model="dataForm.materialName" :disabled="display" placeholder="物品名称"></el-input>
+          <material-component v-model="dataForm" :material-id="dataForm.materialId"/>
+<!--          <el-input v-model="dataForm.materialName" :disabled="display" placeholder="物品名称"></el-input>-->
         </el-form-item>
         <el-form-item label="型号及规格" prop="specification">
           <el-input v-model="dataForm.specification" :disabled="display" placeholder="型号及规格"></el-input>
@@ -56,8 +57,10 @@
 
 <script>
   import { getDictList } from '@/api/dict'
+  import MaterialComponent from '@/views/modules/common/material-component'
   export default {
     name: 'add-material',
+    components: {MaterialComponent},
     data () {
       return {
         visible: false,

+ 2 - 2
src/views/modules/sale/purchase-add-or-update.vue

@@ -261,7 +261,7 @@
       },
       deleteMaterialHandle (detailId) {
         this.materialDetails.splice(this.materialDetails.findIndex((item) => item.detailId === detailId))
-        this.calTotal()
+        // this.calTotal()
       },
       addMaterialCallback (data) {
         if (!data) return
@@ -271,7 +271,7 @@
           this.materialDetails.splice(i)
         }
         this.materialDetails.push(data)
-        this.calTotal()
+        // this.calTotal()
       },
       // 百分比
       formatPercent (row) {