Merge branch 'test' of 47.94.45.65:angelo/web-retail-admin into base-online

src/api/product.js

@@ -776,3 +776,20 @@ export function get_sort(params) {
     params
   })
 }
+
+export function resetInventoryUse(data) {
+  return request({
+    url: 'sale/manage/wares/resetInventoryUse',
+    method: 'post',
+    data
+  })
+}
+
+export function getOutOfStockProduct(params) {
+  return request({
+    url: 'sale/manage/wares/list-no-sale',
+    method: 'get',
+    params
+  })
+}
+

src/api/wholeNetwork/index.js

@@ -0,0 +1,8 @@
+import request from '@/utils/request'
+
+export function getSystemSourceList() {
+  return request({
+    url: '/system//pub/enums/product-source',
+    method: 'get'
+  })
+}

src/api/wholeNetwork/orderSync.js

@@ -0,0 +1,17 @@
+import request from '@/utils/request'
+
+export function getOrderSyncFailList(params) {
+  return request({
+    url: '/sale/manage/order-sync/list',
+    method: 'get',
+    params
+  })
+}
+
+export function updateOrderSyncStatus(data) {
+  return request({
+    url: '/sale/manage/order-sync/updateStatus',
+    method: 'post',
+    data
+  })
+}

src/api/wholeNetwork/productManage.js

@@ -0,0 +1,48 @@
+import request from '@/utils/request'
+
+export function getProductList(params) {
+  return request({
+    url: '/sale/manage/all-product/list',
+    method: 'get',
+    params
+  })
+}
+
+export function addProductInfo(params) {
+  return request({
+    url: '/sale/manage/all-product/save',
+    method: 'post',
+    data: params
+  })
+}
+
+export function updateProductInfo(params) {
+  return request({
+    url: '/sale/manage/all-product/update',
+    method: 'post',
+    data: params
+  })
+}
+
+export function deleteProduct(id) {
+  return request({
+    url: `/sale/manage/all-product/${id}`,
+    method: 'delete'
+  })
+}
+
+export function updateProductInventory(params) {
+  return request({
+    url: '/sale/manage/all-product/change-inventory',
+    method: 'post',
+    data: params
+  })
+}
+
+export function getProductDetailsList(params) {
+  return request({
+    url: '/sale/manage/all-product-detail/list',
+    method: 'get',
+    params
+  })
+}

src/components/Delivery/unhandeled.vue

@@ -41,6 +41,13 @@
             >订单抵扣</el-button
           > -->
         </div>
+        <el-alert
+          style="width: fit-content"
+          :closable="false"
+          title="默认显示【在售】商品订单，如需查询【预售】【缺货】商品，请使用【非在售商品】进行追加查询"
+          type="error"
+          show-icon
+        />
       </div>
       <el-table
         :data="tableData"
@@ -184,11 +191,7 @@
           prop="preSaleStatusVal"
           :label="'预售状态'"
         />
-        <el-table-column
+
-          align="center"
-          prop="originalOrderCode"
-          :label="'原单号'"
-        />
         <el-table-column
           min-width="100px"
           align="center"
