Pārlūkot izejas kodu

Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/admin into dev

wangfei 6 gadus atpakaļ
vecāks
revīzija
71a1726de8

+ 1
- 1
dist/index.html Parādīt failu

@@ -1 +1 @@
1
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><title>城的空间后台管理系统</title><link href=./static/css/app.3e4748c83fcfdc07f0dd9260d0edb217.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.992319e39e0ff64940a3.js></script><script type=text/javascript src=./static/js/app.00453897a47c6acb81ec.js></script></body></html>
1
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><link rel=stylesheet href=//at.alicdn.com/t/font_775069_dwqa9wy3lkh.css><title>城的空间后台管理系统</title><link href=./static/css/app.ca5c568553d422363d3de51590c1ce78.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.992319e39e0ff64940a3.js></script><script type=text/javascript src=./static/js/app.09d071b18239c91b0a7d.js></script></body></html>

+ 0
- 5
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map Parādīt failu

@@ -1,5 +0,0 @@
1
-<<<<<<< HEAD
2
-{"version":3,"sources":["webpack:///webpack/bootstrap 38c2fa8e54edeb855ede"],"names":["parentJsonpFunction","window","chunkIds","moreModules","executeModules","moduleId","chunkId","result","i","resolves","length","installedChunks","push","Object","prototype","hasOwnProperty","call","modules","shift","__webpack_require__","s","installedModules","2","exports","module","l","m","c","d","name","getter","o","defineProperty","configurable","enumerable","get","n","__esModule","object","property","p","oe","err","console","error"],"mappings":"aACA,IAAAA,EAAAC,OAAA,aACAA,OAAA,sBAAAC,EAAAC,EAAAC,GAIA,IADA,IAAAC,EAAAC,EAAAC,EAAAC,EAAA,EAAAC,KACQD,EAAAN,EAAAQ,OAAoBF,IAC5BF,EAAAJ,EAAAM,GACAG,EAAAL,IACAG,EAAAG,KAAAD,EAAAL,GAAA,IAEAK,EAAAL,GAAA,EAEA,IAAAD,KAAAF,EACAU,OAAAC,UAAAC,eAAAC,KAAAb,EAAAE,KACAY,EAAAZ,GAAAF,EAAAE,IAIA,IADAL,KAAAE,EAAAC,EAAAC,GACAK,EAAAC,QACAD,EAAAS,OAAAT,GAEA,GAAAL,EACA,IAAAI,EAAA,EAAYA,EAAAJ,EAAAM,OAA2BF,IACvCD,EAAAY,IAAAC,EAAAhB,EAAAI,IAGA,OAAAD,GAIA,IAAAc,KAGAV,GACAW,EAAA,GAIA,SAAAH,EAAAd,GAGA,GAAAgB,EAAAhB,GACA,OAAAgB,EAAAhB,GAAAkB,QAGA,IAAAC,EAAAH,EAAAhB,IACAG,EAAAH,EACAoB,GAAA,EACAF,YAUA,OANAN,EAAAZ,GAAAW,KAAAQ,EAAAD,QAAAC,IAAAD,QAAAJ,GAGAK,EAAAC,GAAA,EAGAD,EAAAD,QAKAJ,EAAAO,EAAAT,EAGAE,EAAAQ,EAAAN,EAGAF,EAAAS,EAAA,SAAAL,EAAAM,EAAAC,GACAX,EAAAY,EAAAR,EAAAM,IACAhB,OAAAmB,eAAAT,EAAAM,GACAI,cAAA,EACAC,YAAA,EACAC,IAAAL,KAMAX,EAAAiB,EAAA,SAAAZ,GACA,IAAAM,EAAAN,KAAAa,WACA,WAA2B,OAAAb,EAAA,SAC3B,WAAiC,OAAAA,GAEjC,OADAL,EAAAS,EAAAE,EAAA,IAAAA,GACAA,GAIAX,EAAAY,EAAA,SAAAO,EAAAC,GAAsD,OAAA1B,OAAAC,UAAAC,eAAAC,KAAAsB,EAAAC,IAGtDpB,EAAAqB,EAAA,KAGArB,EAAAsB,GAAA,SAAAC,GAA8D,MAApBC,QAAAC,MAAAF,GAAoBA","file":"static/js/manifest.3ad1d5771e9b13dbdad2.js","sourcesContent":[" \t// install a JSONP callback for chunk loading\n \tvar parentJsonpFunction = window[\"webpackJsonp\"];\n \twindow[\"webpackJsonp\"] = function webpackJsonpCallback(chunkIds, moreModules, executeModules) {\n \t\t// add \"moreModules\" to the modules object,\n \t\t// then flag all \"chunkIds\" as loaded and fire callback\n \t\tvar moduleId, chunkId, i = 0, resolves = [], result;\n \t\tfor(;i < chunkIds.length; i++) {\n \t\t\tchunkId = chunkIds[i];\n \t\t\tif(installedChunks[chunkId]) {\n \t\t\t\tresolves.push(installedChunks[chunkId][0]);\n \t\t\t}\n \t\t\tinstalledChunks[chunkId] = 0;\n \t\t}\n \t\tfor(moduleId in moreModules) {\n \t\t\tif(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {\n \t\t\t\tmodules[moduleId] = moreModules[moduleId];\n \t\t\t}\n \t\t}\n \t\tif(parentJsonpFunction) parentJsonpFunction(chunkIds, moreModules, executeModules);\n \t\twhile(resolves.length) {\n \t\t\tresolves.shift()();\n \t\t}\n \t\tif(executeModules) {\n \t\t\tfor(i=0; i < executeModules.length; i++) {\n \t\t\t\tresult = __webpack_require__(__webpack_require__.s = executeModules[i]);\n \t\t\t}\n \t\t}\n \t\treturn result;\n \t};\n\n \t// The module cache\n \tvar installedModules = {};\n\n \t// objects to store loaded and loading chunks\n \tvar installedChunks = {\n \t\t2: 0\n \t};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"./\";\n\n \t// on error function for async loading\n \t__webpack_require__.oe = function(err) { console.error(err); throw err; };\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 38c2fa8e54edeb855ede"],"sourceRoot":""}
3
-=======
4
-{"version":3,"sources":["webpack:///webpack/bootstrap 6bfa9d07d14e3f431ca6"],"names":["parentJsonpFunction","window","chunkIds","moreModules","executeModules","moduleId","chunkId","result","i","resolves","length","installedChunks","push","Object","prototype","hasOwnProperty","call","modules","shift","__webpack_require__","s","installedModules","2","exports","module","l","m","c","d","name","getter","o","defineProperty","configurable","enumerable","get","n","__esModule","object","property","p","oe","err","console","error"],"mappings":"aACA,IAAAA,EAAAC,OAAA,aACAA,OAAA,sBAAAC,EAAAC,EAAAC,GAIA,IADA,IAAAC,EAAAC,EAAAC,EAAAC,EAAA,EAAAC,KACQD,EAAAN,EAAAQ,OAAoBF,IAC5BF,EAAAJ,EAAAM,GACAG,EAAAL,IACAG,EAAAG,KAAAD,EAAAL,GAAA,IAEAK,EAAAL,GAAA,EAEA,IAAAD,KAAAF,EACAU,OAAAC,UAAAC,eAAAC,KAAAb,EAAAE,KACAY,EAAAZ,GAAAF,EAAAE,IAIA,IADAL,KAAAE,EAAAC,EAAAC,GACAK,EAAAC,QACAD,EAAAS,OAAAT,GAEA,GAAAL,EACA,IAAAI,EAAA,EAAYA,EAAAJ,EAAAM,OAA2BF,IACvCD,EAAAY,IAAAC,EAAAhB,EAAAI,IAGA,OAAAD,GAIA,IAAAc,KAGAV,GACAW,EAAA,GAIA,SAAAH,EAAAd,GAGA,GAAAgB,EAAAhB,GACA,OAAAgB,EAAAhB,GAAAkB,QAGA,IAAAC,EAAAH,EAAAhB,IACAG,EAAAH,EACAoB,GAAA,EACAF,YAUA,OANAN,EAAAZ,GAAAW,KAAAQ,EAAAD,QAAAC,IAAAD,QAAAJ,GAGAK,EAAAC,GAAA,EAGAD,EAAAD,QAKAJ,EAAAO,EAAAT,EAGAE,EAAAQ,EAAAN,EAGAF,EAAAS,EAAA,SAAAL,EAAAM,EAAAC,GACAX,EAAAY,EAAAR,EAAAM,IACAhB,OAAAmB,eAAAT,EAAAM,GACAI,cAAA,EACAC,YAAA,EACAC,IAAAL,KAMAX,EAAAiB,EAAA,SAAAZ,GACA,IAAAM,EAAAN,KAAAa,WACA,WAA2B,OAAAb,EAAA,SAC3B,WAAiC,OAAAA,GAEjC,OADAL,EAAAS,EAAAE,EAAA,IAAAA,GACAA,GAIAX,EAAAY,EAAA,SAAAO,EAAAC,GAAsD,OAAA1B,OAAAC,UAAAC,eAAAC,KAAAsB,EAAAC,IAGtDpB,EAAAqB,EAAA,KAGArB,EAAAsB,GAAA,SAAAC,GAA8D,MAApBC,QAAAC,MAAAF,GAAoBA","file":"static/js/manifest.3ad1d5771e9b13dbdad2.js","sourcesContent":[" \t// install a JSONP callback for chunk loading\n \tvar parentJsonpFunction = window[\"webpackJsonp\"];\n \twindow[\"webpackJsonp\"] = function webpackJsonpCallback(chunkIds, moreModules, executeModules) {\n \t\t// add \"moreModules\" to the modules object,\n \t\t// then flag all \"chunkIds\" as loaded and fire callback\n \t\tvar moduleId, chunkId, i = 0, resolves = [], result;\n \t\tfor(;i < chunkIds.length; i++) {\n \t\t\tchunkId = chunkIds[i];\n \t\t\tif(installedChunks[chunkId]) {\n \t\t\t\tresolves.push(installedChunks[chunkId][0]);\n \t\t\t}\n \t\t\tinstalledChunks[chunkId] = 0;\n \t\t}\n \t\tfor(moduleId in moreModules) {\n \t\t\tif(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {\n \t\t\t\tmodules[moduleId] = moreModules[moduleId];\n \t\t\t}\n \t\t}\n \t\tif(parentJsonpFunction) parentJsonpFunction(chunkIds, moreModules, executeModules);\n \t\twhile(resolves.length) {\n \t\t\tresolves.shift()();\n \t\t}\n \t\tif(executeModules) {\n \t\t\tfor(i=0; i < executeModules.length; i++) {\n \t\t\t\tresult = __webpack_require__(__webpack_require__.s = executeModules[i]);\n \t\t\t}\n \t\t}\n \t\treturn result;\n \t};\n\n \t// The module cache\n \tvar installedModules = {};\n\n \t// objects to store loaded and loading chunks\n \tvar installedChunks = {\n \t\t2: 0\n \t};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"./\";\n\n \t// on error function for async loading\n \t__webpack_require__.oe = function(err) { console.error(err); throw err; };\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 6bfa9d07d14e3f431ca6"],"sourceRoot":""}
5
->>>>>>> 7a82db7d64ac5252dfa99753c9a040dc9d06bfc2

