Merge branch 'master' of http://1.14.104.71:10880/root/ylrz_his_scrm_adminUI

package.json

@@ -55,6 +55,7 @@
     "build:prod-hsyy": "vue-cli-service build --mode prod-hsyy",
     "build:prod-jnsyj": "vue-cli-service build --mode prod-jnsyj",
     "build:prod-shdn": "vue-cli-service build --mode prod-shdn",
+    "build:prod-xcsw": "vue-cli-service build --mode prod-xcsw",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src"
   },

src/api/hisStore/storeOrder.js

@@ -395,3 +395,12 @@ export function auditStoreOrder(data) {
     data: data
   })
 }
+
+// 订单备注
+export function orderRemark(data) {
+  return request({
+    url: '/store/store/storeOrder/remark',
+    method: 'post',
+    data: data
+  })
+}

src/views/course/videoResource/index.vue

@@ -508,7 +508,21 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="150">
           <template slot-scope="scope">
-            <el-button size="mini" type="text" icon="el-icon-edit" @click="handleEditVideo(scope.row)">编辑</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              :disabled="scope.row.progress !== 100"
+              @click="handleEditVideo(scope.row)">
+              编辑
+              <el-tooltip
+                v-if="scope.row.progress !== 100"
+                content="上传完成后可编辑"
+                placement="top"
+              >
+                <i class="el-icon-question"></i>
+              </el-tooltip>
+            </el-button>
             <el-button
               size="mini"
               type="text"
