0850

src/views/manage/order/before/components/table.vue

@@ -46,9 +46,12 @@
                 <span class="status-danger" v-else>未设置</span>
             </template>
         </el-table-column>
-        <el-table-column label="商品名称" prop="product_name" width="220">
+        <el-table-column label="商品信息" prop="product_name" width="220">
             <template #default="scope">
-                <span v-if="scope.row.product_name">{{ scope.row.product_name }}</span>
+                <div class="el-text" v-if="scope.row.product_name">
+                    {{ scope.row.product_name }}
+                    <div class="desc"><span>{{ scope.row.sku }}</span></div>
+                </div>
                 <span class="status-danger" v-else>未设置</span>
             </template>
         </el-table-column>

src/views/manage/order/done/components/table.vue

@@ -46,9 +46,12 @@
                 <span class="status-danger" v-else>未设置</span>
             </template>
         </el-table-column>
-        <el-table-column label="商品名称" prop="product_name" width="220">
+        <el-table-column label="商品信息" prop="product_name" width="220">
             <template #default="scope">
-                <span v-if="scope.row.product_name">{{ scope.row.product_name }}</span>
+                <div class="el-text" v-if="scope.row.product_name">
+                    {{ scope.row.product_name }}
+                    <div class="desc"><span>{{ scope.row.sku }}</span></div>
+                </div>
                 <span class="status-danger" v-else>未设置</span>
             </template>
         </el-table-column>

src/views/manage/order/refund/components/table.vue

@@ -46,9 +46,12 @@
                 <span class="status-danger" v-else>未设置</span>
             </template>
         </el-table-column>
-        <el-table-column label="商品名称" prop="product_name" width="220">
+        <el-table-column label="商品信息" prop="product_name" width="220">
             <template #default="scope">
-                <span v-if="scope.row.product_name">{{ scope.row.product_name }}</span>
+                <div class="el-text" v-if="scope.row.product_name">
+                    {{ scope.row.product_name }}
+                    <div class="desc"><span>{{ scope.row.sku }}</span></div>
+                </div>
                 <span class="status-danger" v-else>未设置</span>
             </template>
         </el-table-column>

src/views/manage/order/send/components/table.vue

@@ -46,9 +46,12 @@
                 <span class="status-danger" v-else>未设置</span>
             </template>
         </el-table-column>
-        <el-table-column label="商品名称" prop="product_name" width="220">
+        <el-table-column label="商品信息" prop="product_name" width="220">
             <template #default="scope">
-                <span v-if="scope.row.product_name">{{ scope.row.product_name }}</span>
+                <div class="el-text" v-if="scope.row.product_name">
+                    {{ scope.row.product_name }}
+                    <div class="desc"><span>{{ scope.row.sku }}</span></div>
+                </div>
                 <span class="status-danger" v-else>未设置</span>
             </template>
         </el-table-column>
@@ -85,7 +88,7 @@
             <template #default="scope">
                 <el-button-group>
                     <el-button text type="warning" size="small" @click="table_log(scope.row)">订单记录</el-button>
-                    <el-button text type="warning" size="small" @click="table_express(scope.row)" v-if="scope.row.express_status==0">呼叫快递</el-button>
+                    <el-button text type="warning" size="small" @click="table_express(scope.row)" v-if="scope.row.express_status==0 && scope.row.service_type==2">呼叫快递</el-button>
                     <el-button text type="warning" size="small" v-if="scope.row.express_status==1" @click="table_print(scope.row)">打印面单</el-button>
                     <el-button text type="success" size="small" @click="table_end(scope.row)" v-if="scope.row.express_status==1">手动核销</el-button>
                     <el-button text type="success" size="small" @click="table_passwd(scope.row)" v-if="scope.row.express_status==0 && scope.row.service_type==2">更新地址</el-button>

src/views/manage/refund/components/table.vue

@@ -46,9 +46,12 @@
                 <span class="status-danger" v-else>未设置</span>
             </template>
         </el-table-column>
-        <el-table-column label="商品名称" prop="product_name" width="220">
+        <el-table-column label="商品信息" prop="product_name" width="220">
             <template #default="scope">
