Merge branch '修改维权订单' of https://gogs.zfire.top/zfire-front/zfire-newmall-admin into develop

src/layout/components/Navbar.vue

@@ -5,19 +5,11 @@
       <hamburger :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
       <div class="menu_module">
         <div class="menu_module_view">
-          <v-scroll-view
-            :x="true"
-            :y="false"
-            slidingBgClassName="slidingBgClassName"
-            slidingBlockClassName="slidingBlockClassName"
-          >
+          <v-scroll-view :x="true" :y="false" slidingBgClassName="slidingBgClassName"
+            slidingBlockClassName="slidingBlockClassName">
             <div class="menu_module_fj">
-              <div
-                v-for="(item, index) in routes"
-                :key="index"
-                :class="{ item: true, select: path === item.path }"
-                @click="path = item.path"
-              >
+              <div v-for="(item, index) in routes" :key="index" :class="{ item: true, select: path === item.path }"
+                @click="path = item.path">
                 {{ item.meta.title }}
               </div>
             </div>
@@ -34,13 +26,10 @@
             @select="handleSelect"
           ></el-autocomplete>
         </div> -->
-        <div
-          style="margin-right: 20px; cursor: pointer"
-          @click="
-            getList()
-            isShow = true
-          "
-        >
+        <div style="margin-right: 20px; cursor: pointer" @click="
+          getList()
+        isShow = true
+          ">
           <i class="el-icon-message-solid"></i>
           <el-badge :is-dot="isDot1 || isDot2"></el-badge>
         </div>
@@ -68,34 +57,21 @@
       </div>
     </div>
     <notice-bar />
-    <el-drawer
-      title="系统消息"
-      :visible.sync="isShow"
-      :append-to-body="true"
-      :with-header="false"
-      direction="rtl"
-      size="25%"
-    >
+    <el-drawer title="系统消息" :visible.sync="isShow" :append-to-body="true" :with-header="false" direction="rtl" size="25%">
       <div class="message">
         <div class="head">
           <div class="flex_asb">
             <el-radio-group size="small" v-model="messageType" @change="getList">
               <el-badge :is-dot="isDot1" class="item">
-                <el-radio-button :label="['WBI', 'WBK', 'CRE_ORDER', 'SEND_MALL', 'RP_MALL', 'CR_SALES']"
-                  >系统消息</el-radio-button
-                >
+                <el-radio-button
+                  :label="['WBI', 'WBK', 'CRE_ORDER', 'SEND_MALL', 'RP_MALL', 'CR_SALES']">系统消息</el-radio-button>
               </el-badge>
               <el-badge :is-dot="isDot2" class="item">
                 <el-radio-button :label="['NOTICE']">平台公告</el-radio-button>
               </el-badge>
             </el-radio-group>
-            <el-switch
-              v-model="isOpen"
-              @change="updateIsNotice"
-              inactive-text="消息弹窗"
-              active-color="#13ce66"
-              inactive-color="#ff4949"
-            >
+            <el-switch v-model="isOpen" @change="updateIsNotice" inactive-text="消息弹窗" active-color="#13ce66"
+              inactive-color="#ff4949">
             </el-switch>
           </div>
           <el-radio-group size="mini" v-model="dateType" @change="getList" style="margin: 10px 0">
@@ -122,17 +98,15 @@
           </div>
         </div>
         <el-card class="box-card" v-for="(item, index) in messageData" style="margin-top: 10px">
-          <div
-            @click="
-              isShow = false
-              toDetail(
-                item.adminNoticeType,
-                item.paidType,
-                item.adminNoticeType == 'NOTICE' ? item.noticeId : item.orderId,
-                item.id
-              )
-            "
-          >
+          <div @click="
+            isShow = false
+          toDetail(
+            item.adminNoticeType,
+            item.paidType,
+            item.adminNoticeType == 'NOTICE' ? item.noticeId : item.orderId,
+            item.id
+          )
+            ">
             <div v-if="item.adminNoticeType == 'NOTICE'">
               <div class="flex_asb item">
                 <div>
@@ -201,14 +175,8 @@
         </el-card>
         <el-empty v-if="messageData.length == 0" description="暂无数据"></el-empty>
         <div class="flex_ac bottom">
-          <el-pagination
-            @current-change="handleCurrentChange"
-            :current-page="currentPage"
-            :page-size="pageSize"
-            layout="prev, pager, next"
-            background
-            :total="listTotal"
-          ></el-pagination>
+          <el-pagination @current-change="handleCurrentChange" :current-page="currentPage" :page-size="pageSize"
+            layout="prev, pager, next" background :total="listTotal"></el-pagination>
         </div>
       </div>
     </el-drawer>