@@ -1677,6 +1691,10 @@ export default {
     },
     /** 编辑视频信息 */
     handleEditVideo(row) {
+      if (row.progress !== 100) {
+        this.$message.warning('请等待上传完成后再编辑');
+        return;
+      }
       this.batchEditDialog.form = Object.assign({}, row)
       this.changeCateType(row.typeId)
       this.batchEditDialog.open = true
@@ -1945,7 +1963,7 @@ export default {
 
         // 检查上传结果
         const line1Success = line1Result.status === 'fulfilled' && line1Result.value.success;
-        const line2Success = line1Result.status === 'fulfilled' && line1Result.value.success;
+        const line2Success = line2Result.status === 'fulfilled' && line2Result.value.success;
 
         const index = this.videoList.findIndex(item => item.tempId === tempVideo.tempId);
         if (index !== -1) {

src/views/hisStore/storeOrder/index.vue

@@ -296,7 +296,7 @@
       <el-col :span="1.5">
             <el-button  plain type="info" icon="el-icon-upload2" size="mini" @click="handleImport" v-hasPermi="['store:storeOrder:importExpress']">导入银行回单</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="success"
           icon="el-icon-s-check"
@@ -306,7 +306,7 @@
           v-hasPermi="['store:storeOrder:batchAudit']"
         >确认审核
         </el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
             type="warning"
@@ -602,6 +602,18 @@
             @click="handleDetails(scope.row)"
             v-hasPermi="['store:storeOrder:query']"
           >查看</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleOrderAudit(scope.row)"
+            v-hasPermi="['store:storeOrder:batchAudit']"
+          >确认审核</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleOrderReamrk(scope.row)"
+            v-hasPermi="['store:storeOrder:remark']"
+          >订单备注</el-button>
           <!-- <el-button
             size="mini"
             type="text"
@@ -1028,6 +1040,24 @@
         >确认导出</el-button>
       </div>
     </el-dialog>
+    <!-- 订单备注 -->
+    <el-dialog :title="remark.title" v-if="remark.open"  :visible.sync="remark.open" width="800px" append-to-body>
+        <el-form :model="remarkForm" label-width="100px">
+          <el-input
+            type="textarea"
+            :autosize="{ minRows: 5, maxRows: 50}"
+            placeholder="备注"
+            v-model="remarkForm.orderRemark">
+          </el-input>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+        <el-button @click="cancelRemark">取 消</el-button>
+        <el-button
+          type="primary"
+          @click="confirmRemark"
+        >确认</el-button>
+      </div>
+    </el-dialog>
 
   </div>
 </template>
@@ -1046,7 +1076,7 @@ import {
   getOrderItemsNum,
   importDeliveryNoteExpressTemplate, exportStoreOrderDetails, exportStoreOrderItemsDetails,getErpAccount,
   queryErpPhone,
-  saveErpPhone,editErpPhone,batchCreateErpOrder,batchSetErpOrder,auditStoreOrder
+  saveErpPhone,editErpPhone,batchCreateErpOrder,batchSetErpOrder,auditStoreOrder,orderRemark
 } from '@/api/hisStore/storeOrder'
 import { getUserList } from "@/api/hisStore/user";
 import { getAddressList } from "@/api/hisStore/userAddress";
@@ -1075,6 +1105,16 @@ export default {
   },
   data() {
     return {
+
+      remark: {
+        title: '订单备注',
+        open:false
+      },
+      remarkForm: {
+        id: null,
+        orderRemark: null,
+      },
+
       orderStatus:null,
       productInfo:"",
       payPriceTotal:"0",
@@ -1400,6 +1440,25 @@ export default {
     this.getAppMallOptions();
   },
   methods: {
+    handleOrderReamrk(row){
+      this.remarkForm.id = row.id;
+      this.remark.open = true;
+    },
+    cancelRemark(){
+      this.remarkForm = {
+        id: null,
+        orderRemark: null,
+      }
+      this.remark.open = false;
+
+    },
+    confirmRemark(){
+      orderRemark(this.remarkForm).then(res => {
+        this.$message.success("备注成功");
+        this.remark.open = false;
+        this.getList();
+      })
+    },
     // 新增排序处理方法
     handleSortChange({ column, prop, order }) {
       console.log('排序变化:', { column, prop, order });
@@ -2329,17 +2388,19 @@ export default {
     },
 
     /** 订单确认审核 */
-    handleOrderAudit(){
-      if (this.ids.length === 0) {
-        this.$message.warning('请至少勾选一条订单进行审核');
-        return;
-      }
-      this.$confirm('是否确认审核选中的订单?', "提示", {
+    handleOrderAudit(row){
+      // if (this.ids.length === 0 && row) {
+      //   this.$message.warning('请至少勾选一条订单进行审核');
+      //   return;
+      // }
+      const ids = [row.id];
+      //const ids = row.id || this.ids;
+      this.$confirm('是否确认审核订单号：'+row.orderCode+'?', "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       }).then(() => {
-        return auditStoreOrder({ orderIds: this.ids, isAudit: 1 });
+        return auditStoreOrder({ orderIds: ids, isAudit: 1 });
       }).then((response) => {
         this.getList();
         this.msgSuccess(response.msg || "审核成功");

src/views/live/components/productAfterSalesOrder.vue

@@ -171,6 +171,7 @@
           <div>商品金额：￥{{ goodsTotal.toFixed(2) }}</div>
           <div>运费金额：￥{{ (order.payPostage || 0).toFixed(2) }}</div>
           <div>优惠券金额：￥{{ order.discountMoney }}</div>
+          <div>小计：￥{{(order.totalPrice-order.discountMoney).toFixed(2)}}</div>
         </div>
         <div style="margin-top: 20px">
           <span class="font-small">操作信息</span>

src/views/live/liveAfteraSales/index.vue

@@ -175,7 +175,8 @@
       <el-table-column label="支付单号" align="center" prop="payCode" />
       <el-table-column label="会员手机号" align="center" prop="userPhone" />
       <el-table-column label="产品名称" align="center" prop="productName" :show-overflow-tooltip="true" />
-      <el-table-column label="退款金额" align="center" prop="refundAmount" />
+<!--      <el-table-column label="退款金额" align="center" prop="refundAmount" />-->
+      <el-table-column label="退款金额" align="center" prop="payMoney" />
       <el-table-column label="退款类型" align="center" prop="refundType" >
         <template slot-scope="scope">
           <dict-tag :options="serviceTypeOptions" :value="scope.row.refundType"/>
@@ -480,18 +481,29 @@ export default {
     },
     /** 导出按钮操作 */
     handleExport() {
-      const queryParams = this.queryParams;
+      const params = { ...this.queryParams, deliverySn: this.queryParams.returnDeliverySn || this.queryParams.deliverySn };
+      if(!!params.hfOrderCode && params.hfOrderCode.indexOf("-") > -1){
+        let ss = params.hfOrderCode.split("-");
+        params.hfOrderCode = ss[1];
+      }
+      // 处理日期范围
+      if (this.dateRange && this.dateRange.length === 2) {
+        params.createTimeBegin = this.dateRange[0];
+        params.createTimeEnd = this.dateRange[1];
+      }
       this.$confirm('是否确认导出所有售后记录数据项?', "警告", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
           this.exportLoading = true;
-          return exportLiveAfterSales(queryParams);
+          return exportLiveAfterSales(params);
         }).then(response => {
           this.download(response.msg);
           this.exportLoading = false;
-        }).catch(() => {});
+        }).catch(() => {
+          this.exportLoading = false;
+        });
     },
     getTreeselect() {
       var param={companyId:this.companyId}

src/views/live/order/index.vue

@@ -733,7 +733,7 @@ export default {
         companyId: null,
         deptId: null,
         hfshh: null,
-        orderTypeFilter: null,
+        orderTypeFilter: 1,
         salesName: null,
         orderCodes: [],
         orderCode: null,