Merge branch 'dev-20210528' into 'release'

Dev 20210528,code review:bo.dang

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!263

src/components/shop/send-set-dialog.vue

@@ -65,7 +65,7 @@
     </div>
 </template>
 <script>
-  // import { openLoading, closeLoading } from "../../utils/utils";
+  import { openLoading, closeLoading } from "../../utils/utils";
   import ChangeInfo from "./change-info";
   import { checkMobile } from '@/utils/patients/checkValid';
   import { updateExpress } from "@/utils/shop";
@@ -167,12 +167,19 @@
               if (para.orderNo) {
                 para.id = para.orderNo;
               }
+              openLoading(this);
               updateExpress(para).then(res => {
+                closeLoading(this);
                 if (res.code == '000000') {
                   this.$message.success('操作成功')
                   this.$refs.sendSetForm.resetFields();
                   this.sendSetForm.remark = '';
-                  this.$emit('closeSendSet',{type: 2})
+                  // this.$emit('closeSendSet',{type: 2})
+                  let timeoutId = null
+                  timeoutId && clearTimeout(timeoutId)
+                  timeoutId = setTimeout(() => {
+                    this.close()
+                  }, 500)
                 }else {
                   this.$message.error(res.message);
                 }
@@ -183,6 +190,11 @@
         })
 
       },
+
+      close(){
+        this.$emit('closeSendSet',{type: 2})
+      },
+
       //修改买家收货信息
       changeInfo() {
         this.showChangeInfo = true;

src/views/goods/create-good.vue

@@ -812,6 +812,7 @@
         goodsId: 0, // 新增时传0，更新时必需>0
         goodsType: '',
         storeId: '',
+        commissionFlag: 2,
         // 不同类型服务的表单通用字段
         // 不同类型服务的表单通用字段
         // 不同类型服务的表单通用字段
@@ -842,10 +843,11 @@
     },
     created() {
       vm = this;
-      const { id, storeId, goodsType, inputType } = this.$route.query;
+      const { id, storeId, goodsType, inputType, commissionFlag} = this.$route.query;
       this.goodsType = goodsType;
       this.storeId = storeId;
       this.inputType = inputType || '';
+      this.commissionFlag = commissionFlag;
       // this.formData = originForm;
       // this.formData1 = originForm1;
       // this.formData2 = originForm2;
@@ -854,7 +856,7 @@
       this.rules2 = originRules2;
       // this.rules2.barCode = originRules.barCode;
 
-      this.jumPathThird = '/goods-manage?storeId='+storeId
+      this.jumPathThird = '/goods-manage?storeId=' + storeId +'&commissionFlag=' + this.commissionFlag;
       //this.jumPathThird = '/create-good?id=add&storeId=46'
       this.title = id == 'add' ? '新增商品' : '编辑商品';
       this.isEdit = id != 'add';
@@ -1295,6 +1297,7 @@
             path: '/goods-manage',
             query: {
               storeId: this.formData.storeId,
+              commissionFlag: this.commissionFlag
             }
           })
         })

src/views/goods/order-manage.vue

@@ -56,6 +56,7 @@
           <span>￥{{ scope.row.amount | toFixed2}}</span>
           </template>
         </el-table-column>
+        <el-table-column prop="prescriberName" label="创建人" min-width="100" align="center"></el-table-column>
         <el-table-column prop="receiver" label="买家" min-width="100" align="center"></el-table-column>
         <el-table-column prop="goodsQuantityList" label="数量" min-width="100" align="center">
           <template slot-scope="scope">
@@ -86,6 +87,7 @@
             <div>
               <!--<el-button @click="closeTrade(scope.row)" type="text" size="small">关闭交易</el-button>-->
               <!--<el-button @click="changePrice(scope.row)" type="text" size="small">修改价格</el-button>-->
+<!--              <el-button @click="sendGoods(scope.row)" type="text" size="small">发货</el-button>-->
               <el-button v-if="scope.row.storeType == 1 && scope.row.showStatus == 3 && scope.row.refundStatus == 0" @click="sendGoods(scope.row)" type="text" size="small">发货</el-button>
               <el-button v-if="scope.row.storeType == 2 && scope.row.showStatus == 3 && scope.row.refundStatus == 0" @click="distribute(scope.row)" type="text" size="small">配送</el-button>
               <el-button v-if="scope.row.storeType == 1 && (scope.row.showStatus == 1 || scope.row.showStatus == 2)" @click="viewLogistics(scope.row)" type="text" size="small">查看物流</el-button>
@@ -245,7 +247,7 @@
   </div>
 </template>
 <script>
-  // import { openLoading, closeLoading } from "../../utils/utils";
+  import { openLoading, closeLoading } from "../../utils/utils";
   import BreadCrumb from "@/components/breadcrumb.vue";
   import SendSetDialog from "@/components/shop/send-set-dialog";
   import { getOrdersExportUrl } from "@/utils/yqrange/yqrangeApi";
@@ -342,14 +344,19 @@
     },
     methods: {
       searchList(){
+        console.log("searchList搜索开始")
+        openLoading(this);
         queryOrderList(this.searchForm).then(res => {
+          closeLoading(this);
           if (res.code == '000000') {
+            console.log("searchList搜索结束")
             this.tableData = res.data.orderSingleDtoList;
             this.totalRows = res.data.totalNum;
           }
         })
       },
       resetForm() {
+        console.log("resetForm重置")
         this.activeName = 'all';
         this.searchForm = {
           showStatus: -1,
@@ -417,8 +424,10 @@
         this.sendSetForm = row;
       },
       closeSendSet(val) {
+        console.log("关闭，val.type:" + val.type);
         //保存操作
         if (val.type == 2) {
+          console.log("刷新列表resetForm");
           this.resetForm();//更新列表
         }
         this.sendGoodsDialog = false;