lilei 2 tahun lalu
induk
melakukan
9d02a2c355

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1677837635038
+  "version": 1678064788970
 }

+ 2 - 7
src/views/salesManagement/salesQueryNew/chooseShelfProduct.vue

@@ -171,8 +171,6 @@
         </a-tab-pane>
       </a-tabs>
     </a-spin>
-    <!-- 销售记录 -->
-    <product-salesRecord-modal ref="salseRecord" :openModal="showRecord" @close="showRecord=false" />
   </a-drawer>
 </template>
 
@@ -180,11 +178,10 @@
 import { commonMixin } from '@/utils/mixin'
 import { STable } from '@/components'
 import ProductType from '../../common/productType.js'
-import productSalesRecordModal from './productSalesRecordModal.vue'
 import { queryWaitReplenish, queryShelfProduct } from '@/api/shelfReplenish'
 export default {
   name: 'OutinDetailModal',
-  components: { STable, ProductType, productSalesRecordModal },
+  components: { STable, ProductType },
   mixins: [commonMixin],
   props: {
     openModal: {
@@ -211,7 +208,6 @@ export default {
     return {
       spinning: false,
       advanced: false,
-      showRecord: false,
       isShow: this.openModal, //  是否打开弹框
       options: [
         { label: '库存充足', value: 'stockEnough' },
@@ -334,8 +330,7 @@ export default {
     },
     // 销售记录
     handleDetail (row) {
-      this.showRecord = true
-      this.$refs.salseRecord.getDetail(this.baseData.customerSn, row.productSn, row)
+      this.$emit('viewRecord',row)
     },
     // 表格选中项
     rowSelectionFun (obj) {

+ 22 - 1
src/views/salesManagement/salesQueryNew/edit.vue

@@ -285,6 +285,7 @@
     <chooseShelfProduct
       v-if="showShelfModal"
       ref="chooseShelfProduct"
+      @viewRecord="hanldSalesRecord" 
       @add="insterProduct"
       @plAdd="plInsterProduct"
       :baseData="shelfInfo"
@@ -427,7 +428,7 @@ export default {
         this.delSalerOrder()
       }
       if(e.key == 1){
-        // this.delJijian()
+        this.delJijian()
       }
     },
     // 打印预览/快捷打印
@@ -596,6 +597,26 @@ export default {
         }
       })
     },
+    // 删除急件
+    delJijian(){
+      const _this = this
+      this.$confirm({
+        title: '提示',
+        content: '确认要删除所有急件吗?删除后不可恢复。',
+        centered: true,
+        closable: true,
+        onOk () {
+          _this.spinning = true
+          salesDel({ id: _this.orderId }).then(res => {
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+              _this.handleBack()
+            }
+            _this.spinning = false
+          })
+        }
+      })
+    },
     // 删除销售单
     delSalerOrder () {
       const _this = this