+ 2
- 2
src/pages/system/cardAndCouponManager/bodyBuildingCardManager/edit.vue Parādīt failu

@@ -120,7 +120,7 @@
120 120
             <div>
121 121
               <div class="addLine flex-h" style="align-item:center;margin-bottom:20px;">
122 122
                 <el-date-picker
123
-                  value-format="yyyy-MM-ddT00:00:00Z"
123
+                  value-format="yyyy-MM-ddT00:00:00+08:00"
124 124
                   :picker-options="pickerOptions"
125 125
                   v-model="cardInfo.StartDate"
126 126
                   type="date"
@@ -129,7 +129,7 @@
129 129
                 </el-date-picker>
130 130
                 <span style="line-height:40px;">至</span>
131 131
                 <el-date-picker
132
-                  value-format="yyyy-MM-ddT23:59:59Z"
132
+                  value-format="yyyy-MM-ddT23:59:59+08:00"
133 133
                   :picker-options="pickerOptions"
134 134
                   v-model="cardInfo.EndDate"
135 135
                   type="date"

+ 2
- 2
src/pages/system/cardAndCouponManager/cardManager/edit.vue Parādīt failu

@@ -119,7 +119,7 @@
119 119
             <div>
120 120
               <div class="addLine flex-h" style="align-item:center;margin-bottom:20px;">
