商品条码台账增加导入

src/api/salesPurchasing/goodsCodeMachineAccount.js

@@ -16,4 +16,8 @@ export function pageExport(data, name) {
     data,
     name
   })
+}
+
+export function listImport(data) {
+	return handleImport('/jx/goods/importCode', data.formdata, data.id || '')
 }

src/components/Mall/Member/member-browse.vue

@@ -13,7 +13,7 @@
         <el-table-column align="center" label="商品价格" prop="goodsPrice"></el-table-column>
         <el-table-column align="center" label="商品状态" prop="defaultAddr">
           <template slot-scope="scope">
-            {{ scope.row.status ? '上架' : '下架' }}
+            {{ scope.row.goodsStatus ? '上架' : '下架' }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="浏览时间" prop="createTime"></el-table-column>

src/views/mallManagement/order/order_list/index.vue

@@ -245,7 +245,7 @@
 				              <el-button type="text" size="small" v-if="order.orderStatus === 'DFH' && $restrict('changeShippingaddress')"
 				                @click="openAddressForm(order)">修改收货地址</el-button>
 				              <el-button type="text" size="small"
-				                v-if="order.orderStatus === 'YFH' && $restrict('changeDeliverynumber') && order.orderDetails.some(i => i.workOrderType === 'INSTALL')"
+				                v-if="order.orderStatus === 'YFH' && $restrict('changeDeliverynumber') && order.orderDetails.some(i => i.workOrderType === 'INSTALL') && order.pickType == 'NO'"
 				                @click="showLogistics(order, 'edit')">
 				                修改快递单号
 				              </el-button>

src/views/mallManagement/order/order_refund/index.vue

@@ -278,7 +278,7 @@
               <el-card class="box-card">
                 <el-tabs v-model=" typeIndex " @tab-click=" changeType ">
                   <el-tab-pane label="发货数量" name="1"></el-tab-pane>
-                  <el-tab-pane v-if="joinCode" label="发货条码" name="2"></el-tab-pane>
+                  <el-tab-pane v-if="joinCode" label="退货条码" name="2"></el-tab-pane>
                 </el-tabs>
                 <br />
                <!-- <el-button size="small" v-show=" typeIndex == 2 && activeKey == 'REFUND_GOODS' " type="primary"
@@ -471,7 +471,7 @@
 </template>
 
 <script>
-import { getRefundList, saveRefundRemark, changeExamineStatus, receiveProd, getWebsiteList, getOrderDetail, getCodeDetail2, getMaterialList, listImport2, saveCode2, delCode2 } from "@/api/order"
+import { getRefundList, saveRefundRemark, changeExamineStatus, receiveProd, getWebsiteList, getOrderDetail, getCodeDetail, getMaterialList, listImport2, saveCode2, delCode2 } from "@/api/order"
 import { getExpress } from "@/api/common"
 import { downloadFiles } from '@/utils/util'
 import { commonTemplateDownload } from '@/api/common.js'
@@ -584,10 +584,10 @@ export default {
     },
     changeType() {
       this.getOrderDetail()
-      this.getCodeDetail2()
+      this.getCodeDetail()
     },
-    getCodeDetail2(orderRefundId) {
-      getCodeDetail2({ orderId: orderRefundId || this.editOrderId || this?.order_cp?.orderRefundId || "" }).then(async res => {
+    getCodeDetail(orderRefundId) {
+      getCodeDetail({ orderId: orderRefundId || this.editOrderId || this?.order_cp?.orderRefundId || "" }).then(async res => {
         for (var item of res.data) {
           item.specs = { goodsMaterialSpecsName: item.specsName }
           item.material = { name: item.materialName }
@@ -673,7 +673,7 @@ export default {
           if (res.code == 200) {
             this.$message({ type: 'success', message: '删除成功!' })
             this.getOrderDetail()
-            this.getCodeDetail2()
+            this.getCodeDetail()
           } else {
             this.$message.error(res.msg);
           }
@@ -696,7 +696,7 @@ export default {
             if (res.code == 200) {
               that.$message.success('保存成功!')
               this.getOrderDetail()
-              this.getCodeDetail2()
+              this.getCodeDetail()
             }
           })
         }
@@ -815,7 +815,7 @@ export default {
     changeExamineStatus(orderRefundId, examineStatus, refundType, orderId, type) {
       if (refundType == 'REFUND_GOODS' || refundType == 'REFUND_GOODS_DETAIL') {
         this.getOrderDetail(orderId)
-        this.getCodeDetail2(orderRefundId)
+        this.getCodeDetail(orderRefundId)
         this.openForm(refundType, { orderRefundId })
       } else {
         this.$prompt('请输入卖家留言', examineStatus == 'OK' ? '同意' : '拒绝', {

src/views/mallManagement/order/order_refund_detail/index.vue

@@ -192,7 +192,7 @@
 					<el-card class="box-card">
 						<el-tabs v-model="typeIndex" @tab-click="changeType">
 						    <el-tab-pane label="发货数量" name="1"></el-tab-pane>
-						    <el-tab-pane v-if="joinCode" label="发货条码" name="2"></el-tab-pane>
+						    <el-tab-pane v-if="joinCode" label="退货条码" name="2"></el-tab-pane>
 						</el-tabs>
 						<br/>
 						<!-- <el-button size="small" v-show="typeIndex == 2" type="primary" @click="addCode()">新增</el-button>
@@ -361,7 +361,7 @@
 </template>
 
 <script>
-import {changeExamineStatus, getOrderRefundDetail, receiveProd, saveRefundRemark, getOrderDetail, getCodeDetail2, getMaterialList, listImport2, saveCode2,delCode2} from "@/api/order";
+import {changeExamineStatus, getOrderRefundDetail, receiveProd, saveRefundRemark, getOrderDetail, getCodeDetail, getMaterialList, listImport2, saveCode2,delCode2} from "@/api/order";
 import {getExpress} from "@/api/common";
 
 export default {
@@ -435,7 +435,7 @@ export default {
       const orderRefundId = this.orderRefundId
 		if(refundType == 'REFUND_GOODS'){
 			this.getOrderDetail()
-			this.getCodeDetail2()
+			this.getCodeDetail()
 			this.returnGoodsVisible = true
 		}else{
 			changeExamineStatus({orderRefundId, examineStatus}).then(() => {
@@ -477,10 +477,10 @@ export default {
 		},
 		changeType(){
 			this.getOrderDetail()
-			this.getCodeDetail2()
+			this.getCodeDetail()
 		},
-		async getCodeDetail2(){
-			getCodeDetail2({orderId: this.orderRefundId}).then(async res => {
+		async getCodeDetail(){
+			getCodeDetail({orderId: this.orderRefundId}).then(async res => {
 				for(var item of res.data){
 					item.specs = {goodsMaterialSpecsName: item.specsName}
 					item.material = {name: item.materialName}
@@ -566,7 +566,7 @@ export default {
 				  if (res.code == 200) {
 				    this.$message({ type: 'success', message: '删除成功!' })
 				    this.getOrderDetail()
-				    this.getCodeDetail2()
+				    this.getCodeDetail()
 				  } else {
 				    this.$message.error(res.msg);
 				  }
@@ -589,7 +589,7 @@ export default {
 						if(res.code == 200){
 							that.$message.success('保存成功!')
 							this.getOrderDetail()
-							this.getCodeDetail2()
+							this.getCodeDetail()
 						}
 					})
 				}

src/views/salesPurchasing/goodsCodeMachineAccount/index.vue

@@ -47,7 +47,25 @@ export default {
 	computed: {
 		// 事件组合
 		optionsEvensGroup() {
-			return []
+			return [
+				[
+					[
+						this.optionsEvensAuth("imp", {
+							name: '下载导入模板',
+							click: () => {
+								this.handleDownload()
+							}
+						})
+					],
+					[
+						this.optionsEvensAuth("imp", {
+							render: () => {
+							  return this.importButton(listImport, '导入模板')
+							}
+						})
+					]
+				],
+			]
 		},
 		// 更多参数
 		moreParameters() {
@@ -96,7 +114,18 @@ export default {
 			this.formVisible = false
 			this.$refs?.formRef?.resetFields()
 			this.$data.formData = this.$options.data().formData
-		}
+		},
+		// 下载导入模版
+		handleDownload() {
+		  commonTemplateDownload({ name: '初始化条码.xlsx' }, `${this.$route.meta.title}`).then(res => {
+		  	this.$message({
+		  		message: '下载成功',
+		  		type: 'success'
+		  	})
+		  }).catch(err => {
+		  	this.$message.error('下载失败')
+		  })
+		},
 	}
 }
 </script>