2021.3.10

.env.production

@@ -2,6 +2,6 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = '//api.admin.app.jiuweiyun.cn/api'
+#VUE_APP_BASE_API = '//api.admin.app.jiuweiyun.cn/api'
 
-#VUE_APP_BASE_API = '//api.appadmin.woaidakele.cn/api'
+VUE_APP_BASE_API = '//api.appadmin.woaidakele.cn/api'

src/pages/order/components/ChangeGoodList.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="修改订单商品" :visible.sync="show" width="80%" :show-close="false" :close-on-click-modal="false" :destroy-on-close="true">
+  <el-dialog title="修改订单商品" :visible.sync="show" width="80%" :show-close="false" :close-on-click-modal="false" append-to-body :destroy-on-close="true">
     <el-form label-width="80px" class="form">
       <el-form-item label="选择商品:">
         <el-select v-model="selelctedGoodId" placeholder="选择商品">

src/pages/order/examine2.vue

@@ -436,6 +436,7 @@
       :close-on-click-modal="false"
       width="520px"
       class="dialog_remark"
+      append-to-body
     >
       <el-input v-model="remark.order" type="textarea" class="textarea_h" maxlength="250" show-word-limit />
       <div class="dialog_btn_box">
@@ -450,6 +451,7 @@
       :show-close="false"
       :close-on-click-modal="false"
       class="dialog_receive"
+      append-to-body
     >
       <p class="title_1">待支付：{{ parseMoney(orderDetail && orderDetail.no_pay_money) }}</p>
       <div class="title_2">
@@ -491,6 +493,7 @@
       :show-close="false"
       :close-on-click-modal="false"
       class="dialog_spending"
+      append-to-body
     >
       <el-form ref="spendform" label-width="80px" :model="spendForm">
         <el-form-item label="物流日期" prop="track_time">
@@ -536,6 +539,7 @@
       :show-close="false"
       :close-on-click-modal="false"
       class="dialog_spending"
+      append-to-body
     >
       <el-form ref="spendform" label-width="80px" :model="spendForm" :rules="spendRules">
         <el-form-item label="物流日期" prop="track_time">
@@ -582,6 +586,7 @@
       :close-on-click-modal="false"
       class="dialog_remark dialog_void"
       width="520px"
+      append-to-body
     >
       <p>确认将订货单<span class="red">{{ orderDetail && orderDetail.order_num }}</span>作废 ？ 订单作废后状态不可回退 ，<span class="red">如有关联的出库单将一并作废，相应的库存将退回原有仓库。</span> 如确定作废,请填写作废原因 :</p>
       <el-form>
@@ -631,6 +636,7 @@
       :close-on-click-modal="false"
       class="dialog_remark dialog_back"
       width="520px"
+      append-to-body
     >
       <p>确认将订货单{{ orderDetail && orderDetail.order_num }}退回 ？ 如确定退回,请填写退回原因 :</p>
       <el-input v-model="remark.back" type="textarea" class="textarea_h" />
@@ -647,6 +653,7 @@
       :close-on-click-modal="false"
       class="dialog_remark dialog_outStock"
       width="520px"
+      append-to-body
     >
       <div class="goods">
         <p>商品种类: 1</p>
@@ -664,6 +671,7 @@
       :show-close="false"
       :close-on-click-modal="false"
       class="dialog_address"
+      append-to-body
     >
       <div slot="title" class="title">
         <span class="label">修改收货地址</span>
@@ -700,6 +708,7 @@
       :visible.sync="dialog.add_address"
       :show-close="false"
       :close-on-click-modal="false"
+      append-to-body
     >
       <el-form label-width="80px">
         <el-form-item label="收货人:">
@@ -728,6 +737,7 @@
       :show-close="false"
       :close-on-click-modal="false"
       class="dialog_address"
+      append-to-body
     >
       <div style="padding: 20px;padding-top: 0;">
         <el-input

src/pages/order/list.vue

@@ -47,17 +47,17 @@
         <el-button v-permit="0" :roles-permit="roles" type="primary" class="bg1" @click="machExamine(0)">订单审核</el-button>
         <el-button v-permit="1" :roles-permit="roles" type="primary" class="bg2" @click="machExamine(1)">财务审核</el-button>
         <el-button v-permit="2" :roles-permit="roles" type="primary" class="bg3" @click="machExamine(2)">发货审核</el-button>
+        <el-button v-permit="3" :roles-permit="roles" type="primary" @click="showMergeOrder">合并订单</el-button>
         <!-- <el-button v-permit="[0,1,2]" :roles-permit="roles" type="primary" icon="el-icon-download" @click="dialog.export_order = true">导出</el-button> -->