121 121
                 <el-date-picker
122
-                  value-format="yyyy-MM-ddT00:00:00Z"
122
+                  value-format="yyyy-MM-ddT00:00:00+08:00"
123 123
                   :disabled="isEdit"
124 124
                   v-model="cardInfo.StartDate"
125 125
                   :picker-options="pickerOptions"
@@ -128,7 +128,7 @@
128 128
                 </el-date-picker>
129 129
                 <span style="line-height:40px;">至</span>
130 130
                 <el-date-picker
131
-                  value-format="yyyy-MM-ddT23:59:59Z"
131
+                  value-format="yyyy-MM-ddT23:59:59+08:00"
132 132
                   :disabled="true"
133 133
                   v-model="cardInfo.EndDate"
134 134
                   type="date"

+ 12
- 4
src/pages/system/cardAndCouponManager/couponManager/edit.vue Parādīt failu

@@ -162,7 +162,7 @@
162 162
               <div class="addLine flex-h" style="align-item:center;margin-bottom:20px;">
163 163
                 <el-radio v-model="postData.TimeType" label="1" :disabled="isEdit">固定时间</el-radio>
164 164
                 <el-date-picker
165
-                  value-format="yyyy-MM-ddT00:00:00Z"
165
+                  value-format="yyyy-MM-ddT00:00:00+08:00"
166 166
                   :disabled="isEdit"
