linwenxin 1 vuosi sitten
vanhempi
commit
676795fe37

+ 5 - 2
src/views/engineeringAuxiliaryParts/projectCollectionManagement/workOrderInfo/mixins/productColumns.js

@@ -44,11 +44,13 @@ export default {
                         row.marketPrice = ""
                         row.qty = ""
                         row.amount = ""
+                        row.goodsCode = ""
                         if (val) {
                           var data = this.goodsList.find(item => item.goodsId == val)
                           if (data) {
                             row[column.columnAttributes.propName] = data.goodsName
                             row.categoryName = data.categoryName
+                            row.goodsCode = data.goodsCode
                             row.unit = data.goodsStockUnit
                             row.goodsSpecification = data.goodsSpecification
                             row.marketPrice = data.marketPrice
@@ -57,7 +59,7 @@ export default {
                         }
                       }}
                       placeholder="请选择">
-                      {this.goodsList.filter(item => !(this.formData?.items || []).find(data => data.goodsId == item.goodsId)).map((item, index_) => <el-option key={index_} label={item.goodsName} value={item.goodsId}></el-option>)}
+                      {this.goodsList.filter(item => item.goodsId == row.goodsId || !(this.formData?.items || []).find(data => data.goodsId == item.goodsId)).map((item, index_) => <el-option key={index_} label={item.goodsName} value={item.goodsId}></el-option>)}
                     </el-select>
                   </el-form-item>
                 </div>
@@ -81,7 +83,7 @@ export default {
             {
               columnAttributes: {
                 label: '商品代码',
-                prop: 'goodsId'
+                prop: 'goodsCode'
               }
             },
             {
@@ -154,6 +156,7 @@ export default {
             add: () => {
               this.formData.items.unshift({
                 "goodsId": "",
+                "goodsCode": "",
                 "goodsName": "",
                 "categoryName": "",
                 "unit": "",