-        <el-button v-permit="2" :roles-permit="roles" type="primary" icon="el-icon-upload2" @click="dialog.import_wuliu = true">导入</el-button>
-        <el-button v-permit="2" :roles-permit="roles" type="primary" icon="el-icon-refresh" @click="dialog.import_wuliunew = true">物流更新</el-button>
+        <el-button v-permit="2" :roles-permit="roles" type="primary" icon="el-icon-upload2" @click="dialog.lead_order = true">导入</el-button>
+        <!-- <el-button v-permit="2" :roles-permit="roles" type="primary" icon="el-icon-refresh" @click="dialog.import_wuliunew = true">物流更新</el-button> -->
         <!-- <el-button v-permit="[0,1,2]" :roles-permit="roles" type="primary" :loading="downloadLoading" icon="el-icon-document" class="filter-item" @click="exportOrder">导出订单信息</el-button>
         <el-button v-permit="[0,1,2]" :roles-permit="roles" type="primary" :loading="downloadLoading" icon="el-icon-document" class="filter-item" @click="exporOrdertOrder">导出拆单信息</el-button> -->
         <!-- <el-button v-permit="2" :roles-permit="roles" type="primary" :loading="downloadLoading" icon="el-icon-document" class="filter-item" @click="exportTemp">物流模板</el-button>
         <el-button v-permit="2" :roles-permit="roles" type="primary" :loading="downloadLoading" icon="el-icon-document" class="filter-item">导入物流</el-button> -->
-        <el-button v-permit="3" :roles-permit="roles" type="primary" @click="showMergeOrder">合并订单</el-button>
         <!-- <el-button v-permit="[0,1,2]" :roles-permit="roles" type="primary" @click="exportOrder">导出订单数据</el-button>
         <el-button v-permit="[0,1,2]" :roles-permit="roles" type="primary" @click="exporOrdertOrder">导出拆单数据</el-button> -->
-        <el-button v-permit="[0,1,2]" :roles-permit="roles" type="primary" @click="dialog.export_order = true">导出</el-button>
+        <el-button v-permit="[0,1,2]" :roles-permit="roles" type="primary" icon="el-icon-download" @click="dialog.export_order = true">导出</el-button>
       </div>
     </div>
     <!-- 合并订单 -->
@@ -552,7 +552,7 @@
         <el-button type="primary" @click="addStoreOrder">确定</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="导入数据" :visible.sync="dialog.import_wuliu" :before-close="resetImport">
+    <el-dialog title="导入单号" :visible.sync="dialog.import_wuliu" :before-close="resetImport">
       <div class="upload-main" style="height:400px">
         <!-- <div class="upload-container">
           <el-button type="text" class="download" style="color: #606266; cursor: auto">导入类型</el-button>
@@ -586,7 +586,7 @@
       </div>
     </el-dialog>
     <!-- 更新物流 -->
-    <el-dialog title="更新物流" :visible.sync="dialog.import_wuliunew" :before-close="resetImportnew">
+    <el-dialog title="修改单号" :visible.sync="dialog.import_wuliunew" :before-close="resetImportnew">
       <div class="upload-main" style="height:400px">
         <div class="upload-container">
           <el-button type="text" class="download" @click="exportTempnew">物流模板</el-button>
@@ -613,18 +613,18 @@
     <el-dialog title="导出数据" :visible.sync="dialog.export_order" width="520px">
       <el-form label-width="120">
         <el-form-item label="导出类型">
-          <!-- <el-select v-model="dialog.export_order_type" style="width: 350px">
-            <el-option label="导出订单数据" value="0" />
-            <el-option label="导出拆单数据" value="1" />
-          </el-select> -->
           <el-button type="primary" @click="exportOrder">订单明细</el-button>
           <el-button type="primary" @click="exporOrdertOrder">拆单明细</el-button>
           <el-button type="primary" @click="exportMoney">订单金额</el-button>
         </el-form-item>
-        <!-- <el-form-item>
-          <el-button size="small" @click="dialog.export_order = false">取消</el-button>
-          <el-button size="small" type="primary" @click="toExportOrder">导出</el-button>
-        </el-form-item> -->
+      </el-form>
+    </el-dialog>
+    <el-dialog title="导入" :visible.sync="dialog.lead_order" width="520px">
+      <el-form label-width="120">
+        <el-form-item label="导入类型">
+          <el-button type="primary" @click="dialog.import_wuliu = true">导入单号</el-button>
+          <el-button type="primary" @click="dialog.import_wuliunew = true">修改单号</el-button>
+        </el-form-item>
       </el-form>
     </el-dialog>
     <el-dialog v-if="order_examine_dialog" title="订单详情" :visible.sync="order_examine_dialog" width="80%" top="50px">