@@ -276,28 +244,22 @@ export default {
       if (this.dateType === '') {
         return ['', '']
       } else {
-        var date = new Date()
-        var base = Date.parse(date) // 转换为时间戳
-        var year = date.getFullYear() //获取当前年份
-        var mon = date.getMonth() + 1 //获取当前月份
-        var day = date.getDate() //获取当前日
+        var date = new Date();
+        var base = Date.parse(date); // 转换为时间戳
+        var year = date.getFullYear(); //获取当前年份
+        var mon = date.getMonth() + 1; //获取当前月份
+        var day = date.getDate(); //获取当前日
         var oneDay = 24 * 3600 * 1000
 
         var daytimeArr = []
-        var now = new Date(base - oneDay * this.dateType)
-        var myear = now.getFullYear()
-        var month = now.getMonth() + 1
+        var now = new Date((base - oneDay * this.dateType));
+        var myear = now.getFullYear();
+        var month = now.getMonth() + 1;
         var mday = now.getDate()
         if (this.dateType == 1) {
-          return [
-            `${myear}-${month > 9 ? month : '0' + month}-${mday > 9 ? mday : '0' + mday} 00:00:00`,
-            `${myear}-${month > 9 ? month : '0' + month}-${mday > 9 ? mday : '0' + mday} 23:59:59`
-          ]
+          return [`${myear}-${month > 9 ? month : '0' + month}-${mday > 9 ? mday : '0' + mday} 00:00:00`, `${myear}-${month > 9 ? month : '0' + month}-${mday > 9 ? mday : '0' + mday} 23:59:59`]
         } else {
-          return [
-            `${myear}-${month > 9 ? month : '0' + month}-${mday > 9 ? mday : '0' + mday} 00:00:00`,
-            `${year}-${mon > 9 ? mon : '0' + mon}-${day > 9 ? day : '0' + day} 23:59:59`
-          ]
+          return [`${myear}-${month > 9 ? month : '0' + month}-${mday > 9 ? mday : '0' + mday} 00:00:00`, `${year}-${mon > 9 ? mon : '0' + mon}-${day > 9 ? day : '0' + day} 23:59:59`]
         }
       }
     },
@@ -323,17 +285,8 @@ export default {
           WBK: 'applicationWithoutFee',
           CRE_ORDER: 'workOrderPool',
           SEND_MALL: 'order_detail',
-          RP_MALL: 'order_pr',
-          CR_SALES:
-            paidType == 'M'
-              ? 'auxiliarySalesOrder'
-              : paidType == 'P'
-              ? 'attachmentSalesOrder'
-              : paidType == 'YB'
-              ? 'orderSettleManag'
-              : paidType == 'MALL'
-              ? 'order_list'
-              : ''
+          RP_MALL: 'order_refund_detail',
+          CR_SALES: (paidType == 'M' ? 'auxiliarySalesOrder' : paidType == 'P' ? 'attachmentSalesOrder' : paidType == 'YB' ? 'orderSettleManag' : paidType == 'MALL' ? 'order_detail' : '')
         }
         return MAP[val]
       }
@@ -602,7 +555,7 @@ export default {
         params: {
           noticeIds: id
         }
-      }).then(res => {})
+      }).then(res => { })
     }
   }
 }