-                <span v-if="scope.row.product_name">{{ scope.row.product_name }}</span>
+                <div class="el-text" v-if="scope.row.product_name">
+                    {{ scope.row.product_name }}
+                    <div class="desc"><span>{{ scope.row.sku }}</span></div>
+                </div>
                 <span class="status-danger" v-else>未设置</span>
             </template>
         </el-table-column>
@@ -83,28 +86,21 @@
         <el-table-column label="创建时间" prop="create_at" width="180"></el-table-column>
         <el-table-column label="操作" width="200" align="right" fixed="right">
             <template #default="scope">
-                <el-button-group>
-                    <el-button text type="warning" size="small" @click="table_log(scope.row)">订单记录</el-button>
-                    <el-button text type="warning" size="small" @click="table_express(scope.row)" v-if="scope.row.express_status==0">呼叫快递</el-button>
-                    <el-button text type="warning" size="small" v-if="scope.row.express_status==1" @click="table_print(scope.row)">打印面单</el-button>
-                    <el-button text type="success" size="small" @click="table_end(scope.row)" v-if="scope.row.express_status==1">手动核销</el-button>
-                    <el-button text type="success" size="small" @click="table_passwd(scope.row)" v-if="scope.row.express_status==0 && scope.row.service_type==2">更新地址</el-button>
+                <el-button-group v-if="scope.row.express_status == 4">
+                    <el-button text type="success" size="small" @click="table_send(scope.row)">通过</el-button>
+                    <el-button text type="warning" size="small" @click="table_pass(scope.row)">拒绝</el-button>
                 </el-button-group>
             </template>
         </el-table-column>
     </scTable>
-    <formMain ref="formMain" @success="handleSuccess"></formMain>
-    <addMain ref="addMain" @success="handleSuccess"></addMain>
     <logMain ref="logMain" @success="handleSuccess"></logMain>
 </template>
 
 <script>
