商品名称修改功能调整

src/api/materialManagement/WareHouseService.js

@@ -127,11 +127,11 @@ export default class WareHouseService {
       data: {tradeName: tradeName, wareHouseType: wareHouseType, warnNum: warnNum}
     })
   }
-  saveTradeName (oldTradeName, tradeName) {
+  saveTradeName (oldTradeName, tradeName, type) {
     return request({
       url: `/material/management/wareHouse/saveTradeName`,
       method: 'post',
-      data: {oldTradeName: oldTradeName, tradeName: tradeName}
+      data: {oldTradeName: oldTradeName, tradeName: tradeName, wareHouseType: type}
     })
   }
   findTradeByTypeId (typeId) {

src/views/modules/materialManagement/wareHouseSummary/EditTradeNameForm.vue

@@ -45,7 +45,9 @@
         inputForm: {
           tradeName: ''
         },
-        oldTradeName: ''
+        oldTradeName: '',
+        type: '',
+        typeName: ''
       }
     },
     wareHouseService: null,
@@ -55,22 +57,24 @@
     components: {
     },
     methods: {
-      init (tradeName) {
+      init (tradeName, type, typeName) {
         this.visible = true
         this.inputForm.tradeName = tradeName
+        this.type = type
+        this.typeName = typeName
         this.oldTradeName = tradeName
       },
       // 表单提交
       submit () {
         this.$refs['inputForm'].validate((valid) => {
           if (valid) {
-            this.$confirm('确定将商品名称为 ”' + this.oldTradeName + '“ 的入库商品全部改为 ”' + this.inputForm.tradeName + '“ 吗？', '提示', {
+            this.$confirm('确定将 [' + this.typeName + '] 商品 ”' + this.oldTradeName + '“ 全部改为 ”' + this.inputForm.tradeName + '“ 吗？', '提示', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',
               type: 'warning'
             }).then(() => {
               this.loading = true
-              this.wareHouseService.saveTradeName(this.oldTradeName, this.inputForm.tradeName).then(({data}) => {
+              this.wareHouseService.saveTradeName(this.oldTradeName, this.inputForm.tradeName, this.type).then(({data}) => {
                 this.$message.success(data)
                 this.close()
                 this.$emit('refreshList')

src/views/modules/materialManagement/wareHouseSummary/WareHouseSummaryList.vue

@@ -127,7 +127,7 @@
 <!--          <vxe-column min-width="160" align="center" title="入库时间" field="wareHouseDate"></vxe-column>-->
           <vxe-column title="操作" width="80px" fixed="right" align="center">
             <template  slot-scope="scope">
-              <el-button v-if="hasPermission('material:summary:edit')" type="text"  size="small" @click="edit(scope.row.tradeName)">修改</el-button>
+              <el-button v-if="hasPermission('material:summary:edit')" type="text"  size="small" @click="edit(scope.row.tradeName, scope.row.wareHouseType, scope.row.wareHouseTypeName)">修改</el-button>
             </template>
           </vxe-column>
         </vxe-table>
@@ -246,8 +246,8 @@
         this.$refs.wareHouseHistory.init(row.tradeName, detailId)
       },
       // 修改商品名称
-      edit (tradeName) {
-        this.$refs.editTradeNameForm.init(tradeName)
+      edit (tradeName, type, typeName) {
+        this.$refs.editTradeNameForm.init(tradeName, type, typeName)
       },
       // 查询当前用户是否是管理员用户
       checkIsAdmin () {