@@ -617,21 +570,26 @@ export default {
 ::v-deep .is-fixed {
   right: 10px !important;
 }
+
 ::v-deep .slidingBgClassName {
   background: rgba(0, 0, 0, 0.01) !important;
 }
+
 ::v-deep .slidingBlockClassName {
   background: rgba(0, 0, 0, 0.05) !important;
 }
+
 .flex_asb {
   display: flex;
   justify-content: space-between;
   align-items: center;
 }
+
 .flex_ac {
   display: flex;
   justify-content: center;
 }
+
 .message {
   padding: 20px;
   position: relative;
@@ -639,6 +597,7 @@ export default {
   padding-bottom: 60px;
   padding-top: 150px;
   box-sizing: border-box;
+
   .head {
     width: 25%;
     position: fixed;
@@ -647,6 +606,7 @@ export default {
     background: #ffffff;
     padding: 20px;
   }
+
   .bottom {
     width: 25%;
     position: fixed;
@@ -656,11 +616,13 @@ export default {
     padding: 10px 0;
   }
 }
+
 .box-card {
   .item {
     cursor: pointer;
     margin-bottom: 6px;
   }
+
   .read1 {
     color: #f5680e;
     background: #fff2da;
@@ -668,6 +630,7 @@ export default {
     border-radius: 4px;
     font-size: 14px;
   }
+
   .read2 {
     color: #42b983;
     background: #d7fdde;
@@ -676,6 +639,7 @@ export default {
     font-size: 14px;
   }
 }
+
 .navbar {
   width: 100%;
   height: 50px;
@@ -685,6 +649,7 @@ export default {
   display: flex;
   flex-direction: row;
   align-items: center;
+
   .hamburger-container {
     line-height: 46px;
     height: 100%;
@@ -698,22 +663,26 @@ export default {
       background: rgba(0, 0, 0, 0.025);
     }
   }
+
   .menu_module {
     height: 100%;
     flex: 1;
     position: relative;
+
     .menu_module_view {
       position: absolute;
       top: 0;
       left: 0;
       bottom: 0;
       right: 0;
+
       .menu_module_fj {
         height: 100%;
         width: fit-content;
         white-space: nowrap;
         box-sizing: border-box;
         padding: 0 10px;
+
         .item {
           display: inline-block;
           height: 100%;
@@ -722,16 +691,19 @@ export default {
           padding: 0 10px;
           cursor: pointer;
         }
+
         .select {
           border-bottom: 1px solid #000;
         }
       }
     }
   }
+
   .flex {
     display: flex;
     align-items: center;
   }
+
   .ellipsis {
     display: inline-block;
     width: (16px * 6);
@@ -739,11 +711,12 @@ export default {
     overflow: hidden;
     text-overflow: ellipsis;
   }
+
   .right-menu {
     height: 100%;
     line-height: 50px;
 
-    & > div {
+    &>div {
       float: left;
     }
 
@@ -788,8 +761,9 @@ export default {
         padding-top: 0;
         padding-bottom: 0;
       }
+
       .right-menu-item {
-        .notice-icon > i {
+        .notice-icon>i {
           font-size: 18px;
         }
 
@@ -801,6 +775,7 @@ export default {
     }
   }
 }
+
 ::v-deep .el-badge__content.is-fixed {
   z-index: 99;
 }

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

@@ -365,7 +365,7 @@
                               value-key="goodsMaterialSpecsName"
                               :disabled=" isEdit2 != scope.$index || formType == 2 || activeKey == 'REFUND_GOODS_DETAIL' "
                               placeholder="请选择" style="width: 100%;">
-                              <el-option v-for="(     item, ind     ) in      formData1.list     " :key=" ind "
+                              <el-option v-for="(      item, ind      ) in       formData1.list      " :key=" ind "
                                 :label=" item.goodsMaterialSpecsName " :value=" item ">
                               </el-option>
                             </el-select>
@@ -381,7 +381,7 @@
                               :disabled=" isEdit2 != scope.$index || formType == 2 || activeKey == 'REFUND_GOODS_DETAIL' "
                               placeholder="请选择" style="width: 100%;">
                               <el-option
-                                v-for="(     item, ind     ) in      [{ name: '内机', id: 'INSIDE' }, { name: '外机', id: 'OUT' }, { name: '配件', id: 'PARTS' }]     "
+                                v-for="(      item, ind      ) in       [{ name: '内机', id: 'INSIDE' }, { name: '外机', id: 'OUT' }, { name: '配件', id: 'PARTS' }]      "
                                 :key=" ind " :label=" item.name " :value=" item.id ">
                               </el-option>
                             </el-select>
@@ -408,7 +408,7 @@
   }
 " value-key="name" :disabled=" isEdit2 != scope.$index || formType == 2 || activeKey == 'REFUND_GOODS_DETAIL' "
                               placeholder="请选择" style="width: 100%;">
-                              <el-option v-for="(     item, ind     ) in      scope.row.materialList     " :key=" ind "
+                              <el-option v-for="(      item, ind      ) in       scope.row.materialList      " :key=" ind "
                                 :label=" item.name " :value=" item ">
                               </el-option>
                             </el-select>

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

@@ -219,7 +219,7 @@
 									<el-table-column prop="refundOutCodeQty" align="center" label="导入外机条码数量" width="140"></el-table-column>
 									<el-table-column prop="refundPartsCodeQty" align="center" label="导入配件条码数量" width="140"></el-table-column>
 									<el-table-column label="操作" align="center" width="140" fixed="right">
-										<template slot-scope="scope" v-if="formType != 2 && joinCode">
+										<template slot-scope="scope" v-if="joinCode">
 											<el-upload
 											  action='_'
 											  :show-file-list='false'
@@ -265,7 +265,7 @@
 									<el-table-column label="规格型号" align="center">
 										<template slot-scope="scope">
 											<el-form-item :prop="'list.' + scope.$index + '.specs'" :rules="[{ required: true, message: `请选择规格型号`, trigger: 'blur' }]">
-												<el-select v-model="scope.row.specs" @change="(e)=>{changeSpecs(e,scope.row)}" value-key="goodsMaterialSpecsName" :disabled="isEdit2 != scope.$index || formType == 2" placeholder="请选择" style="width: 100%;">
+												<el-select v-model="scope.row.specs" @change="(e)=>{changeSpecs(e,scope.row)}" value-key="goodsMaterialSpecsName" :disabled="isEdit2 != scope.$index" placeholder="请选择" style="width: 100%;">
 												    <el-option
 												      v-for="(item,ind) in formData1.list"
 												      :key="ind"
@@ -280,7 +280,7 @@
 										<template slot-scope="scope">
 											<el-form-item :prop="'list.' + scope.$index + '.goodsMaterialItemType'" :rules="[{ required: true, message: `请选择物料类型`, trigger: 'blur' }]">
 												<el-select v-model="scope.row.goodsMaterialItemType" @change="(e)=>{changeMaterial(e,scope.row)}" 
-													:disabled="isEdit2 != scope.$index || formType == 2" placeholder="请选择" style="width: 100%;">
+													:disabled="isEdit2 != scope.$index" placeholder="请选择" style="width: 100%;">
 												    <el-option
 												      v-for="(item,ind) in [{name: '内机',id: 'INSIDE'},{name: '外机',id: 'OUT'},{name: '配件',id: 'PARTS'}]"
 												      :key="ind"
@@ -304,7 +304,7 @@
 													scope.row.uniqueCode = e.uniqueCode
 													scope.row.goodsMaterialItemId = e.itemId
 													
-												}" value-key="name" :disabled="isEdit2 != scope.$index || formType == 2" placeholder="请选择" style="width: 100%;">
+												}" value-key="name" :disabled="isEdit2 != scope.$index" placeholder="请选择" style="width: 100%;">
 												    <el-option
 												      v-for="(item,ind) in scope.row.materialList"
 												      :key="ind"
@@ -325,19 +325,19 @@
 									<el-table-column prop="" align="center" label="条码" >
 										<template slot-scope="scope">
 											<el-form-item :prop="'list.' + scope.$index + '.materialCode'" :rules="[{ required: true, message: `请输入条码`, trigger: 'blur' }]">
-												<el-input type="text" v-model="scope.row.materialCode" :disabled="isEdit2 != scope.$index || formType == 2" placeholder="请输入"></el-input>
+												<el-input type="text" v-model="scope.row.materialCode" :disabled="isEdit2 != scope.$index" placeholder="请输入"></el-input>
 											</el-form-item>
 										</template>
 									</el-table-column>
 									<el-table-column prop="" align="center" label="数量">
 										<template slot-scope="scope">
 											<el-form-item :prop="'list.' + scope.$index + '.stockQty'" :rules="[{ required: true, message: `请输入数量`, trigger: 'blur' }]">
-												<el-input type="number" v-model="scope.row.stockQty" :disabled="isEdit2 != scope.$index || formType == 2 || scope.row.uniqueCode=='YES'" placeholder="请输入"></el-input>
+												<el-input type="number" v-model="scope.row.stockQty" :disabled="isEdit2 != scope.$index || scope.row.uniqueCode=='YES'" placeholder="请输入"></el-input>
 											</el-form-item>
 										</template>
 									</el-table-column>
 									<el-table-column label="操作" align="right" width="140" fixed="right">
-										<template slot-scope="scope" v-if="formType != 2">
+										<template slot-scope="scope">
 											<el-button size="mini" type="primary" v-if="scope.$index == isEdit2" @click="saveCode(scope.row)">保存</el-button>
 											<el-button size="mini" type="primary" v-if="scope.$index != isEdit2" @click="isEdit2 = scope.$index">编辑</el-button>
 											<el-popconfirm title="确定删除吗？" @confirm="delCode(scope.row.orderDetailCodeId,scope.$index)">