-import formMain from './form';
-import addMain from "@/views/manage/components/send";
 import logMain from '@/views/manage/order/components/log'
 export default {
     components: {
-        formMain,addMain,logMain
+        logMain
     },
     data(){
         return {
@@ -114,48 +110,43 @@ export default {
             dataSelect:[],
             dataSelectFull:[],
             searchKey:{
-                ex_status:2
+                ex_status:5
             }
         }
     },
     methods: {
-        table_passwd(row){
-            return this.$message.success("暂未开放");
-            this.$nextTick(() => {
-                this.$refs.formMain.open("edit").setData(row)
-            })
-        },
-        table_end(data){
-            return this.$message.success("暂未开放");
-            this.$confirm(`核销后该笔订单即为完成，如客户需退款只能通过来客后台进行操作，当前后台不支持核销后退款操作，确定要执行吗？`, '提示', {
+        
+        table_pass(data){
+            this.$confirm(`拒绝申请后，该笔订单状态变为原来的服务中，如已开通短信通知能力则系统自动发送短信至用户`, '提示', {
                 type: 'warning'
             }).then(async () => {
                 var loading = this.$loading();
-                var resp = await this.$API.order.end.post({"order_id":data.order_id});
+                var resp = await this.$API.merOrder.refuse.post({"order_id":data.order_id});
                 loading.close();
-                if (resp.code !== 1) {
-                    return this.$message.error(resp.msg);
+                if (resp.code == 0) {
+                    return this.$message.error(resp.msg)
                 }
-                this.$message.success(resp.msg);
+                this.$message.success(resp.msg)
                 this.$refs.table.refresh()
             }).catch(() => {
 
             })
         },
-        table_express(data){
-            return this.$message.success("暂未开放");
-            this.$confirm(`呼叫快递成功后，可进入【待核销】栏目进行打印快递面单，如已接通云打印可忽略`, '提示', {
+        table_send(data){
+            this.$confirm(`通过审核后，系统将自动对该订单进行解锁，用户可在抖音团购订单中申请退款`, '提示', {
                 type: 'warning'
-            }).then(async ()=>{
+            }).then(async () => {
                 var loading = this.$loading();
-                var resp = await this.$API.merOrder.express.post({"id":data.id});
+                var resp = await this.$API.merOrder.agree.post({"order_id":data.order_id});
                 loading.close();
                 if (resp.code == 0) {
-                    return this.$message.warning(resp.msg);
+                    return this.$message.error(resp.msg)
                 }
-                this.$message.success(resp.msg);
+                this.$message.success(resp.msg)
                 this.$refs.table.refresh()
-            }).catch(()=>{})
+            }).catch(() => {
+
+            })
         },
         table_log(data){
             this.$nextTick(() => {

src/views/merchant/order/before/components/option.vue

@@ -10,6 +10,7 @@
                         <el-button type="primary" icon="sc-icon-download" @click="open">导出</el-button>
                     </template>
                 </sc-file-export>
+                <el-button type="danger" icon="el-icon-download" @click="table_download()">下载打印插件</el-button>
             </div>
         </div>
     </fieldset>
@@ -33,6 +34,9 @@ export default {
         }
     },
     methods: {
+        table_download(){
+            window.location.href="https://scp-tcdn.sf-express.com/scp/soft/SCPPrint_Win32NT_6.570CN.exe"
+        },
         table_export(){
             
         },

src/views/merchant/order/before/components/table.vue

@@ -46,9 +46,12 @@
                 <span class="status-danger" v-else>未设置</span>
             </template>
         </el-table-column>
-        <el-table-column label="商品名称" prop="product_name" width="220">
+        <el-table-column label="商品信息" prop="product_name" width="220">
             <template #default="scope">
-                <span v-if="scope.row.product_name">{{ scope.row.product_name }}</span>
+                <div class="el-text" v-if="scope.row.product_name">
+                    {{ scope.row.product_name }}
+                    <div class="desc"><span>{{ scope.row.sku }}</span></div>
+                </div>
                 <span class="status-danger" v-else>未设置</span>
             </template>
         </el-table-column>

src/views/merchant/order/before/index.vue

@@ -2,6 +2,7 @@
     <el-container class="flex-column">
         <div class="table-search">
             <search @success="handleSuccess"></search>
+            <el-alert type="warning" show-icon title="打印面单提醒" description="电脑中必须先安装打印插件,点击下方【下载打印插件】按钮下载插件安装文件（使用云打印商家可忽略）" :closable="false" style="margin-bottom: 10px;"></el-alert>
             <optionBtn @success="handleSuccess" :dataSelect="dataSelect" :dataSelectFull="dataSelectFull" type="3"></optionBtn>
         </div>
         <el-main class="nopadding">

src/views/merchant/order/done/components/table.vue

@@ -46,9 +46,12 @@
                 <span class="status-danger" v-else>未设置</span>
             </template>
         </el-table-column>
-        <el-table-column label="商品名称" prop="product_name" width="220">
+        <el-table-column label="商品信息" prop="product_name" width="220">
             <template #default="scope">
-                <span v-if="scope.row.product_name">{{ scope.row.product_name }}</span>
+                <div class="el-text" v-if="scope.row.product_name">
+                    {{ scope.row.product_name }}
+                    <div class="desc"><span>{{ scope.row.sku }}</span></div>
+                </div>
                 <span class="status-danger" v-else>未设置</span>
             </template>
         </el-table-column>

src/views/merchant/order/refund/components/table.vue

@@ -46,9 +46,12 @@
                 <span class="status-danger" v-else>未设置</span>
             </template>
         </el-table-column>
-        <el-table-column label="商品名称" prop="product_name" width="220">
+        <el-table-column label="商品信息" prop="product_name" width="220">
             <template #default="scope">
-                <span v-if="scope.row.product_name">{{ scope.row.product_name }}</span>
+                <div class="el-text" v-if="scope.row.product_name">
+                    {{ scope.row.product_name }}
+                    <div class="desc"><span>{{ scope.row.sku }}</span></div>
+                </div>
                 <span class="status-danger" v-else>未设置</span>
             </template>
         </el-table-column>

src/views/merchant/order/send/components/option.vue

@@ -10,7 +10,6 @@
                         <el-button type="primary" icon="sc-icon-download" @click="open">导出</el-button>
                     </template>
                 </sc-file-export>
-                <el-button type="danger" icon="el-icon-download" @click="table_download()">下载打印插件</el-button>
             </div>
         </div>
     </fieldset>
@@ -34,9 +33,6 @@ export default {
         }
     },
     methods: {
-        table_download(){
-            window.location.href="https://scp-tcdn.sf-express.com/scp/soft/SCPPrint_Win32NT_6.570CN.exe"
-        },
         table_export(){
             
         },

src/views/merchant/order/send/components/table.vue

@@ -46,9 +46,12 @@
                 <span class="status-danger" v-else>未设置</span>
             </template>
         </el-table-column>
-        <el-table-column label="商品名称" prop="product_name" width="220">
+        <el-table-column label="商品信息" prop="product_name" width="220">
             <template #default="scope">
-                <span v-if="scope.row.product_name">{{ scope.row.product_name }}</span>
+                <div class="el-text" v-if="scope.row.product_name">
+                    {{ scope.row.product_name }}
+                    <div class="desc"><span>{{ scope.row.sku }}</span></div>
+                </div>
                 <span class="status-danger" v-else>未设置</span>
             </template>
         </el-table-column>

src/views/merchant/order/send/index.vue

@@ -2,7 +2,7 @@
     <el-container class="flex-column">
         <div class="table-search">
             <search @success="handleSuccess"></search>
-            <el-alert type="warning" show-icon title="栏目提醒" description="1、已预约栏目的订单，用户如取消订单，无需商家同意，产品如已发货，请尽快修改订单状态到服务中，如造成经济损失，本核销系统不负法律责任（使用自动呼叫快递功能的商家忽略）；2、电脑中必须先安装打印插件,点击下方【下载打印插件】按钮下载插件安装文件（使用云打印商家可忽略）" :closable="false" style="margin-bottom: 10px;"></el-alert>
+            <el-alert type="warning" show-icon title="栏目提醒" description="已预约栏目的订单，用户如取消订单，无需商家同意，产品如已发货，请尽快修改订单状态到服务中，如造成经济损失，本核销系统不负法律责任（使用自动呼叫快递功能的商家忽略）" :closable="false" style="margin-bottom: 10px;"></el-alert>
             <optionBtn @success="handleSuccess" :dataSelect="dataSelect" :dataSelectFull="dataSelectFull" type="3"></optionBtn>
         </div>
         <el-main class="nopadding">

src/views/merchant/refund/components/table.vue

@@ -46,9 +46,12 @@
                 <span class="status-danger" v-else>未设置</span>
             </template>
         </el-table-column>
-        <el-table-column label="商品名称" prop="product_name" width="220">
+        <el-table-column label="商品信息" prop="product_name" width="220">
             <template #default="scope">
-                <span v-if="scope.row.product_name">{{ scope.row.product_name }}</span>
+                <div class="el-text" v-if="scope.row.product_name">
+                    {{ scope.row.product_name }}
+                    <div class="desc"><span>{{ scope.row.sku }}</span></div>
+                </div>
                 <span class="status-danger" v-else>未设置</span>
             </template>
         </el-table-column>

src/views/store/order/before/components/option.vue

@@ -10,6 +10,7 @@
                         <el-button type="primary" icon="sc-icon-download" @click="open">导出</el-button>
                     </template>
                 </sc-file-export>
+                <el-button type="danger" icon="el-icon-download" @click="table_download()">下载打印插件</el-button>
             </div>
         </div>
     </fieldset>
@@ -35,6 +36,9 @@ export default {
     methods: {
         table_export(){
             
+        },
+        table_download(){
+            window.location.href="https://scp-tcdn.sf-express.com/scp/soft/SCPPrint_Win32NT_6.570CN.exe"
         },
         async table_batch_status(status){
             if (this.dataSelect.length == 0) {

src/views/store/order/before/components/table.vue

@@ -46,9 +46,12 @@
                 <span class="status-danger" v-else>未设置</span>
             </template>
         </el-table-column>
-        <el-table-column label="商品名称" prop="product_name" width="220">
+        <el-table-column label="商品信息" prop="product_name" width="220">
             <template #default="scope">
-                <span v-if="scope.row.product_name">{{ scope.row.product_name }}</span>
+                <div class="el-text" v-if="scope.row.product_name">
+                    {{ scope.row.product_name }}
+                    <div class="desc"><span>{{ scope.row.sku }}</span></div>
+                </div>
                 <span class="status-danger" v-else>未设置</span>
             </template>
         </el-table-column>

src/views/store/order/before/index.vue

@@ -2,6 +2,7 @@
     <el-container class="flex-column">
         <div class="table-search">
             <search @success="handleSuccess"></search>
+            <el-alert type="warning" show-icon title="打印面单提醒" description="电脑中必须先安装打印插件,点击下方【下载打印插件】按钮下载插件安装文件（使用云打印商家可忽略）" :closable="false" style="margin-bottom: 10px;"></el-alert>
             <optionBtn @success="handleSuccess" :dataSelect="dataSelect" :dataSelectFull="dataSelectFull" type="3"></optionBtn>
         </div>
         <el-main class="nopadding">

src/views/store/order/done/components/table.vue

@@ -46,9 +46,12 @@
                 <span class="status-danger" v-else>未设置</span>
             </template>
         </el-table-column>
-        <el-table-column label="商品名称" prop="product_name" width="220">
+        <el-table-column label="商品信息" prop="product_name" width="220">
             <template #default="scope">
-                <span v-if="scope.row.product_name">{{ scope.row.product_name }}</span>
+                <div class="el-text" v-if="scope.row.product_name">
+                    {{ scope.row.product_name }}
+                    <div class="desc"><span>{{ scope.row.sku }}</span></div>
+                </div>
                 <span class="status-danger" v-else>未设置</span>
             </template>
         </el-table-column>

src/views/store/order/refund/components/table.vue

@@ -46,9 +46,12 @@
                 <span class="status-danger" v-else>未设置</span>
             </template>
         </el-table-column>
-        <el-table-column label="商品名称" prop="product_name" width="220">
+        <el-table-column label="商品信息" prop="product_name" width="220">
             <template #default="scope">
-                <span v-if="scope.row.product_name">{{ scope.row.product_name }}</span>
+                <div class="el-text" v-if="scope.row.product_name">
+                    {{ scope.row.product_name }}
+                    <div class="desc"><span>{{ scope.row.sku }}</span></div>
+                </div>
                 <span class="status-danger" v-else>未设置</span>
             </template>
         </el-table-column>

src/views/store/order/send/components/table.vue

@@ -46,9 +46,12 @@
                 <span class="status-danger" v-else>未设置</span>
             </template>
         </el-table-column>
-        <el-table-column label="商品名称" prop="product_name" width="220">
+        <el-table-column label="商品信息" prop="product_name" width="220">
             <template #default="scope">
-                <span v-if="scope.row.product_name">{{ scope.row.product_name }}</span>
+                <div class="el-text" v-if="scope.row.product_name">
+                    {{ scope.row.product_name }}
+                    <div class="desc"><span>{{ scope.row.sku }}</span></div>
+                </div>
                 <span class="status-danger" v-else>未设置</span>
             </template>
         </el-table-column>

src/views/store/refund/components/table.vue

@@ -46,9 +46,12 @@
                 <span class="status-danger" v-else>未设置</span>
             </template>
         </el-table-column>
-        <el-table-column label="商品名称" prop="product_name" width="220">
+        <el-table-column label="商品信息" prop="product_name" width="220">
             <template #default="scope">
-                <span v-if="scope.row.product_name">{{ scope.row.product_name }}</span>
+                <div class="el-text" v-if="scope.row.product_name">
+                    {{ scope.row.product_name }}
+                    <div class="desc"><span>{{ scope.row.sku }}</span></div>
+                </div>
                 <span class="status-danger" v-else>未设置</span>
             </template>
         </el-table-column>