167 167
                   v-model="couponInfo.StartDate"
168 168
                   :picker-options="pickerOptions"
@@ -171,7 +171,7 @@
171 171
                 </el-date-picker>
172 172
                 <span style="line-height:40px;">至</span>
173 173
                 <el-date-picker
174
-                  value-format="yyyy-MM-ddT23:59:59Z"
174
+                  value-format="yyyy-MM-ddT23:59:59+08:00"
175 175
                   :disabled="isEdit"
176 176
                   v-model="couponInfo.EndDate"
177 177
                   :picker-options="pickerOptions"
@@ -199,7 +199,7 @@
199 199
           <div class="flex-item">
200 200
             <div>
201 201
               <el-date-picker
202
-                value-format="yyyy-MM-ddT00:00:00Z"
202
+                value-format="yyyy-MM-ddT00:00:00+08:00"
203 203
                 :disabled="isEdit"
204 204
                 v-model="couponInfo.StartDate"
205 205
                 :picker-options="pickerOptions"
@@ -208,7 +208,7 @@
208 208
               </el-date-picker>
209 209
               <span style="line-height:40px;">至</span>
210 210
               <el-date-picker
211
-                value-format="yyyy-MM-ddT23:59:59Z"
211
+                value-format="yyyy-MM-ddT23:59:59+08:00"
212 212
                 :disabled="isEdit"
213 213
                 v-model="couponInfo.EndDate"
214 214
                 :picker-options="pickerOptions"
