linwenxin 1 rok temu
rodzic
commit
7cb0764e87

+ 24 - 22
src/views/salesPurchasing/commercialMaterial/index.vue

@@ -1,33 +1,21 @@
 <template>
   <zj-tab-page ref="tabPage" :defaultActives="[{ key: 'list', label: $route.meta.title + '-列表', essential: true }]">
     <template slot-scope="{ activeKey, data }">
-      <div
-        :style="{
-          width: '100%',
-          height: activeKey == 'list' ? '100%' : '0px',
-          overflow: 'hidden'
-        }"
-      >
-        <template-page
-          ref="pageRef"
-          :get-list="getList"
-          :table-attributes="tableAttributes"
-          :table-events="tableEvents"
-          :options-evens-group="optionsEvensGroup"
-          :moreParameters="moreParameters"
-          :column-parsing="columnParsing"
-          :exportList="exportList"
-          :operation="operation()"
-        >
+      <div :style="{
+        width: '100%',
+        height: activeKey == 'list' ? '100%' : '0px',
+        overflow: 'hidden'
+      }">
+        <template-page ref="pageRef" :get-list="getList" :table-attributes="tableAttributes" :table-events="tableEvents"
+          :options-evens-group="optionsEvensGroup" :moreParameters="moreParameters" :column-parsing="columnParsing"
+          :exportList="exportList" :operation="operation()">
         </template-page>
       </div>
       <div v-if="~['add', 'edit'].indexOf(activeKey)" style="box-sizing: border-box; padding: 16px">
         <zj-form-container ref="formRef" :form-data="formData" :form-attributes="{ size: 'mini' }">
           <zj-form-module title="" label-width="100px" :form-data="formData" :form-items="formItems">
-            <div
-              slot="internal-bottom"
-              style="text-align: right; margin-bottom: 20px; box-sizing: border-box; padding-right: 10px"
-            >
+            <div slot="internal-bottom"
+              style="text-align: right; margin-bottom: 20px; box-sizing: border-box; padding-right: 10px">
               <el-button size="mini" @click="data.removeTab()">取消</el-button>
               <el-button size="mini" type="primary" @click="queding(data.removeTab)">确定</el-button>
             </div>
@@ -82,6 +70,7 @@ export default {
         unit: '',
         isVirtyual: '',
         remark: '',
+        factoryNo: "",
         items: []
       },
       isEditIndex: -1,
@@ -252,6 +241,19 @@ export default {
           }
         },
         {
+          name: 'el-input',
+          md: 6,
+          attributes: {
+            disabled: false,
+            placeholder: '请输入'
+          },
+          formItemAttributes: {
+            label: '厂物料编码',
+            prop: 'factoryNo',
+            rules: []
+          }
+        },
+        {
           md: 6,
           name: 'el-radio',
           options: [

+ 7 - 0
src/views/salesPurchasing/mixins/out_storage_goods.js

@@ -37,6 +37,13 @@ export default {
         },
         {
           columnAttributes: {
+            label: '厂物料编码',
+            prop: 'factoryNo',
+            width: 120
+          }
+        },
+        {
+          columnAttributes: {
             label: '规格型号',
             prop: 'specsName',
             width: 120

+ 14 - 2
src/views/salesPurchasing/mixins/storage_goods.js

@@ -183,6 +183,7 @@ export default {
                             row['specsName'] = res?.specsName
                             row['unit'] = res?.unit
                             row['stockQty'] = res?.stockQty
+                            row['factoryNo'] = res?.factoryNo
                             row['insideQty'] =
                               res.items
                                 .filter(item => item.type === 'INSIDE')
@@ -208,6 +209,7 @@ export default {
                         row['outQty'] = ''
                         row['partsQty'] = ''
                         row['stockQty'] = ''
+                        row['factoryNo'] = ''
                       }
                     }}
                     placeholder="请选择"
@@ -230,6 +232,13 @@ export default {
         },
         {
           columnAttributes: {
+            label: '厂物料编码',
+            prop: 'factoryNo',
+            width: 120
+          }
+        },
+        {
+          columnAttributes: {
             label: '规格型号',
             prop: 'specsName',
             width: 120
@@ -516,6 +525,7 @@ export default {
         row.outQty = ''
         row.partsQty = ''
         row.stockQty = ''
+        row.factoryNo = ''
       }
     },
     getVfyKey(index, bool = true) {
@@ -585,7 +595,8 @@ export default {
               partsCodeQty: '',
               price: '',
               amount: '',
-              stockQty: ''
+              stockQty: '',
+              factoryNo: "",
             })
             this.isEditIndex = 0
           }
@@ -611,7 +622,8 @@ export default {
           partsCodeQty: '',
           price: '',
           amount: '',
-          stockQty: ''
+          stockQty: '',
+          factoryNo: ''
         })
         this.isEditIndex = 0
       }