Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

package.json

@@ -9,6 +9,7 @@
     "build:prod": "vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
     "build:demo1024": "vue-cli-service build --mode demo1024",
+    "dev:demo1024": "vue-cli-service serve --mode demo1024",
     "preview": "node build/index.js --preview",
     "lint": "eslint --ext .js,.vue src"
   },

src/api/ecw/box.js

 import request from '@/utils/request'
 
-// 创建出货管理
-export function createBox(data) {
+// 创建出货
+export function createbox(data) {
   return request({
-    url: '/ecw/box/create',
+    url: '/shipment/box/create',
     method: 'post',
     data: data
   })
 }
 
-// 更新出货管理
-export function updateBox(data) {
+// 更新出货
+export function updatebox(data) {
   return request({
-    url: '/ecw/box/update',
+    url: '/shipment/box/update',
     method: 'put',
     data: data
   })
 }
 
-// 删除出货管理
-export function deleteBox(id) {
+// 删除出货
+export function deletebox(id) {
   return request({
-    url: '/ecw/box/delete?id=' + id,
+    url: '/shipment/box/delete?id=' + id,
     method: 'delete'
   })
 }
 
-// 获得出货管理
-export function getBox(id) {
+// 获得出货
+export function getbox(id) {
   return request({
-    url: '/ecw/box/get?id=' + id,
+    url: '/shipment/box/get?id=' + id,
     method: 'get'
   })
 }
 
-// 获得出货管理分页
-export function getBoxPage(query) {
+// 获得出货分页
+export function getboxPage(query) {
   return request({
-    url: '/ecw/box/page',
+    url: '/shipment/box/page',
     method: 'get',
     params: query
   })
 }
 
-// 导出出货管理 Excel
-export function exportBoxExcel(query) {
+// 导出出货 Excel
+export function exportboxExcel(query) {
   return request({
-    url: '/ecw/box/export-excel',
+    url: '/shipment/box/export-excel',
     method: 'get',
     params: query,
     responseType: 'blob'

src/utils/ruoyi.js

@@ -11,7 +11,7 @@ const baseURL = process.env.VUE_APP_BASE_API
  * @param pattern {String} '{y}-{m}-{d} {h}:{i}:{s}'
  * @returns {string|null}
  */
-export function parseTime(time, pattern) {
+export function parseTime(time, pattern = undefined) {
   if (arguments.length === 0 || !time) {
     return null
   }

src/views/ecw/offer/special.vue

@@ -34,9 +34,9 @@
           </template>
         </el-table-column>
         <el-table-column
-          prop="address"
+          prop="updateTime"
+          :formatter="(_, __, v) => parseTime(v)"
           label="最后操作时间">
-<!-- todo -->
         </el-table-column>
         <el-table-column
           label="原价">
@@ -96,6 +96,7 @@ import {getOffer} from '@/api/ecw/offer'
 import {getUnitList} from "@/api/ecw/unit"
 import {getCurrencyList} from "@/api/ecw/currency"
 import {getProductAttrList} from "@/api/ecw/productAttr"
+import { parseTime } from '@/utils/ruoyi'
 export default {
   name: "OfferSpecial",
   components: {
@@ -105,6 +106,7 @@ export default {
   },
   data() {
     return {
+      parseTime,
       DICT_TYPE,
       getDictDataLabel,
       // 遮罩层

src/views/ecw/offer/specialDiscount.vue

@@ -64,14 +64,15 @@
              </el-input>
            </el-form-item>
            <el-form-item label="新运费" required>
-             <el-input v-model.number="form.seaFreight">
+             <el-input v-model.number="form.seaFreight" :readonly="readonly">
                <dict-selector
                  slot="prepend"
                  v-model="form.seaFreightCurrency"
                  :type="DICT_TYPE.COMMISSION_CURRENCY_TYPE"
                  style="width: 100px"
+                 :disabled="readonly"
                ></dict-selector>
-               <el-select v-model="form.seaFreightVolume" placeholder="请选择" slot="append" style="width: 100px">
+               <el-select v-model="form.seaFreightVolume" placeholder="请选择" slot="append" style="width: 100px" :disabled="readonly">
                  <el-option
                    v-for="item in unitList"
                    :key="item.id"
@@ -82,14 +83,15 @@
              </el-input>
            </el-form-item>
            <el-form-item label="新清关费" required>
-             <el-input v-model.number="form.clearanceFreight">
+             <el-input v-model.number="form.clearanceFreight" :readonly="readonly">
                <dict-selector
                  slot="prepend"
                  v-model="form.clearanceFreightCurrency"
                  :type="DICT_TYPE.COMMISSION_CURRENCY_TYPE"
                  style="width: 100px"
+                 :disabled="readonly"
                ></dict-selector>
-               <el-select v-model="form.clearanceFreightVolume" placeholder="请选择" slot="append" style="width: 100px">
+               <el-select v-model="form.clearanceFreightVolume" placeholder="请选择" slot="append" style="width: 100px" :disabled="readonly">
                  <el-option
                    v-for="item in unitList"
                    :key="item.id"