@@ -808,6 +808,10 @@ export default {
808 808
           ...this.postData,
809 809
           caseid: this.couponInfo.CaseId
810 810
         }).then((res) => {
811
+          this.goodsList = []
812
+          for (var n = 0; n < res.list.length; n++) {
813
+            this.goodsList.push({ ...res.list[n], TypeId: this.returnGoodsType(res.list[n].TypeId) })
814
+          }
811 815
           this.total = res.pagenum
812 816
         })
813 817
       } else if (this.couponInfo.CouponType === 'course') {
@@ -815,6 +819,10 @@ export default {
815 819
           ...this.postData,
816 820
           caseid: this.couponInfo.CaseId
817 821
         }).then((res) => {
822
+          this.courseList = []
823
+          for (var n = 0; n < res.list.length; n++) {
824
+            this.courseList.push({ ...res.list[n], BeginDate: this.toolClass.dateFormat(res.list[n].BeginDate), EndDate: this.toolClass.dateFormat(res.list[n].EndDate) })
825
+          }
818 826
           this.total = res.pagenum
819 827
         })
820 828
       }

+ 2
- 13
src/pages/system/courseManager/courseList/add.vue Parādīt failu

@@ -118,7 +118,7 @@
118 118
           <div class="flex-item">
119 119
             <div>
120 120
               <el-date-picker
121
-                value-format="yyyy-MM-ddT00:00:00Z"
121
+                value-format="yyyy-MM-ddT00:00:00+08:00"
122 122
                 :picker-options="pickerOptions"
123 123
                 v-model="detail.BeginDate"
124 124
                 type="date"
@@ -126,23 +126,12 @@
126 126
               </el-date-picker>
127 127
               <span style="line-height:40px;">至</span>
128 128
               <el-date-picker
129
-                value-format="yyyy-MM-ddT23:59:59Z"
129
+                value-format="yyyy-MM-ddT23:59:59+08:00"
130 130
                 :picker-options="pickerOptions"
131 131
                 v-model="detail.EndDate"
132 132
                 type="date"
133 133
                 placeholder="选择截止日期">
134 134
               </el-date-picker>
135
-              <!-- <el-date-picker
136
-                v-model="courseDate"
137
-                type="daterange"
138
-                align="right"
139
-                unlink-panels
140
-                range-separator="至"
141
-                start-placeholder="开始日期"
142
-                end-placeholder="结束日期"
143
-                :default-time="['00:00:00', '23:59:59']"
144
-                :picker-options="pickerOptions">
145
-              </el-date-picker> -->
146 135
             </div>
147 136
           </div>
148 137
         </li>

+ 25
- 8
src/pages/system/newOrder/newOrderList/index.vue Parādīt failu

@@ -140,7 +140,17 @@ export default {
140 140
         return
141 141
       }
142 142
       clearInterval(this.interval)
