Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-eom into dev

src/mixins/tableColumnsMixin.js

@@ -1,4 +1,5 @@
 import request from '@/utils/request';
+import _ from 'lodash';
 
 export default {
   data() {
@@ -66,9 +67,12 @@ export default {
       if (res?.columnConfig?.length > 0) {
         //对比接口返回和本地columns
         let { nlist, type } = this.columnsContrast(res.columnConfig);
+        // 将nlist中的prop字段去重
+        const uniqueList = _.uniqBy(nlist, 'prop');
+        const uniqueLabelList = _.uniqBy(uniqueList, 'label');
         //有更新则更新服务缓存配置
         if (type) {
-          this.saveColumns(nlist);
+          this.saveColumns(uniqueLabelList);
         }
         this.setStorage(this.cacheKeyUrl + 'Cols', nlist);
         // 更新列

src/views/purchasingManage/purchaseNeedManage/components/addDialog.vue

@@ -581,7 +581,8 @@
         }
       },
       async saleOrderSubmit(res) {
-        const data = await getDetail(res);
+        console.log('getDetail~~~', this.businessId, res);
+        const data = await getDetail(this.businessId || res);
         this.processSubmitDialogFlag = true;
         this.$nextTick(() => {
           let params = {