Browse Source

Merge branch 'develop_yh12' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh12

chenrui 2 years ago
parent
commit
d239c16d6b

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.1.74",
+    "version": "2.1.75",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 1 - 1
src/views/common/chooseProductsModal.vue

@@ -71,7 +71,7 @@
             size="small"
             :rowKey="(record) => record.productSn"
             rowKeyName="productSn"
-            :row-selection="{ columnWidth: 40, getCheckboxProps:record =>({props: { disabled: (this.type == 'supplier') && (this.rowSelectionInfo && this.rowSelectionInfo.selectedRowKeys.indexOf(record.productSn) > -1) }}) }"
+            :row-selection="{ columnWidth: 40, getCheckboxProps:record =>({props: { disabled: (this.type == 'supplier') && (this.chooseData && this.chooseData.indexOf(record.productSn) > -1) }}) }"
             @rowSelection="rowSelectionFun"
             :columns="columns"
             :data="loadData"

+ 1 - 1
src/views/supplierManagement/costSetting/addProductModal.vue

@@ -198,6 +198,7 @@ export default {
       this.spinning = true
       supplierProductSnList({ sn: this.supplierSn }).then(res => {
         if (res.status == 200) {
+          this.$refs.table.clearTable()
           this.chooseData = res.data //  包含先前所选产品
           this.handleSearch()
         }
@@ -210,7 +211,6 @@ export default {
       _this.$refs.ruleForm.validate(valid => {
         if (valid) {
           if (_this.supplierSn) {
-            // _this.$refs.table.clearTable()
             _this.$refs.table.refresh(true)
           } else {
             _this.$message.warning('请先选择供应商!')