143
-      this.GetOrdersList({ caseid: this.caseid }).then(() => {
143
+      this.GetOrdersList({ caseid: this.caseid }).then((res) => {
144
+        // console.log(JSON.stringify(res))
145
+        for (var n = 0; n < res.list.length; n++) {
146
+          if (res.list[n].IsIntimidate === 0) {
147
+            this.printPdf(`item_${res.list[n].OrdersId}`).then(() => {
148
+              this.putPrintGoodsOrder({
149
+                id: res.list[n].OrdersId
150
+              })
151
+            })
152
+          }
153
+        }
144 154
         this.getBusinessStatus(this.caseid).then(() => {
145 155
           if (this.businessStatus) {
146 156
             this.initWebSocket()
@@ -175,7 +185,8 @@ export default {
175 185
       'checkOrder',
176 186
       'cancelOrder',
177 187
       'getBusinessStatus',
178
-      'updateList'
188
+      'updateList',
189
+      'putPrintGoodsOrder',
179 190
     ]),
180 191
     ...mapActions([
181 192
       'updateSystemInfo'
@@ -221,9 +232,11 @@ export default {
221 232
       })
222 233
     },
223 234
     printPdf (cl) {
224
-      this.CreateOneFormPage(cl)
225
-      LODOP.PRINT()
226
-      // LODOP.PREVIEW()
235
+      return new Promise((resolve) => {
236
+        this.CreateOneFormPage(cl)
237
+        LODOP.PRINT()
238
+        resolve()
239
+      })
227 240
     },
228 241
     CreateOneFormPage (cl) {
229 242
       LODOP = getLodop()
@@ -232,7 +245,7 @@ export default {
232 245
       LODOP.ADD_PRINT_HTM(0, 0, document.getElementsByClassName(cl)[0].offsetWidth, document.getElementsByClassName(cl)[0].offsetHeight, document.getElementsByClassName(cl)[0].innerHTML)
233 246
     },
234 247
     initWebSocket () {
235
-      console.log(this.user)
248
+      // console.log(this.user)
236 249
       let caseid = this.caseid
237 250
       let id = this.userInfo.UserId
238 251
       const wsuri = `${window.location.origin.replace('http', 'ws')}/api-v2/common/MQ/websocket/${caseid}/${id}?token=${localStorage.getItem('JWT')}`
@@ -250,9 +263,13 @@ export default {
250 263
       // let oldList = this.list
251 264
       let newList = JSON.parse(e.data).data.refreshOnlineGoodsOrders
252 265
       let newinfo = newList.filter(x => this.list.filter(item => item.OrdersId === x.OrdersId).length === 0)
253
-      this.updateList({list: newList}).then(() => {
266
+      this.updateList({ list: newList }).then(() => {
254 267
         for (let i = 0; i < newinfo.length; i++) {
255
-          this.printPdf(`item_${newinfo[i].OrdersId}`)
268
+          this.printPdf(`item_${newinfo[i].OrdersId}`).then(() => {
269
+            this.putPrintGoodsOrder({
270
+              id: newinfo[i].OrdersId
271
+            })
272
+          })
256 273
         }
257 274
       })
258 275
     },

+ 11
- 5
src/pages/system/verificationManager/phoneVerification/verificationList/index.vue Parādīt failu

@@ -73,10 +73,10 @@
73 73
             </el-table>
74 74
             <el-pagination
75 75
             @current-change="handleCurrentChange"
76
-            :current-page.sync="courses.page"
77
-            :page-size="courses.pagesize"
76
+            :current-page.sync="page"
77
+            :page-size="pagesize"
78 78
             layout="prev, pager, next, jumper"
79
-            :total="courses.pagenum">
79
+            :total="total">
80 80
           </el-pagination>
81 81
         </div>
82 82
         <span class="noData" v-else>查不到当前课程信息,请核对手机号或课程详情</span>
@@ -166,12 +166,13 @@ export default {
166 166
       tel: '',
167 167
       page: 1,
168 168
       pagesize: 10,
169
+      dialogTotal: 0,
170
+      total: 1,
169 171
       postData: {
170 172
         caseid: '',
171 173
         page: 1,
172
-        pagesize: 6,
174
+        pagesize: 10
173 175
       },
174
-      dialogTotal: 0,
175 176
     }
176 177
   },
177 178
   mounted () {
@@ -253,12 +254,17 @@ export default {
253 254
       if (this.code && this.code !== '') {
254 255
         this.GetCourseVerList({ id: this.code, page: this.page, pagesize: this.pagesize }).then((res) => {
255 256
           res.list = res.list || []
257
+          this.page = res.page
258
+          this.total = res.pagenum
256 259
           this.courses = res.list
257 260
         })
258 261
       } else {
259 262
         if (this.tel && this.tel !== '') {
260 263
           this.GetCourseVerListByTel({ tel: this.tel, page: this.page, pagesize: this.pagesize }).then((res) => {
261 264
             res.list = res.list || []
265
+            console.log(JSON.stringify(res))
266
+            this.page = res.page
267
+            this.total = res.pagenum
262 268
             this.courses = res.list
263 269
           })
264 270
         }

+ 15
- 2
src/pages/system/verificationManager/qrcodeVerification/verificationList/index.vue Parādīt failu

@@ -47,11 +47,24 @@
47 47
                 label="操作">
48 48
                 <template slot-scope="scope">
49 49
                   <el-button
50
+                    size="mini"
51
+                    type="success"
52
+                    v-if="scope.row.VerifyStatus==='useable'"
53
+                    @click="check(scope.row)">核销</el-button>
54
+                  <el-button
55
+                    size="mini"
56
+                    type="info"
57
+                    v-if="scope.row.VerifyStatus==='late'">逾期核销</el-button>
58
+                  <el-button
59
+                    size="mini"
60
+                    type="info"
61
+                    v-if="scope.row.VerifyStatus==='used'">已完成</el-button>
62
+                  <!-- <el-button
50 63
                     size="mini"
51 64
                     type="success"
52 65
                     v-if="scope.row.VerifyStatus!=='used'"
53 66
                     @click="check(scope.row)">核销</el-button>
54
-                  <span v-else>已完成</span>
67
+                  <span v-else>已完成</span> -->
55 68
                 </template>
56 69
               </el-table-column>
57 70
             </el-table>
@@ -115,7 +128,7 @@
115 128
       width="200">
116 129
       <span>确认核销此课程</span>
117 130
       <span slot="footer" class="dialog-footer">
118
-        <el-button @click="sureVerify">确 定</el-button>
131
+        <el-button type="primary" @click="sureVerify">确 定</el-button>
119 132
         <el-button type="primary" @click="sureAndBind">确定并绑定钥匙</el-button>
120 133
       </span>
121 134
     </el-dialog>

+ 22
- 7
src/store/goods/order.js Parādīt failu

@@ -21,14 +21,29 @@ export default {
21 21
     }
22 22
   },
23 23
   actions: {
24
+    putPrintGoodsOrder ({ commit }, payload) {
25
+      return new Promise((resolve) => {
26
+        ajax(api.goodsOrder.putPrintGoodsOrder.url, {
27
+          method: api.goodsOrder.putPrintGoodsOrder.method,
28
+          urlData: {
29
+            ...payload,
30
+          }
31
+        }).then(res => {
32
+          resolve(res)
33
+        })
34
+      })
35
+    },
24 36
     GetOrdersList ({ commit }, payload) {
25
-      ajax(api.goodsOrder.getOnlineOrder.url, {
26
-        method: api.goodsOrder.getOnlineOrder.method,
27
-        queryData: {
28
-          ...payload,
29
-        }
30
-      }).then(res => {
31
-        commit('updateList', res)
37
+      return new Promise((resolve) => {
38
+        ajax(api.goodsOrder.getOnlineOrder.url, {
39
+          method: api.goodsOrder.getOnlineOrder.method,
40
+          queryData: {
41
+            ...payload,
42
+          }
43
+        }).then(res => {
44
+          commit('updateList', res)
45
+          resolve(res)
46
+        })
32 47
       })
33 48
     },
34 49
     GetOrdersByRecord ({ commit }, { id, callback }) {

+ 6
- 2
src/util/api.js Parādīt failu

@@ -1,5 +1,5 @@
1
-const baseUrl = '/api-v2'
2
-// const baseUrl = '/api'
1
+// const baseUrl = '/api-v2'
2
+const baseUrl = '/api'
3 3
 const common = '/common/:org'
4 4
 const guest = '/guest/:org'
5 5
 
@@ -583,6 +583,10 @@ const $api = {
583 583
     },
584 584
   },
585 585
   goodsOrder: {
586
+    putPrintGoodsOrder: {
587
+      method: 'put',
588
+      url: `${baseUrl}${common}/order/goods/intimidate/:id`
589
+    },
586 590
     getOnlineOrder: {
587 591
       method: 'get',
588 592
       url: `${baseUrl}${common}/order/online/goods`