@@ -787,6 +787,7 @@ export default {
       ],
       dialog: {
         spending: false,
+        lead_order: false,
         export: false,
         express: false,
         receive: false,
@@ -1240,6 +1241,7 @@ export default {
           // }
           this.getList()
           this.$message.success('上传成功')
+          this.dialog.lead_order = false
         })
         // this.$request(sendOrder(formdata), () => {
         //   this.getList()
@@ -1264,6 +1266,7 @@ export default {
         this.$request(UpdateExpress(formdata), () => {
           this.getList()
           this.$message.success('上传成功')
+          this.dialog.lead_order = false
         })
         this.resetImportnew()
         // this.$message.success('上传成功')
@@ -1515,8 +1518,8 @@ export default {
         this.$request(downList({ id: this.chooseList.map(e => e.id) }), (res) => {
           const exportData = res.list
           import('@/vendor/Export2Excel').then(excel => {
-            const header = ['序号', '下单时间', '所属政委', '下单人昵称', '下单人姓名', '订单状态', '支付状态', '数量合计', '订单总额', '已付金额', '所属', '收货人', '联系方式', '收货地址', '订单备注']
-            const exportK = ['index', 'updated_at', 'admin_name', 'nickname', 'realname', 'status', 'pay_status', 'total', 'money', 'pay_money', 'belong_user', 'username', 'mobile', 'address', 'remark']
+            const header = ['序号', '下单时间', '所属政委', '下单人昵称', '下单人姓名', '订单状态', '支付状态', '数量合计', '订单总额', '所属者姓名', '所属者手机号', '收货人', '联系方式', '收货地址', '订单备注']
+            const exportK = ['index', 'updated_at', 'admin_name', 'nickname', 'realname', 'status', 'pay_status', 'total', 'money', 'belong_realname', 'belong_mobile', 'username', 'mobile', 'address', 'remark']
             const exportV = exportData.map((item, i) => {
               const obj = {
                 index: i + 1,
@@ -1528,10 +1531,10 @@ export default {
                 pay_status: payStatus(item.pay_status).name,
                 total: item.total || '',
                 money: item.money || '',
-                pay_money: item.pay_money || '',
                 username: item.get_address.username || '',
                 mobile: +item.get_address.mobile,
-                belong_user: item.belong_user && item.belong_user.nickname + ',' + item.belong_user.mobile,
+                belong_realname: item.belong_user && item.belong_user.realname,
+                belong_mobile: item.belong_user && item.belong_user.mobile,
                 address: item.get_address.province + item.get_address.city + item.get_address.town + item.get_address.address,
                 remark: item.remark || ''
               }
@@ -1545,6 +1548,7 @@ export default {
               autoWidth: true,
               bookType: 'xlsx'
             })
+            this.dialog.export_order = false
           })
         })
       } else {
@@ -1593,8 +1597,8 @@ export default {
           const exportData = res.list
           // console.log(exportData)
               import('@/vendor/Export2Excel').then(excel => {
-                const header = ['序号', '下单时间', '所属政委', '下单人昵称', '下单人姓名', '订单状态', '支付状态', '数量合计', '订单总额', '已付金额', '所属', '收货人', '联系方式', '收货地址', '订单备注']
-                const exportK = ['index', 'updated_at', 'admin_name', 'nickname', 'realname', 'status', 'pay_status', 'total', 'money', 'pay_money', 'belong_user', 'username', 'mobile', 'address', 'remark']
+                const header = ['序号', '下单时间', '所属政委', '下单人昵称', '下单人姓名', '订单状态', '支付状态', '数量合计', '订单总额', '所属者姓名', '所属者手机号', '收货人', '联系方式', '收货地址', '订单备注']
+                const exportK = ['index', 'updated_at', 'admin_name', 'nickname', 'realname', 'status', 'pay_status', 'total', 'money', 'belong_realname', 'belong_mobile', 'username', 'mobile', 'address', 'remark']
                 // if(+this.collect == false) {
                 //     header.splice(12,1)
                 //     exportK.splice(12,1)
@@ -1610,10 +1614,10 @@ export default {
                     pay_status: payStatus(item.pay_status).name,
                     total: item.total || '',
                     money: item.money || '',
-                    pay_money: item.pay_money || '',
                     username: item.get_address.username || '',
                     mobile: +item.get_address.mobile,
-                    belong_user: item.belong_user && item.belong_user.nickname + ',' + item.belong_user.mobile,
+                    belong_realname: item.belong_user && item.belong_user.realname,
+                    belong_mobile: item.belong_user && item.belong_user.mobile,
                     address: item.get_address.province + item.get_address.city + item.get_address.town + item.get_address.address,
                     remark: item.remark || ''
                   }
@@ -1627,6 +1631,7 @@ export default {
                   autoWidth: true,
                   bookType: 'xlsx'
                 })
+                this.dialog.export_order = false
               })
         })
       }