@@ -801,12 +804,13 @@ export default {
           })
       } else if (index == 0) {
         this.$confirm('是否确定进行全部合单操作?').then((_) => {
+          const params = {
+            ...this.params,
+            pkWaresList: this.params.pkWaresList ? this.params.pkWaresList.split(',') : [],
+            mergeType: this.hdform.mergeType
+          }
           del
-            .deliverUnhandeldMerge(
+            .deliverUnhandeldMerge(params)
-              Object.assign({}, this.params, {
-                mergeType: this.hdform.mergeType
-              })
-            )
             .then((res) => {
               this.$message({
                 message: res.msg,

src/router/index.js

@@ -4084,6 +4084,28 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: '/whole-network',
+    name: 'WholeNetwork',
+    component: Layout,
+    meta: { title: '全网管理', icon: 'info', icon1: 'infoSel' },
+    children: [
+
+      {
+        path: 'productManageSummary',
+        name: 'WholeNetworkProductManageSummary',
+        component: () => import('@/views/wholeNetwork/productManage/summary'),
+        meta: { title: '全网产品统计' }
+      },
+      {
+        path: 'orderSyncFail',
+        name: 'WholeNetworkOrderSyncFail',
+        component: () => import('@/views/wholeNetwork/orderSyncFail/index'),
+        meta: { title: '同步失败订单' }
+      }
+
+    ]
+  },
   // {
   //   path: 'external-link',
   //   component: Layout,

src/views/configManage/advertisementBanner/index.vue

@@ -9,7 +9,7 @@
     <div class="thetopbox">
       <el-form ref="form" :model="queryParams" label-width="100px">
         <el-row>
-          <el-col :span="4"  style="margin-left: -30px">
+          <!-- <el-col :span="4" style="margin-left: -30px">
             <el-form-item :label="'位置'" prop="status">
               <el-select v-model="queryParams.sendType" clearable placeholder="">
                 <el-option
@@ -20,6 +20,21 @@
                 />
               </el-select>
             </el-form-item>
+          </el-col> -->
+          <el-col :span="4" style="margin-left: -30px">
+            <el-form-item
+              label="隶属体系"
+              prop="status"
+            >
+              <el-select v-model="queryParams.pkVertex" clearable placeholder="">
+                <el-option
+                  v-for="item in vertexList"
+                  :key="item.pkId"
+                  :label="item.vertexName"
+                  :value="item.pkId"
+                />
+              </el-select>
+            </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item :label="'发送时间'" prop="creationTime">
@@ -35,7 +50,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item :label="'生效日期'" prop="creationTime">
+            <el-form-item :label="'创建时间'" prop="creationTime">
               <el-date-picker
                 v-model="modifiedTime1"
                 value-format="yyyy-MM-dd"
@@ -49,7 +64,7 @@
           </el-col>
           <el-col :span="4">
             <div class="searchbox">
-              <el-button class="my_search" @click="research()" style="margin-left: 40px"> {{ '搜索' }}</el-button>
+              <el-button class="my_search" style="margin-left: 40px" @click="research()"> {{ '搜索' }}</el-button>
               <el-button class="my_reset" @click="reChongzhi"> {{ '重置' }}</el-button>
             </div>
           </el-col>
@@ -59,13 +74,13 @@
     <div class="main">
       <div class="maintop">
         <div class="mainbtn">
-          <el-button size="small" style="background-color: #48B2FD" class="thebtn1" @click="addRules">{{'添加'}}</el-button>
+          <el-button size="small" style="background-color: #48B2FD" class="thebtn1" @click="addRules">{{ '添加' }}</el-button>
         </div>
       </div>
       <div class="maintable">
         <el-table
-          :data="tableData"
           v-loading="loading"
+          :data="tableData"
           height="730px"
           style="width: 100%"
           :header-cell-style="{ background: '#EEEEEE' }"
@@ -75,25 +90,26 @@
         >
           <el-table-column type="selection" width="55" />
           <el-table-column align="center" prop="sort" :label="'排序'" />
-          <el-table-column align="center" prop="phone" :label="'图片'" >
+          <el-table-column align="center" prop="phone" :label="'图片'">
             <template slot-scope="scope">
-                <img :src="scope.row.picture" style="width: 44px;height: 44px;border-radius: 8px" />
+              <img :src="scope.row.picture" style="width: 44px;height: 44px;border-radius: 8px">
             </template>
           </el-table-column>
-          <el-table-column align="center" prop="positionVal" :label="'位置'" />
+          <!-- <el-table-column align="center" prop="positionVal" :label="'位置'" /> -->
+          <el-table-column align="center" prop="vertexName" label="隶属体系" />
           <el-table-column align="center" prop="link" :label="'链接'" />
           <el-table-column align="center" prop="creationTime" :label="'创建日期'" />
           <el-table-column align="center" prop="effectiveDate" :label="'生效日期'" />
           <el-table-column align="center" :label="'操作'" width="150">
             <template slot-scope="scope">
-              <el-button
+              <!-- <el-button
                 class="colors"
                 type="text"
                 style="color: #108EE9"
                 size="small"
                 @click.native.prevent="moveUp(scope.row)"
               >
-                {{'上移'}}
+                {{ '上移' }}
               </el-button>
               <el-button
                 class="colors"
@@ -102,7 +118,7 @@
                 style="color: #108EE9"
                 @click.native.prevent="moveDown(scope.row)"
               >
-                {{'下移'}}
+                {{ '下移' }}
               </el-button>
               <el-button
                 class="colors"
@@ -111,8 +127,8 @@
                 style="color: #009B58"
                 @click.native.prevent="updateTop(scope.row)"
               >
-                {{'置顶'}}
+                {{ '置顶' }}
-              </el-button>
+              </el-button> -->
               <el-button
                 class="colors"
                 type="text"
@@ -120,7 +136,7 @@
                 style="color: #FFAD41"
                 @click.native.prevent="updateShow(scope.row)"
               >
-                {{ '查看' }}
+                {{ '编辑' }}
               </el-button>
               <el-button
                 class="colors"
@@ -170,6 +186,16 @@
             :placeholder="'请输入'"
           />
         </el-form-item>
+        <el-form-item label="隶属体系" prop="pkVertex">
+          <el-select v-model="table.pkVertex" clearable placeholder="">
+            <el-option
+              v-for="item in vertexList"
+              :key="item.pkId"
+              :label="item.vertexName"
+              :value="item.pkId"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item :label="'生效日期'" prop="effectiveDate">
           <el-date-picker
             v-model="table.effectiveDate"
@@ -201,12 +227,21 @@
 
 <script>
 import topBar from '@/components/topBar'
-import { getbdmenuList, getPubenumsList } from '@/api/system'
+import { getPubenumsList } from '@/api/system'
 import { getgradeRanglist, getAwardsListChiose } from '@/api/level'
 import * as api from '@/api/sms.js'
 import { Message } from 'element-ui'
-import { deleteAgreement } from '@/api/configManage'
 import ImageUpload from '@/components/ImageUpload'
+import { getvertexValue } from '@/api/member'
+
+const initForm = {
+  position: 1,
+  picture: '',
+  sort: '',
+  effectiveDate: '',
+  link: '',
+  pkVertex: ''
+}
 export default {
   name: 'Qxpz',
   components: {
@@ -215,8 +250,8 @@ export default {
   },
   data() {
     return {
-      modifiedTime:[],
+      modifiedTime: [],
-      modifiedTime1:[],
+      modifiedTime1: [],
       title: '添加',
       forms: '',
       rules: {
@@ -236,7 +271,9 @@ export default {
           { required: true, message: '请输入链接', trigger: 'blur' }
         ]
       },
-      table: { position: '', picture: '', sort: '', effectiveDate: '', link: '' },
+      table: {
+        ...initForm
+      },
       ruleShow: false,
       moren: 'advertisementBanner',
       topList: [
@@ -260,20 +297,26 @@ export default {
       statusList: [{ 'name': '立即发送', 'id': '1' }, { 'name': '定时发送', 'id': '2' }],
       statusList1: [{ 'name': '未发送', 'id': '0' }, { 'name': '已发送', 'id': '1' }],
       menuOptions: [],
-      loading:false,
+      loading: false,
       tableData: [],
       total: 0,
       types: '',
       formId: '',
-      getPostionList: []
+      getPostionList: [],
+      vertexList: []
     }
   },
   created() {
     this.research()
     this.getPostion()
+    this.getvertexValue()
   },
   methods: {
-    // 置顶
+    getvertexValue() {
+      getvertexValue().then((res) => {
+        this.vertexList = res.data
+      })
+    },
     updateTop(item) {
       api.getPostion({ 'pkId': item.pkId }).then((res) => {
         if (res.code == '200') {
@@ -332,8 +375,7 @@ export default {
       api.getBannerDetails(item.pkId).then((res) => {
         if (res.code === 200) {
           this.ruleShow = true
-          this.table = { position: res.data.position, picture: res.data.picture,
+          this.table = res.data
-            sort: res.data.sort, effectiveDate: res.data.effectiveDate, link: res.data.link }
         } else {
           Message({
             message: res.msg,
@@ -381,7 +423,7 @@ export default {
                   type: 'success'
                 })
                 that.ruleShow = false
-                that.table = { position: '', picture: '', sort: '', effectiveDate: '', link: '' }
+                that.table = { ...initForm }
                 that.research()
               } else {
                 Message({
@@ -400,7 +442,7 @@ export default {
                   type: 'success'
                 })
                 that.ruleShow = false
-                that.table = { position: '', picture: '', sort: '', effectiveDate: '', link: '' }
+                that.table = { ...initForm }
                 that.research()
               } else {
                 Message({

src/views/information/realInfo/index.vue

@@ -36,7 +36,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item :label="'真实奖衔'" prop="pkAwards">
+            <el-form-item :label="'荣誉奖衔'" prop="pkAwards">
               <el-select
                 v-model="queryParams.pkAwards"
                 clearable
@@ -125,120 +125,69 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item :label="'详细地址'" prop="accountStatus">
+            <el-form-item :label="'性别'" prop="isMakerSpace">
-              <el-cascader
+              <el-select
-                v-model="address"
+                v-model="queryParams.sex"
-                class="area"
+                clearable
-                :options="areaData"
+                placeholder=""
-                :placeholder="'请选择省市区'"
+              >
-                :props="regionParams"
+                <el-option
-                @change="flChange"
+                  v-for="item in sexList"
-              />
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item class="lefts" prop="parMemberCode">
+            <el-form-item :label="'认证日期'" prop="code">
-              <el-input
+              <el-date-picker
-                v-model="queryParams.address"
+                v-model="queryParams.rzsj"
-                clearable
+                format="yyyy-MM-dd"
-                placeholder=""
+                type="datetimerange"
+                range-separator="——"
+                :start-placeholder="'开始日期'"
+                :end-placeholder="'结束日期'"
+                value-format="yyyy-MM-dd"
+                :unlink-panels="true"
+                @change="changeTime3"
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-collapse-transition>
           <div v-show="isActive">
-            <el-row>
+            <el-col :span="8">
-              <el-col :span="4">
+              <el-form-item :label="'创建日期'" prop="code">
-                <el-form-item :label="'性别'" prop="isMakerSpace">
+                <el-date-picker
-                  <el-select
+                  v-model="queryParams.cjsj"
-                    v-model="queryParams.sex"
+                  type="datetimerange"
-                    clearable
+                  range-separator="——"
-                    placeholder=""
+                  format="yyyy-MM-dd"
-                  >
+                  :start-placeholder="'开始日期'"
-                    <el-option
+                  :end-placeholder="'结束日期'"
-                      v-for="item in sexList"
+                  value-format="yyyy-MM-dd"
-                      :key="item.value"
+                  :unlink-panels="true"
-                      :label="item.label"
+                  @change="changeTime1"
-                      :value="item.value"
+                />
-                    />
+              </el-form-item>
-                  </el-select>
+            </el-col>
-                </el-form-item>
+            <el-col :span="8">
-              </el-col>
+              <el-form-item :label="'支付日期'" prop="code">
-              <el-col :span="4">
+                <el-date-picker
-                <el-form-item :label="'银行名称'" prop="isMakerSpace">
+                  v-model="queryParams.zfsj"
-                  <el-input
+                  type="datetimerange"
-                    v-model="queryParams.bankName"
+                  range-separator="——"
-                    clearable
+                  format="yyyy-MM-dd"
-                    placeholder=""
+                  :start-placeholder="'开始日期'"
-                  />
+                  :end-placeholder="'结束日期'"
-                </el-form-item>
+                  value-format="yyyy-MM-dd"
-              </el-col>
+                  :unlink-panels="true"
-              <el-col :span="4">
+                  @change="changeTime2"
-                <el-form-item :label="'支行名称'" prop="parMemberCode">
+                />
-                  <el-input
+              </el-form-item>
-                    v-model="queryParams.subBankName"
+            </el-col>
-                    clearable
-                    placeholder=""
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="4">
-                <el-form-item :label="'银行卡号'" prop="parMemberCode">
-                  <el-input
-                    v-model="queryParams.cardNumber"
-                    clearable
-                    placeholder=""
-                  />
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item :label="'认证日期'" prop="code">
-                  <el-date-picker
-                    v-model="queryParams.rzsj"
-                    format="yyyy-MM-dd"
-                    type="datetimerange"
-                    range-separator="——"
-                    :start-placeholder="'开始日期'"
-                    :end-placeholder="'结束日期'"
-                    value-format="yyyy-MM-dd"
-                    :unlink-panels="true"
-                    @change="changeTime3"
-                  />
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="8">
-                <el-form-item :label="'创建日期'" prop="code">
-                  <el-date-picker
-                    v-model="queryParams.cjsj"
-                    type="datetimerange"
-                    range-separator="——"
-                    format="yyyy-MM-dd"
-                    :start-placeholder="'开始日期'"
-                    :end-placeholder="'结束日期'"
-                    value-format="yyyy-MM-dd"
-                    :unlink-panels="true"
-                    @change="changeTime1"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item :label="'支付日期'" prop="code">
-                  <el-date-picker
-                    v-model="queryParams.zfsj"
-                    type="datetimerange"
-                    range-separator="——"
-                    format="yyyy-MM-dd"
-                    :start-placeholder="'开始日期'"
-                    :end-placeholder="'结束日期'"
-                    value-format="yyyy-MM-dd"
-                    :unlink-panels="true"
-                    @change="changeTime2"
-                  />
-                </el-form-item>
-              </el-col>
             </el-row>
           </div>
         </el-collapse-transition>
@@ -343,16 +292,9 @@
             width="180"
           />
           <el-table-column
-            v-if="menuList[3].checked==true&&allTxt.awardsVal"
+            v-if="allTxt.pkAwardsVal"
             align="center"
-            prop="awardsVal"
+            prop="pkAwardsVal"
-            :label="'真实奖衔'"
-            width="180"
-          />
-          <el-table-column
-            v-if="allTxt.pkMaxAwardsVal"
-            align="center"
-            prop="pkMaxAwardsVal"
             :label="'荣誉奖衔'"
             width="180"
           />
@@ -389,14 +331,14 @@
               <img :src="scope.row.idFront" style="width: 44px;height: 44px;border-radius: 4px">
             </template>
           </el-table-column>
-          <el-table-column v-if="menuList[9].checked==true&&allTxt.idBack" align="center" prop="idBack" :label="'证件(反面)'" width="200">
+          <el-table-column v-if="allTxt.idBack" align="center" prop="idBack" :label="'证件(反面)'" width="200">
             <template slot-scope="scope">
               <img :src="scope.row.idBack" style="width: 44px;height: 44px;border-radius: 4px">
             </template>
           </el-table-column>
           <el-table-column
             v-for="item in menuList"
-            v-if="item.checked && item.id != 0 && item.id < 19&allTxt[item.prop]"
+            v-if="item.checked && item.id != 0 && item.id < 19&&allTxt[item.prop]"
             :key="item.id"
             align="center"
             width="200"
@@ -451,7 +393,6 @@ import {
   getaccountStatus,
   getsalletStatus,
   getattestation,
-  getYesnouploadsList,
   getorderStatus,
   memberRealInfo
 } from '@/api/member'
@@ -497,12 +438,6 @@ export default {
           checked: true,
           prop: 'pkSettleGrade'
         },
-        {
-          id: 42,
-          text: '真实奖衔',
-          checked: true,
-          prop: 'pkAwards'
-        },
         {
           id: 33,
           text: '性别',
@@ -539,66 +474,13 @@ export default {
           checked: true,
           prop: 'idCardBack'
         },
-        {
-          id: 9,
-          text: '省',
-          checked: true,
-          prop: 'provinceName'
-        },
-        {
-          id: 10,
-          text: '市',
-          checked: true,
-          prop: 'cityName'
-        },
-        {
-          id: 11,
-          text: '区/县',
-          checked: true,
-          prop: 'countyName'
-        },
         {
           id: 12,
           text: '详细地址',
           checked: true,
           prop: 'address'
-        },
-        {
-          id: 13,
-          text: '银行名称',
-          checked: true,
-          prop: 'bankName'
-        },
-        {
-          id: 14,
-          text: '支行名称',
-          checked: true,
-          prop: 'subBankName'
-        },
-        {
-          id: 15,
-          text: '开户姓名',
-          checked: true,
-          prop: 'accountName'
-        },
-        {
-          id: 16,
-          text: '预留电话',
-          checked: true,
-          prop: 'reservedPhone'
-        },
-        {
-          id: 17,
-          text: '银行卡号',
-          checked: true,
-          prop: 'cardNumber'
-        },
-        {
-          id: 18,
-          text: '邮箱地址',
-          checked: true,
-          prop: 'email'
         }
+
       ],
       moren: 'RealInfo',
       topList: [
@@ -642,6 +524,7 @@ export default {
       tattestation: [], // 实名认证 是否认证
       yesnouploadsList: [], // 营业执照 是否上传
       orderStatusList: [], // 订单状态
+      agentGradeList: [], // 代理等级
       directPushNumber: '', // 修改直推次数
 
       sexList: [],
@@ -664,19 +547,6 @@ export default {
     this.getSexs()
     this.getCardTypes()
     this.getAllArea()
-    // this.getvertexValue();
-    // this.getmemberTeamList();
-    // this.getRegistration();
-    // this.getaccountStatus();
-    // this.getsalletStatus();
-    // this.getattestation();
-    // this.getYesnouploadsList();
-    // this.getorderStatus();
-    // 初始化表头
-    // this.checkLabels = JSON.parse(
-    //   JSON.stringify(Object.keys(this.tableData[0]))
-    // );
-    // this.colums = JSON.parse(JSON.stringify(Object.keys(this.tableData[0])));
   },
   mounted() {
     this.getUserRole()
@@ -705,16 +575,21 @@ export default {
       this.queryParams.pkCounty = value[2]
     },
     changeTime3(val) {
-      this.queryParams.startCertificationTime = val[0]
+      if (val) {
-      this.queryParams.endCertificationTime = val[1]
+        this.queryParams.startCertificationTime = val[0]
+        this.queryParams.endCertificationTime = val[1]
+      } else {
+        this.queryParams.startCertificationTime = null
+        this.queryParams.endCertificationTime = null
+      }
     },
     changeTime1(val) {
-      this.queryParams.startCreationTime = val[0]
+      this.queryParams.startCreationTime = val ? val[0] : null
-      this.queryParams.endCreationTime = val[1]
+      this.queryParams.endCreationTime = val ? val[1] : null
     },
     changeTime2(val) {
-      this.queryParams.startPayTime = val[0]
+      this.queryParams.startPayTime = val ? val[0] : null
-      this.queryParams.endPayTime = val[1]
+      this.queryParams.endPayTime = val ? val[1] : null
     },
     // 性别
     getSexs() {
@@ -772,12 +647,7 @@ export default {
         this.orderStatusList = res.data
       })
     },
-    // 营业执照-是否上传
+
-    getYesnouploadsList() {
-      getYesnouploadsList().then((res) => {
-        this.yesnouploadsList = res.data
-      })
-    },
     // 认证下拉选
     getattestation() {
       getattestation().then((res) => {

src/views/logistics/delivery/components/OutOfStockProductList.vue

@@ -0,0 +1,243 @@
+<template>
+  <el-dialog
+    title="选择非在售商品"
+    :visible.sync="dialogVisible"
+    :close-on-click-modal="false"
+    width="1000px"
+    top="50px"
+    center
+    class="out-of-stock-dialog"
+    :before-close="handleClose"
+  >
+    <div class="cpHeight">
+      <el-form ref="form" :model="queryParams" label-width="90px">
+        <el-row :gutter="20">
+          <el-col :span="8">
+            <el-form-item label="商品编号" prop="waresCode">
+              <el-input v-model="form.waresCode" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="商品名称" prop="waresName">
+              <el-input v-model="form.waresName" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="商品状态" prop="preSaleStatus">
+              <el-select
+                v-model="form.preSaleStatus"
+                clearable
+              >
+                <el-option
+                  v-for="item in presaleList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="2">
+            <el-button type="primary" @click="getDataList">搜索</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div style="margin-bottom: 10px">
+        <el-tag v-for="item in selection" :key="item.pkId" effect="plain" size="small" closable class="tag-item" type="info" @close="removeSelectedHandle(item)">
+          {{ item.waresName }} ({{ item.waresCode }})
+        </el-tag>
+      </div>
+      <el-table
+        ref="tableRef"
+        :data="dialogList"
+        style="width: 100%"
+        row-key="pkId"
+        :header-cell-style="{ background: '#EEEEEE' }"
+        :row-class-name="tableRowClassName"
+        @selection-change="selectionChangeHandle"
+      >
+        <el-table-column
+          type="selection"
+          :reserve-selection="true"
+          width="55"
+        />
+        <el-table-column align="center" prop="cover1" :label="'产品主图'">
+          <template slot-scope="scope">
+            <img style="width: 40px; height: 40px" :src="scope.row.cover1" alt="">
+          </template>
+        </el-table-column>
+        <el-table-column
+          align="center"
+          prop="waresName"
+          label="商品名称"
+        />
+        <el-table-column
+          align="center"
+          prop="waresCode"
+          label="商品编号"
+        />
+        <el-table-column
+          align="center"
+          prop="specialAreaVal"
+          label="所属专区"
+        />
+        <el-table-column
+          align="center"
+          prop="preSaleStatusVal"
+          label="预售状态"
+        />
+      </el-table>
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getDataList"
+      />
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="handleClose">{{ '取消' }}</el-button>
+      <el-button type="primary" @click="onSubmit('form')">{{
+        '确认'
+      }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import * as api from '@/api/product.js'
+export default {
+  name: 'OutOfStockProductList',
+  props: {
+    visible: {
+      type: Boolean,
+      default: false
+    },
+    selected: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      dialogList: [],
+      presaleList: [],
+      total: 0,
+      selection: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10
+      },
+      form: {
+        productName: '',
+        productCode: '',
+        preSaleStatus: ''
+      }
+    }
+  },
+  computed: {
+    dialogVisible: {
+      get() {
+        return this.visible
+      },
+      set(val) {
+        this.$emit('update:visible', val)
+      }
+    }
+  },
+  created() {
+    this.selection = [...this.selected]
+    this.getPreSaleStatus()
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    getPreSaleStatus() {
+      api.presale_status().then((res) => {
+        this.presaleList = res.data
+      })
+    },
+    removeSelectedHandle(product) {
+      const tempIdx = this.selection.findIndex((item) => item.pkId === product.pkId)
+      if (~tempIdx) {
+        this.$refs.tableRef.toggleRowSelection(this.selection[tempIdx], false)
+        this.selection.splice(tempIdx, 1)
+      }
+    },
+    getList() {
+      api.getOutOfStockProduct(this.queryParams).then(
+        (res) => {
+          res.rows.forEach((item) => {
+            item.quantity = 1
+            item.isGift = 0
+          })
+          this.dialogList = res.rows
+          this.total = res.total
+          this.updateTableSelection()
+        }
+      )
+    },
+    updateTableSelection() {
+      this.$nextTick(() => {
+        if (this.selection.length) {
+          this.selection.forEach((item) => {
+            const row = this.dialogList.find((row) => row.pkId === item.pkId)
+            if (row) {
+              this.$refs.tableRef.toggleRowSelection(row, true)
+              this.$refs.tableRef.doLayout()
+            }
+          })
+        }
+      })
+    },
+    handleClose() {
+      this.dialogVisible = false
+    },
+    getDataList() {
+      this.queryParams.pageNum = 1
+      api.getOutOfStockProduct({
+        ...this.queryParams,
+        ...this.form
+      }).then((res) => {
+        res.rows.forEach((item) => {
+          item.quantity = 1
+          item.isGift = 0
+        })
+
+        this.dialogList = res.rows
+        this.total = res.total
+        this.updateTableSelection()
+      })
+    },
+    selectionChangeHandle(rows) {
+      this.selection = rows
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (rowIndex % 2 == 1) {
+        return 'warning-row'
+      } else if (rowIndex % 2 == 0) {
+        return 'success-row'
+      }
+      return ''
+    },
+    onSubmit() {
+      this.$emit('submit', this.selection)
+      this.dialogVisible = false
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.cpHeight {
+  height: 500px;
+  overflow-y: auto;
+}
+.out-of-stock-dialog {
+  ::v-deep .el-dialog__body {
+    padding-bottom: 0 !important;
+  }
+}
+
+</style>

src/views/logistics/delivery/index.vue

@@ -6,7 +6,7 @@
       :moren="moren"
     />
     <div class="thetopbox">
-      <el-form ref="form" :model="queryParams" label-width="80px">
+      <el-form ref="form" :model="queryParams" label-width="90px">
         <template v-if="activeName == 0">
           <el-row :gutter="20">
             <el-col :span="4">
@@ -64,22 +64,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="20">
-            <el-col :span="4">
+
-              <el-form-item :label="'预售状态'" prop="preSaleStatus">
-                <el-select
-                  v-model="queryParams.preSaleStatus"
-                  clearable
-                  :placeholder="'请选择'"
-                >
-                  <el-option
-                    v-for="(item, index) in presaleStatusList"
-                    :key="index"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
             <el-col :span="4">
               <el-form-item :label="'发货方式'" prop="deliveryWay">
                 <el-select
@@ -282,7 +267,7 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item :label="$t('选择产品')" prop="productIdList">
+                  <el-form-item :label="$t('非在售商品')" prop="pkWaresList">
                     <el-input
                       v-model="productLists"
                       clearable
@@ -315,11 +300,6 @@
                     />
                   </el-form-item>
                 </el-col>
-                <el-col :span="4">
-                  <el-form-item :label="'原单号'" prop="code">
-                    <el-input
-                      v-model="queryParams.originalOrderCode"
-                    /> </el-form-item></el-col>
                 <el-col :span="8">
                   <el-form-item :label="'创建日期'" prop="code">
                     <el-date-picker
@@ -1205,74 +1185,14 @@
         <el-tab-pane v-if="menu3" name="2" :label="'立即发货'">
           <nowdelivery ref="nowdelivery" :params="queryParams" />
         </el-tab-pane>
-
       </el-tabs>
     </div>
-    <el-dialog
+    <OutOfStockProductList
-      :title="'添加'"
+      v-if="dialogVisible"
       :visible.sync="dialogVisible"
-      :close-on-click-modal="false"
+      :selected="selectedProductList"
-      width="45%"
+      @submit="handleSubmit"
-      center
+    />
-      :before-close="handleClose"
-    >
-      <div class="cpHeight">
-        <el-input
-          v-model="select.productName"
-          :placeholder="'请输入'"
-          prefix-icon="el-icon-search"
-          @keyup.enter.native="getDataList"
-        />
-        <div style="height: 10px" />
-        <el-table
-          ref="lessonTableRef"
-          :data="dialogList"
-          style="width: 100%"
-          :row-key="
-            (row) => {
-              return row.pkProduct;
-            }
-          "
-          :header-cell-style="{ background: '#EEEEEE' }"
-          :row-class-name="tableRowClassName"
-          @selection-change="dialogChange"
-        >
-          <el-table-column
-            type="selection"
-            :reserve-selection="true"
-            width="55"
-          />
-          <el-table-column align="center" prop="cover" :label="'产品主图'">
-            <template slot-scope="scope">
-              <img class="bgImg" :src="scope.row.cover" alt="">
-            </template>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            prop="productName"
-            :label="'产品名称'"
-          />
-          <el-table-column
-            align="center"
-            prop="productCode"
-            :label="'产品编号'"
-          />
-        </el-table>
-        <pagination
-          v-show="total > 0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getDataList"
-        />
-      </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="handleClose">{{ '取消' }}</el-button>
-        <el-button type="primary" @click="onSubmit('form')">{{
-          '确认'
-        }}</el-button>
-      </span>
-    </el-dialog>
   </div>
 </template>
 
@@ -1286,14 +1206,16 @@ import nowdelivery from '@/components/Delivery/nowdelivery.vue'
 import * as del from '@/api/delivery.js'
 import { getvertexValue } from '@/api/member'
 import { getRouters } from '@/api/settle'
-import { productList } from '@/api/product'
+import OutOfStockProductList from './components/OutOfStockProductList.vue'
+
 export default {
   name: 'Fhqd',
   components: {
     topBar,
     unhandeled,
     yihandeled,
-    nowdelivery
+    nowdelivery,
+    OutOfStockProductList
   },
   data() {
     return {
@@ -1309,7 +1231,7 @@ export default {
       dialogList: [],
       lsArr: [],
       tableData: [],
-      productLists: [],
+      productLists: '',
       systemAllList: [
         {
           label: '是',
@@ -1368,7 +1290,7 @@ export default {
         payTime: [],
         printTime: [], // 打印时间2
         deliverTime: [], // 发货时间2
-        productIdList: [],
+        pkWaresList: [],
         systemAll: 0
       },
       isActive: true,
@@ -1385,7 +1307,8 @@ export default {
       menu2: false,
       menu3: false,
       menu4: false,
-      vertexList: [] // 隶属体系
+      vertexList: [], // 隶属体系
+      selectedProductList: []
     }
   },
   created() {
@@ -1395,84 +1318,15 @@ export default {
   },
   methods: {
     clearProduct() {
-      this.tableData = []
+      this.selectedProductList = []
-      this.lsArr = []
+      this.queryParams.pkWaresList = []
-      this.queryParams.productIdList = []
+      this.productLists = ''
-      this.productLists = []
     },
     openDig() {
-      this.select = {}
-      productList(Object.assign({ isPutOn: 0 }, this.queryParams)).then(
-        (res) => {
-          res.rows.forEach((item) => {
-            item.quantity = 1
-            item.pkProduct = item.pkProduct
-            item.isGift = 0
-          })
-          this.dialogList = res.rows
-          this.total = res.total
-        }
-      )
       this.dialogVisible = true
+      this.select = {}
     },
-    handleClose() {
+
-      this.dialogVisible = false
-    },
-    getDataList() {
-      productList(
-        Object.assign({ isPutOn: 0 }, this.queryParams, this.select)
-      ).then((res) => {
-        res.rows.forEach((item) => {
-          item.quantity = 1
-          item.pkProduct = item.pkProduct
-          item.isGift = 0
-        })
-        this.dialogList = res.rows
-        this.total = res.total
-      })
-    },
-    dialogChange(val) {
-      this.lsArr = val
-    },
-    onSubmit() {
-      // this.tableData = []
-      this.lsArr.forEach((item) => {
-        this.tableData.push(item)
-      })
-      // this.tableData = this.clearArr(this.tableData)
-      this.dialogVisible = false
-      this.dialogList.forEach((row) => {
-        this.$refs.lessonTableRef.toggleRowSelection(row, false)
-      })
-      // 判断重复
-      const arr = this.tableData
-      let isTrue = false
-      for (var i = 0; i < arr.length; i++) {
-        // 首次遍历数组
-        for (var j = i + 1; j < arr.length; j++) {
-          // 再次遍历数组
-          if (arr[i].productCode == arr[j].productCode) {
-            if (arr[i].isGift == arr[j].isGift) {
-              isTrue = true
-            }
-          }
-        }
-      }
-      if (isTrue) {
-        this.$message.error('请勿选择重复的商品')
-        this.tableData = []
-        this.lsArr = []
-        this.queryParams.productIdList = []
-        this.productLists = []
-        return
-      }
-      this.queryParams.productIdList = []
-      this.productLists = []
-      this.tableData.forEach((item) => {
-        this.queryParams.productIdList.push(item.pkId)
-        this.productLists.push(item.productName)
-      })
-    },
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex % 2 == 1) {
         return 'warning-row'
@@ -1614,17 +1468,23 @@ export default {
     },
     // 重置
     reChongzhi() {
+      this.selectedProductList = []
       this.queryParams = {
         pageNum: 1,
         pageSize: 500,
         orderStatus: 1
       }
-      this.productLists = []
+      this.productLists = ''
       this.getSearch()
     },
     // 展开折叠
     changeActive() {
       this.isActive = !this.isActive
+    },
+    handleSubmit(products) {
+      this.selectedProductList = [...products]
+      this.queryParams.pkWaresList = products.map((item) => item.pkId).join(',')
+      this.productLists = products.map((item) => item.waresName).join(',')
     }
   }
 }

src/views/selfService/register/index.vue

@@ -6,180 +6,240 @@
 -->
 <template>
   <div class="page">
-    <el-dialog :title="'户籍变更'"
+    <el-dialog
-               :visible.sync="registerFlag"
+      :title="'户籍变更'"
-               width="40%"
+      :visible.sync="registerFlag"
-               class="showAll_dialog"
+      width="40%"
-               :close-on-click-modal="false"
+      class="showAll_dialog"
-               :before-close="closeTc"
+      :close-on-click-modal="false"
-               center>
+      :before-close="closeTc"
+      center
+    >
       <el-form class="padding-s">
-        <el-form-item class="label"
+        <el-form-item
-                      :label="'会员编号'"
+          class="label"
-                      label-width="140px">
+          :label="'会员编号'"
-          <el-input disabled="disabled"
+          label-width="140px"
-                    class="width-s"
+        >
-                    v-model="diaLog.memberName"
+          <el-input
-                    clearable />
+            v-model="diaLog.memberName"
+            disabled="disabled"
+            class="width-s"
+            clearable
+          />
         </el-form-item>
-        <el-form-item class="label"
+        <el-form-item
-                      :label="'联系方式'"
+          class="label"
-                      label-width="140px">
+          :label="'联系方式'"
-          <el-input disabled="disabled"
+          label-width="140px"
-                    class="width-s"
+        >
-                    v-model="diaLog.phone"
+          <el-input
-                    clearable />
+            v-model="diaLog.phone"
+            disabled="disabled"
+            class="width-s"
+            clearable
+          />
         </el-form-item>
-        <el-form-item class="label"
+        <el-form-item
-                      :label="'新会员姓名'"
+          class="label"
-                      label-width="140px">
+          :label="'新会员姓名'"
-          <el-input disabled="disabled"
+          label-width="140px"
-                    class="width-s"
+        >
-                    v-model="diaLog.changeMemberName"
+          <el-input
-                    clearable />
+            v-model="diaLog.changeMemberName"
+            disabled="disabled"
+            class="width-s"
+            clearable
+          />
         </el-form-item>
-        <el-form-item class="label"
+        <el-form-item
-                      :label="'新联系方式'"
+          class="label"
-                      label-width="140px">
+          :label="'新联系方式'"
-          <el-input disabled="disabled"
+          label-width="140px"
-                    class="width-s"
+        >
-                    v-model="diaLog.changePhone"
+          <el-input
-                    clearable />
+            v-model="diaLog.changePhone"
+            disabled="disabled"
+            class="width-s"
+            clearable
+          />
         </el-form-item>
-        <el-form-item class="label"
+        <el-form-item
-                      :label="'情况说明'"
+          class="label"
-                      label-width="140px">
+          :label="'情况说明'"
-          <el-input disabled="disabled"
+          label-width="140px"
-                    style="line-height: 30px"
+        >
-                    class="width-s heights"
+          <el-input
-                    v-model="diaLog.description"
+            v-model="diaLog.description"
-                    clearable />
+            disabled="disabled"
+            style="line-height: 30px"
+            class="width-s heights"
+            clearable
+          />
         </el-form-item>
-        <el-form-item class="label"
+        <el-form-item
-                      :label="'原会员证件图片'"
+          class="label"
-                      label-width="140px">
+          :label="'原会员证件图片'"
+          label-width="140px"
+        >
           <div style="display: flex;justify-content: space-between">
             <div class="id-cards">
               <!-- <img :src="diaLog.idFront" /> -->
-              <el-image 
+              <el-image
-    style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%"
-    :src="diaLog.idFront" 
+                :src="diaLog.idFront"
-    :preview-src-list="[diaLog.idFront]">
+                :preview-src-list="[diaLog.idFront]"
-  </el-image>
+              />
             </div>
             <div class="id-cards">
               <!-- <img :src="diaLog.idBack" /> -->
-              <el-image 
+              <el-image
-    style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%"
-    :src="diaLog.idBack" 
+                :src="diaLog.idBack"
-    :preview-src-list="[diaLog.idBack]">
+                :preview-src-list="[diaLog.idBack]"
-  </el-image>
+              />
             </div>
           </div>
         </el-form-item>
-        <el-form-item class="label"
+        <el-form-item
-                      :label="'新会员证件图片'"
+          class="label"
-                      label-width="140px">
+          :label="'新会员证件图片'"
+          label-width="140px"
+        >
           <div style="display: flex;justify-content: space-between">
             <div class="id-cards">
               <!-- <img :src="diaLog.changeIdFront" /> -->
-              <el-image 
+              <el-image
-    style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%"
-    :src="diaLog.changeIdFront" 
+                :src="diaLog.changeIdFront"
-    :preview-src-list="[diaLog.changeIdFront]">
+                :preview-src-list="[diaLog.changeIdFront]"
-  </el-image>
+              />
             </div>
             <div class="id-cards">
               <!-- <img :src="diaLog.changeIdBack" /> -->
-              <el-image 
+              <el-image
-    style="width: 100%; height: 100%"
+                style="width: 100%; height: 100%"
-    :src="diaLog.changeIdBack" 
+                :src="diaLog.changeIdBack"
-    :preview-src-list="[diaLog.changeIdBack]">
+                :preview-src-list="[diaLog.changeIdBack]"
-  </el-image>
+              />
             </div>
           </div>
         </el-form-item>
-        <el-form-item class="label"
+        <el-form-item
-                      :label="'业务扣费'+(isLocals())"
+          class="label"
-                      label-width="140px">
+          :label="'业务扣费'+(isLocals())"
-          <el-input disabled="disabled"
+          label-width="140px"
-                    class="width-s"
+        >
-                    v-model="diaLog.amount"
+          <el-input
-                    clearable />
+            v-model="diaLog.amount"
+            disabled="disabled"
+            class="width-s"
+            clearable
+          />
         </el-form-item>
-        <el-form-item class="label"
+        <el-form-item
-                      :label="'备注'"
+          class="label"
-                      label-width="140px">
+          :label="'备注'"
-          <el-input disabled="disabled"
+          label-width="140px"
-                    class="width-s"
+        >
-                    v-model="diaLog.remark"
+          <el-input
-                    clearable />
+            v-model="diaLog.remark"
+            disabled="disabled"
+            class="width-s"
+            clearable
+          />
         </el-form-item>
       </el-form>
-      <div class="return-s"
+      <div
-           @click="closeTc"> {{ '返回' }}</div>
+        class="return-s"
+        @click="closeTc"
+      > {{ '返回' }}</div>
     </el-dialog>
-    <topBar v-if="topList.length > 0"
+    <topBar
-            :top-list="topList"
+      v-if="topList.length > 0"
-            :moren="moren" />
+      :top-list="topList"
+      :moren="moren"
+    />
     <div class="main">
       <div class="form_all">
-        <el-form ref="select"
+        <el-form
-                 :model="select"
+          ref="select"
-                 label-width="120px">
+          :model="select"
+          label-width="120px"
+        >
           <el-row :gutter="40">
             <!-- 一层 -->
-            <el-col :span="4"
+            <el-col
-                    style="margin-left: -20px">
+              :span="4"
+              style="margin-left: -20px"
+            >
               <el-form-item :label="'会员编号'">
-                <el-input v-model="select.memberCode"
+                <el-input
-                          clearable />
+                  v-model="select.memberCode"
+                  clearable
+                />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'变更前联系方式'">
-                <el-input v-model="select.phone"
+                <el-input
-                          clearable />
+                  v-model="select.phone"
+                  clearable
+                />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'变更前会员姓名'">
-                <el-input v-model="select.memberName"
+                <el-input
-                          clearable />
+                  v-model="select.memberName"
+                  clearable
+                />
               </el-form-item>
             </el-col>
             <el-col :span="4">
               <el-form-item :label="'审核状态'">
-                <el-select v-model="select.approveStatus"
+                <el-select
-                           clearable
+                  v-model="select.approveStatus"
-                           :placeholder="'请选择'">
+                  clearable
-                  <el-option v-for="item in actStatus"
+                  :placeholder="'请选择'"
-                             :key="item.value"
+                >
-                             :label="item.label"
+                  <el-option
-                             :value="item.value" />
+                    v-for="item in actStatus"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item :label="'申请日期'">
-                <el-date-picker v-model="creationTime"
+                <el-date-picker
-                                value-format="yyyy-MM-dd"
+                  v-model="creationTime"
-                                type="datetimerange"
+                  value-format="yyyy-MM-dd"
-                                :range-separator="'至'"
+                  type="datetimerange"
-                                :start-placeholder="'开始日期'"
+                  :range-separator="'至'"
-                                :end-placeholder="'结束日期'"
+                  :start-placeholder="'开始日期'"
-                                @change="changeTime" />
+                  :end-placeholder="'结束日期'"
+                  @change="changeTime"
+                />
               </el-form-item>
             </el-col>
-            <el-col :span="4"
+            <el-col
-                    style="margin-left: 30px">
+              :span="4"
-              <el-button type="primary"
+              style="margin-left: 30px"
-                         size="small"
+            >
-                         class="my_search"
+              <el-button
-                         @click="getDataList"> {{ '搜索' }}</el-button>
+                type="primary"
-              <el-button size="small"
+                size="small"
-                         class="my_reset"
+                class="my_search"
-                         @click="reset"> {{ '重置' }}</el-button>
+                @click="getDataList"
+              > {{ '搜索' }}</el-button>
+              <el-button
+                size="small"
+                class="my_reset"
+                @click="reset"
+              > {{ '重置' }}</el-button>
             </el-col>
           </el-row>
         </el-form>
@@ -200,105 +260,113 @@
         <!--          >驳回</el-button>-->
         <!--        </div>-->
         <div class="maintable">
-          <el-table ref="multipleTable"
+          <el-table
-          v-loading="loading"
+            ref="multipleTable"
-                    :data="tableData"
+            v-loading="loading"
-                    style="width: 100%"
+            :data="tableData"
-                    height="77vh"
+            style="width: 100%"
-                    :header-cell-style="{ background: '#EEEEEE' }"
+            height="77vh"
-                    :row-class-name="tableRowClassName"
+            :header-cell-style="{ background: '#EEEEEE' }"
-                    @selection-change="handleSelectionChange">
+            :row-class-name="tableRowClassName"
-            <el-table-column type="selection"
+            @selection-change="handleSelectionChange"
-                             width="21" />
+          >
-            <el-table-column align="left"
+            <el-table-column
-                             prop="memberCode"
+              type="selection"
-                             :label="'会员编号'"
+              width="21"
-                             width="120" />
+            />
-            <el-table-column align="center"
+            <el-table-column
-                             prop="memberName"
+              align="left"
-                             :label="'变更前会员姓名'" />
+              prop="memberCode"
-            <el-table-column align="center"
+              :label="'会员编号'"
-                             prop="phone"
+              width="120"
-                             :label="'变更前联系方式'" />
+            />
-            <el-table-column align="center"
+            <el-table-column
-                             prop="changeMemberName"
+              align="center"
-                             :label="'变更后会员姓名'">
+              prop="memberName"
+              :label="'变更前会员姓名'"
+            />
+            <el-table-column
+              align="center"
+              prop="phone"
+              :label="'变更前联系方式'"
+            />
+            <el-table-column
+              align="center"
+              prop="changeMemberName"
+              :label="'变更后会员姓名'"
+            >
               <template slot-scope="scope">
-                <div style="color: #4391FD">{{scope.row.changeMemberName}}</div>
+                <div style="color: #4391FD">{{ scope.row.changeMemberName }}</div>
-              </template>
-            </el-table-column>
-            <el-table-column align="center"
-                             prop="changePhone"
-                             :label="'变更后联系方式'">
-              <template slot-scope="scope">
-                <div style="color: #4391FD">{{scope.row.changePhone}}</div>
               </template>
             </el-table-column>
             <el-table-column
-            align="center"
+              align="center"
-            prop="approveStatusVal"
+              prop="changePhone"
-            :end-placeholder="'审核状态'"
+              :label="'变更后联系方式'"
-            :label="'审核状态'"
+            >
-          >
-          <template slot-scope="scope">
-            <div v-if="scope.row.approveStatus == 3">
-              <el-popover placement="right"
-                          width="400"
-                          trigger="hover">
-                <div v-html="scope.row.rejectMsg"></div>
-                <div style="cursor: pointer;" slot="reference">{{ scope.row.approveStatusVal }}</div>
-              </el-popover>
-            </div>
-            <div v-else>{{ scope.row.approveStatusVal }}</div>
-          </template>
-      </el-table-column>
-            <el-table-column align="center"
-                             prop="amount"
-                             :label="'业务扣费'" />
-            <el-table-column align="center"
-                             prop="remark"
-                             :label="'备注'" />
-            <el-table-column align="center"
-                             prop="creationTime"
-                             :label="'申请日期'"
-                             width="200">
               <template slot-scope="scope">
-                <div>{{scope.row.approveTime || scope.row.creationTime}}</div>
+                <div style="color: #4391FD">{{ scope.row.changePhone }}</div>
               </template>
             </el-table-column>
-            <el-table-column align="center"
+            <el-table-column
-                             prop="time"
+              align="center"
-                             :label="'操作'"
+              prop="approveStatusVal"
-                             fixed="right">
+              :end-placeholder="'审核状态'"
+              :label="'审核状态'"
+            >
               <template slot-scope="scope">
-<div class="bttn">
+                <div v-if="scope.row.approveStatus == 3">
-                <el-button class="button-s"
+                  <el-popover
-                           type="text"
+                    placement="right"
-                           style="color: #E70DEC;"
+                    width="400"
-                           size="small"
+                    trigger="hover"
-                           v-hasButtons="['regiestSee']"
+                  >
-                           @click="check(scope.row.pkId,)">
+                    <div v-html="scope.row.rejectMsg" />
-                  {{ '查看' }}
+                    <div slot="reference" style="cursor: pointer;">{{ scope.row.approveStatusVal }}</div>
-                </el-button>
+                  </el-popover>
-                <el-button class="button-s"
+                </div>
-                           type="text"
+                <div v-else>{{ scope.row.approveStatusVal }}</div>
-                           style="color: #009B58;"
+              </template>
-                           size="small"
+            </el-table-column>
-                           v-hasButtons="['regiestYes']"
+            <el-table-column
-                           @click="agrees(scope.row)"
+              align="center"
-                           v-if="scope.row.approveStatus==0">
+              prop="amount"
-                  {{ '同意' }}
+              :label="'业务扣费'"
-                </el-button>
+            />
-                <el-button class="button-s"
+            <el-table-column
-                           type="text"
+              align="center"
-                           v-hasButtons="['regiestNo']"
+              prop="remark"
-                           size="small"
+              :label="'备注'"
-                           style="color: #C8161D"
+            />
-                           @click="reject_s(scope.row.pkId)"
+            <el-table-column
-                           v-if="scope.row.approveStatus==0">
+              align="center"
-                  {{ '驳回' }}
+              prop="creationTime"
-                </el-button>
+              :label="'申请日期'"
-              </div>
+              width="200"
+            >
+              <template slot-scope="scope">
+                <div>{{ scope.row.approveTime || scope.row.creationTime }}</div>
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              prop="time"
+              :label="'操作'"
+              fixed="right"
+            >
+              <template slot-scope="scope">
+                <div class="bttn">
+                  <el-button
+                    v-hasButtons="['regiestSee']"
+                    class="button-s"
+                    type="text"
+                    style="color: #E70DEC;"
+                    size="small"
+                    @click="check(scope.row.pkId,)"
+                  >
+                    {{ '查看' }}
+                  </el-button>
+                </div>
               </template>
             </el-table-column>
           </el-table>
@@ -306,28 +374,38 @@
       </div>
 
     </div>
-    <pagination v-show="total > 0"
+    <pagination
-                :total="total"
+      v-show="total > 0"
-                :page.sync="queryParams.pageNum"
+      :total="total"
-                :limit.sync="queryParams.pageSize"
+      :page.sync="queryParams.pageNum"
-                @pagination="getDataList" />
+      :limit.sync="queryParams.pageSize"
-    <el-dialog title="驳回意见"
+      @pagination="getDataList"
-               :visible.sync="isShow"
+    />
-               width="40%"
+    <el-dialog
-               center
+      title="驳回意见"
-               :close-on-click-modal="false"
+      :visible.sync="isShow"
-               :before-close="handleClose1">
+      width="40%"
+      center
+      :close-on-click-modal="false"
+      :before-close="handleClose1"
+    >
       <div>
-        <editor ref="sptwEditor"
+        <editor
-                v-model="relContent"
+          ref="sptwEditor"
-                :min-height="283"
+          v-model="relContent"
-                :upload-url="uploadImgUrl" />
+          :min-height="283"
+          :upload-url="uploadImgUrl"
+        />
       </div>
       <div class="button-s1">
-        <div class="submit"
+        <div
-             @click="handleClose1"> {{ '取消' }}</div>
+          class="submit"
-        <div class="submit colors"
+          @click="handleClose1"
-             @click="confirmSubmit"> {{ '确认' }}</div>
+        > {{ '取消' }}</div>
+        <div
+          class="submit colors"
+          @click="confirmSubmit"
+        > {{ '确认' }}</div>
       </div>
     </el-dialog>
   </div>
@@ -339,7 +417,7 @@ import * as api from '@/api/giftGoods.js'
 import {
   DomicileDetails,
   domicileReject,
-  getDomicileChangeList,
+  getDomicileChangeList
 } from '@/api/settle'
 import { getApproveStatus } from '@/api/financial'
 import { Message } from 'element-ui'
@@ -350,7 +428,7 @@ export default {
   name: 'Bzpz',
   components: {
     topBar,
-    Editor,
+    Editor
   },
   filters: {
     isAgree(val) {
@@ -359,7 +437,7 @@ export default {
       } else {
         return '禁止'
       }
-    },
+    }
   },
   data() {
     return {
@@ -374,29 +452,29 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 50,
+        pageSize: 50
       },
       addOrEdit: '',
       total: 0,
       dialogVisible: false,
       tableData: [],
-      loading:false,
+      loading: false,
       moren: 'Register',
       topList: [
         {
           name: '户籍变更',
-          path: 'Register',
+          path: 'Register'
-        },
+        }
       ],
       form: {
-        name: '',
+        name: ''
       },
       rules: {
         name: [
-          { required: true, message: '请输入规格类型', trigger: 'blur' },
+          { required: true, message: '请输入规格类型', trigger: 'blur' }
-        ],
+        ]
       },
-      actStatus: [],
+      actStatus: []
     }
   },
   mounted() {
@@ -427,7 +505,7 @@ export default {
       if (this.relContent.length == 0) {
         this.$message({
           message: '请输入驳回信息',
-          type: 'warning',
+          type: 'warning'
         })
         return false
       }
@@ -436,7 +514,7 @@ export default {
           if (res.code == 200) {
             this.$message({
               message: res.msg,
-              type: 'success',
+              type: 'success'
             })
             this.isShow = false
             this.relContent = ''
@@ -479,21 +557,21 @@ export default {
           this.$confirm('是否驳回该申请?', '警告', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
-            type: 'warning',
+            type: 'warning'
           }).then((_) => {
             domicileReject({
-              pkId: id || this.$refs.multipleTable.selection[0].pkId,
+              pkId: id || this.$refs.multipleTable.selection[0].pkId
             }).then((res) => {
               if (res.code == '200') {
                 Message({
                   message: res.msg,
-                  type: 'success',
+                  type: 'success'
                 })
                 this.getDataList()
               } else {
                 Message({
                   message: res.msg,
-                  type: 'error',
+                  type: 'error'
                 })
               }
             })
@@ -501,7 +579,7 @@ export default {
         } else if (this.$refs.multipleTable.selection[0].approveStatus == 3) {
           Message({
             message: '用户申请户籍变更已被驳回,请勿重复申请',
-            type: 'warning',
+            type: 'warning'
           })
         }
       }
@@ -514,7 +592,7 @@ export default {
         } else {
           Message({
             message: res.msg,
-            type: 'error',
+            type: 'error'
           })
         }
       })
@@ -530,15 +608,15 @@ export default {
             path: 'hjbgQc',
             query: {
               data: JSON.stringify([
-                item || this.$refs.multipleTable.selection[0],
+                item || this.$refs.multipleTable.selection[0]
               ]),
-              approvalBusiness: 132,
+              approvalBusiness: 132
-            },
+            }
           })
         } else if (this.$refs.multipleTable.selection[0].approveStatus == 3) {
           Message({
             message: '用户申请户籍变更已被驳回,请勿重复申请',
-            type: 'warning',
+            type: 'warning'
           })
         }
       }
@@ -548,8 +626,8 @@ export default {
         path: 'hjbgQc',
         query: {
           data: JSON.stringify([item]),
-          approvalBusiness: 132,
+          approvalBusiness: 132
-        },
+        }
       })
     },
     getData() {
@@ -581,9 +659,9 @@ export default {
         path: 'addGiftGoodsInfo',
         query: {
           pkId: id,
-          type: index,
+          type: index
           // functionType:this.select.functionType
-        },
+        }
       })
     },
     // 删除
@@ -591,7 +669,7 @@ export default {
       this.$confirm('确认删除?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning',
+        type: 'warning'
       }).then(() => {
         api.activityRemove(id).then((res) => {
           this.getDataList()
@@ -611,7 +689,7 @@ export default {
             if (res.code == 200) {
               this.$message({
                 message: res.msg,
-                type: 'success',
+                type: 'success'
               })
               this.dialogVisible = false
               // 充值数据
@@ -632,7 +710,7 @@ export default {
     },
     openDig() {
       this.$router.push({
-        path: 'addGiftGoodsInfo',
+        path: 'addGiftGoodsInfo'
       })
     },
     getDataList() {
@@ -644,11 +722,11 @@ export default {
       getDomicileChangeList(this.select).then((res) => {
         this.loading = false
         this.tableData = res.rows
-        const regex = new RegExp('<img', 'gi');
+        const regex = new RegExp('<img', 'gi')
-        this.tableData.forEach(item=>{
+        this.tableData.forEach(item => {
-         if(item.rejectMsg){
+          if (item.rejectMsg) {
-          item.rejectMsg= item.rejectMsg.replace(regex, `<img style="max-width: 200px;"`);
+            item.rejectMsg = item.rejectMsg.replace(regex, `<img style="max-width: 200px;"`)
-         }
+          }
         })
         this.total = res.total
       })
@@ -660,9 +738,9 @@ export default {
       this.$confirm('是否确认导出所有数据项?', '警告', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning',
+        type: 'warning'
       })
-        .then(function () {
+        .then(function() {
           return api.exportClassIfy(queryParams)
         })
         .then((response) => {
@@ -676,8 +754,8 @@ export default {
         return 'success-row'
       }
       return ''
-    },
+    }
-  },
+  }
 }
 </script>
 <style scoped lang="scss">

src/views/wholeNetwork/orderSyncFail/index.vue

@@ -0,0 +1,306 @@
+<template>
+  <div class="page">
+    <topBar
+      v-if="topList.length > 0"
+      :top-list="topList"
+      :moren="defaultSelected"
+    />
+    <div class="thetopbox">
+      <el-form label-width="100px">
+        <el-row>
+          <el-col :span="4">
+            <el-form-item label="订单号" prop="orderCode">
+              <el-input v-model="select.orderCode" clearable />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="4">
+            <el-form-item label="产品名称" prop="productName">
+              <el-input v-model="select.productName" clearable />
+            </el-form-item>
+          </el-col> -->
+
+          <el-col :span="8">
+            <el-form-item label="时间范围" prop="timeRange">
+              <el-date-picker
+                v-model="timeRange"
+                value-format="yyyy-MM-dd"
+                type="daterange"
+                clearable
+                :range-separator="'至'"
+                :start-placeholder="'开始日期'"
+                :end-placeholder="'结束日期'"
+                @change="timeRangeHandleChange"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="4">
+            <div class="searchbox">
+              <el-button
+                class="my_search"
+                @click="
+                  () => {
+                    getSearch();
+                    resetPageNum();
+                  }
+                "
+              >
+                {{ '搜索' }}</el-button>
+              <el-button class="my_reset" @click="resetHandle">
+                {{ '重置' }}</el-button>
+            </div>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <div class="main">
+      <div class="maintop" />
+      <div class="maintable">
+        <el-table
+          v-loading="loading"
+          :data="tableData"
+          height="700px"
+          style="width: 100%"
+          :header-cell-style="{ background: '#EEEEEE' }"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column
+            align="center"
+            prop="orderCode"
+            label="订单号"
+            width="180px"
+          />
+
+          <el-table-column
+            align="center"
+            prop="orderProductDetail"
+            label="产品明细列表"
+          >
+            <template slot-scope="scope">
+              <div v-for="item in scope.row.orderProductDetail" :key="item.pkId">
+                <span style="font-size: 12px;">仓储编号：{{ item.wmsCode }} </span>
+                <span style="margin-left: 8px; font-size: 12px;">变动数量：{{ item.changeNum }}</span>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="statusVal"
+            label="同步状态"
+            width="80px"
+          />
+
+          <el-table-column
+            align="center"
+            prop="creationTime"
+            label="创建时间"
+            width="170px"
+          />
+          <el-table-column
+            align="center"
+            prop="colsele"
+            label="操作"
+            width="100px"
+          >
+            <template slot-scope="scope">
+              <el-button
+                v-if="scope.row.status === 1"
+                v-hasButtons="['WholeNetworkOrderSyncFailUpdate']"
+                type="text"
+                size="small"
+                style="color: #48b2fd; padding: 0"
+                @click="handleProcessed(scope.row)"
+              >
+                手动处理
+              </el-button>
+
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getSearch"
+    />
+
+  </div>
+</template>
+
+<script>
+import { getOrderSyncFailList, updateOrderSyncStatus } from '@/api/wholeNetwork/orderSync'
+import topBar from '@/components/topBar'
+const initSearch = {
+  ordeCode: ''
+}
+export default {
+  name: 'WholeNetworkOrderSyncFail',
+  components: {
+    topBar
+  },
+  data() {
+    return {
+      defaultSelected: 'orderSyncFail',
+      topList: [
+        {
+          name: '同步失败订单',
+          path: 'orderSyncFail'
+        }
+      ],
+      tableData: [],
+      loading: false,
+      queryParams: {
+        pageNum: 1,
+        pageSize: 50
+      },
+      timeRange: [
+      ],
+      select: {
+        ...initSearch
+      },
+      total: 0,
+      multipleSelection: [],
+      updateDialogVisible: false,
+      isEdit: false,
+      productInfo: {
+        remark: ''
+      },
+      updateInventoryVisible: false,
+      inventoryInfo: {
+        inventory: ''
+      }
+    }
+  },
+  created() {
+    this.getSearch()
+  },
+  methods: {
+    handleProcessed({ pkId }) {
+      this.$confirm('是否确认手动处理该订单?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then((_) => {
+        updateOrderSyncStatus({ pkId, status: 0 }).then((res) => {
+          if (res.code === 200) {
+            this.$message.success('手动处理成功')
+            this.getSearch()
+          }
+        })
+      })
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    timeRangeHandleChange(timeRange) {
+      this.queryParams.startDate = timeRange?.[0] || null
+      this.queryParams.endDate = timeRange?.[1] || null
+    },
+    resetHandle() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 50
+      }
+      this.timeRange = []
+
+      this.select = {
+        ...initSearch
+
+      }
+      this.getSearch()
+    },
+    getSearch() {
+      this.loading = true
+      const params = {
+        ...this.queryParams,
+        ...this.select
+      }
+      getOrderSyncFailList(params).then((res) => {
+        this.loading = false
+        if (res.code === 200) {
+          this.tableData = res.rows
+          this.total = res.total
+        }
+      })
+    },
+    resetPageNum() {
+      this.queryParams.pageNum = 1
+    }
+  }
+}
+</script>
+
+      <style lang="scss" scoped>
+::v-deep .el-image-viewer__close {
+  right: 500px;
+}
+::v-deep .dizhi .el-cascader {
+  width: 100%;
+}
+::v-deep .el-range-editor.el-input__inner {
+  width: 100%;
+}
+::v-deep .el-table thead {
+  color: #000000;
+}
+::v-deep .el-table .warning-row {
+  background: #f9f9f9;
+}
+.page {
+  padding: 10px 20px;
+  background: #f9f9f9;
+  font-size: 14px;
+  .thetopbox {
+    padding: 15px 20px 15px 0;
+    background: #ffffff;
+    border-radius: 8px;
+    .searchbox {
+      display: flex;
+      align-items: center;
+      margin-left: 40px;
+    }
+    .searchtitle {
+      margin-right: 10px;
+    }
+    .searchbtn {
+      background: #08143f;
+      color: #ffffff;
+    }
+  }
+  .main {
+    //margin-top: 20px;
+    background: #f9f9f9;
+    //border-radius: 8px;
+    //box-shadow: 0px 2px 20px 0px rgba(238, 238, 238, 0.5);
+
+    .maintop {
+      display: flex;
+      // padding: 10px 0;
+      justify-content: space-between;
+      align-items: center;
+      .mainbtn {
+        .thebtn1 {
+          color: #ffffff;
+          background: #ffad41;
+          width: 68px;
+          height: 32px;
+        }
+        .thebtn2 {
+          color: #ffffff;
+          background: #009b58;
+          width: 68px;
+          height: 32px;
+        }
+        .thebtn3 {
+          color: #ffffff;
+          background: #c8161d;
+          width: 68px;
+          height: 32px;
+        }
+      }
+    }
+  }
+}
+</style>

src/views/wholeNetwork/productManage/summary.vue

@@ -0,0 +1,15 @@
+<template>
+  <div>
+    <el-empty description="开发中..." />
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'WholeNetworkProductManageSummary'
+}
+</script>
+
+<style>
+
+</style>