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

src/api/ecw/futureBox.js

+import request from '@/utils/request'
+
+// 创建预定舱计划
+export function createFutureBox(data) {
+  return request({
+    url: '/ecw/future-box/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新预定舱计划
+export function updateFutureBox(data) {
+  return request({
+    url: '/ecw/future-box/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除预定舱计划
+export function deleteFutureBox(id) {
+  return request({
+    url: '/ecw/future-box/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得预定舱计划
+export function getFutureBox(id) {
+  return request({
+    url: '/ecw/future-box/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得预定舱计划分页
+export function getFutureBoxPage(query) {
+  return request({
+    url: '/ecw/future-box/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出预定舱计划 Excel
+export function exportFutureBoxExcel(query) {
+  return request({
+    url: '/ecw/future-box/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/components/CustomerFollow/index.vue

@@ -173,7 +173,34 @@ export default {
         if (!valid) {
           return
         }
-
+        if(!this.customerFollow.form.followType){
+          this.$modal.msgError("请选择跟进类型");
+          return
+        }
+        if(!this.customerFollow.form.followTime){
+          this.$modal.msgError("请选择跟进时间");
+          return
+        }
+        if(!this.customerFollow.form.contactName){
+          this.$modal.msgError("请选择联系人");
+          return
+        }
+        if(!this.customerFollow.form.followUserId){
+          this.$modal.msgError("请选择跟进业务");
+          return
+        }
+        if(!this.customerFollow.form.followMethod){
+          this.$modal.msgError("请选择跟进方式");
+          return
+        }
+        if(!this.customerFollow.form.feedback){
+          this.$modal.msgError("请输入客户反馈");
+          return
+        }
+        if(!this.customerFollow.form.result){
+          this.$modal.msgError("请输入处理结果");
+          return
+        }
         createCustomerFollow(this.customerFollow.form).then(r => {
           this.resetCustomerFollowForm()
           this.getCustomerFollowList()

src/components/CustomerFollowList/index.vue

@@ -15,7 +15,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="跟进时间" required>
-              <el-date-picker v-model="customerFollow.form.followTime" type="datetime" placeholder="选择跟进时间"></el-date-picker>
+              <el-date-picker v-model="customerFollow.form.followTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择跟进时间"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -103,8 +103,11 @@ export default {
   },
 
   created() {
+    this.resetCustomerFollowForm()
     if (!!this.customerId) getCustomerContactsListByCustomer({customerId: this.customerId}).then(r => {
       this.customerContactsList = r.data
+      this.$set(this.customerFollow.form, 'customerId', this.customerId)
+      // this.customerFollow.form.customerId = this.customerId
     })
     listServiceUser().then(r => {
       this.serviceUserList = r.data
@@ -116,7 +119,34 @@ export default {
         if (!valid) {
           return
         }
-
+       if(!this.customerFollow.form.followType){
+          this.$modal.msgError("请选择跟进类型");
+          return
+        }
+        if(!this.customerFollow.form.followTime){
+          this.$modal.msgError("请选择跟进时间");
+          return
+        }
+        if(!this.customerFollow.form.contactName){
+          this.$modal.msgError("请选择联系人");
+          return
+        }
+        if(!this.customerFollow.form.followUserId){
+          this.$modal.msgError("请选择跟进业务");
+          return
+        }
+        if(!this.customerFollow.form.followMethod){
+          this.$modal.msgError("请选择跟进方式");
+          return
+        }
+        if(!this.customerFollow.form.feedback){
+          this.$modal.msgError("请输入客户反馈");
+          return
+        }
+        if(!this.customerFollow.form.result){
+          this.$modal.msgError("请输入处理结果");
+          return
+        }
         createCustomerFollow(this.customerFollow.form).then(r => {
           this.resetCustomerFollowForm()
           this.customerFollow.dialogVisible = false
@@ -126,7 +156,8 @@ export default {
 
     resetCustomerFollowForm() {
       this.customerFollow.form = {
-        "bizId":undefined,
+        "bizId":this.id,
+        "customerId":this.customerId,
         "contactName": undefined,
         "feedback": undefined,
         "followMethod": undefined,

src/views/ecw/box/indexFutureBox.vue

+<template>
+  <div class="app-container">
+
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="运输方式" prop="transportType">
+        <el-select v-model="queryParams.transportType" placeholder="请选择运输方式" clearable size="small">
+          <el-option v-for="dict in transportTypes" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="始发地" prop="startWarehouseId">
+        <el-select v-model="queryParams.startWarehouseId" placeholder="请选择始发地">
+          <el-option v-for="item in exportWarehouseList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="目的地" prop="destWarehouseId">
+        <el-select v-model="queryParams.destWarehouseId" placeholder="请选择目的地">
+          <el-option v-for="item in importWarehouseList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                   v-hasPermi="['ecw:future-box:create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+                   v-hasPermi="['ecw:future-box:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="主键ID" align="center" prop="id" />
+      <el-table-column label="始发地" align="center" prop="startWarehouse" />
+      <el-table-column label="目的地" align="center" prop="destWarehouse" />
+      <el-table-column label="运输方式" align="center" prop="transportType">
+        <template slot-scope="scope">
+          <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="scope.row.transportType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="出货渠道" align="center" prop="shippingChannelId" />
+      <el-table-column label="待入仓方数" align="center" prop="readyWarehousingNumber" />
+      <el-table-column label="已入仓方数" align="center" prop="warehousedNumber" />
+      <el-table-column label="在仓方数" align="center" prop="warehousingNumber" />
+      <el-table-column label="已装柜方数" align="center" prop="loadingNumber" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="未来天数" align="center" prop="futureNumber" />
+      <el-table-column label="计划货柜" align="center" prop="gpNumber">
+        <template slot-scope="{row}">
+          {{row.gpNumber}}个40GP/{{row.hqNumber}}个40HQ
+        </template>
+      </el-table-column>
+      <el-table-column label="未来计划方数" align="center" prop="futurePlanNumber" />
+      <el-table-column label="未来实际方数" align="center" prop="actualNumber" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                     v-hasPermi="['ecw:future-box:update']">编辑</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['ecw:future-box:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+         <el-form-item label="始发地" prop="startWarehouseId">
+          <el-select v-model="form.startWarehouseId" placeholder="请选择始发地">
+            <el-option v-for="item in exportWarehouseList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="目的地" prop="destWarehouseId">
+          <el-select v-model="form.destWarehouseId" placeholder="请选择目的地">
+            <el-option v-for="item in importWarehouseList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="运输方式" prop="transportType">
+          <el-radio-group v-model="form.transportType">
+            <el-radio v-for="dict in transportTypes" :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="出货渠道" prop="shippingChannelId">
+          <el-select v-model="form.shippingChannelId" placeholder="请选择出货渠道">
+            <el-option v-for="item in channelList" :label="item.nameZh" :value="item.channelId" :key="item.channelId"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="待入仓方数" prop="readyWarehousingNumber"/>
+        <el-form-item label="已入仓方数" prop="warehousedNumber"/>
+        <el-form-item label="在仓方数" prop="warehousingNumber"/>
+        <el-form-item label="已装柜仓数" prop="loadingNumber"/>
+        <el-form-item label="未来" />
+        <el-form-item prop="futureNumber">
+          <el-input v-model="form.futureNumber" placeholder="请输入未来货柜天数" />
+        </el-form-item>
+        <el-form-item label="天货柜数" />
+        <el-form-item prop="gpNumber">
+          <el-input v-model="form.gpNumber" placeholder="请输入GP" />
+        </el-form-item>
+        <el-form-item label="x40GP"/>
+        <el-form-item prop="hqNumber">
+          <el-input v-model="form.hqNumber" placeholder="请输入hq" />
+        </el-form-item>
+        <el-form-item label="x40HQ"/>
+        <el-form-item label="未来计划方数" prop="futurePlanNumber">
+          <el-input v-model="form.futurePlanNumber" placeholder="请输入未来计划方数" />
+        </el-form-item>
+        <el-form-item label="未来实际方数" prop="actualNumber">
+          <el-input v-model="form.actualNumber" placeholder="请输入未来实际方数" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { createFutureBox, updateFutureBox, deleteFutureBox, getFutureBox, getFutureBoxPage, exportFutureBoxExcel } from "@/api/ecw/futureBox";
+import {getCabinetPage} from "@/api/ecw/cabinet";
+import { getChannelList } from '@/api/ecw/channel';
+import { getWarehouseList } from "@/api/ecw/warehouse"
+
+export default {
+  name: "indexFutureBox",
+  components: {
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 预定舱计划列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      dateRangeCreateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        startWarehouseId: null,
+        destWarehouseId: null,
+        transportType: null,
+        readyWarehousingNumber: null,
+        warehousedNumber: null,
+        warehousingNumber: null,
+        loadingNumber: null,
+        futureNumber: null,
+        gpNumber: null,
+        hqNumber: null,
+        futurePlanNumber: null,
+        actualNumber: null,
+        shippingChannelId: null,
+        status: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      warehouseList: [],
+      channelList: [],
+    };
+  },
+  computed: {
+    exportWarehouseList() {
+      return this.warehouseList.filter(
+        (item) => item.tradeType == "2" || item.type == "3"
+      );
+    },
+    importWarehouseList() {
+      return this.warehouseList.filter(
+        (item) => item.tradeType == "1" || item.type == "3"
+      );
+    },
+    getCabinetName() {
+      return (cabinetId) => {
+        for (let index in this.cabinetList) {
+          let cabinetItem = this.cabinetList[index];
+          if (cabinetItem.id == cabinetId) {
+            return cabinetItem.name;
+          }
+        }
+      };
+    },
+    getShipChannelName() {
+        return shippingChannelId => {
+          for (let index in this.channelList) {
+            let channelItem = this.channelList[index];
+            if (channelItem.channelId == shippingChannelId) {
+              return channelItem.nameZh;
+            }
+          }
+          return '/'
+        }
+    }
+  },
+  created() {
+    // 查询渠道
+    getChannelList().then((res) => (this.channelList = res.data));
+    this.transportTypes = this.getDictDatas(
+      this.DICT_TYPE.ECW_TRANSPORT_TYPE
+    ).filter((item) => item.value == "1" || item.value == "2");
+    getWarehouseList().then((res) => (this.warehouseList = res.data));
+    getCabinetPage(null).then((response) => {
+      this.cabinetList = response.data.list;
+    });
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 处理查询参数
+      let params = {...this.queryParams};
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      // 执行查询
+      getFutureBoxPage(params).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 取消按钮 */
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    /** 表单重置 */
+    reset() {
+      this.form = {
+        id: undefined,
+        startWarehouseId: undefined,
+        destWarehouseId: undefined,
+        transportType: undefined,
+        readyWarehousingNumber: undefined,
+        warehousedNumber: undefined,
+        warehousingNumber: undefined,
+        loadingNumber: undefined,
+        futureNumber: undefined,
+        gpNumber: undefined,
+        hqNumber: undefined,
+        futurePlanNumber: undefined,
+        actualNumber: undefined,
+        shippingChannelId: undefined,
+        status: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRangeCreateTime = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加预定舱计划";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id;
+      getFutureBox(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改预定舱计划";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (!valid) {
+          return;
+        }
+        // 修改的提交
+        if (this.form.id != null) {
+          updateFutureBox(this.form).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.open = false;
+            this.getList();
+          });
+          return;
+        }
+        // 添加的提交
+        createFutureBox(this.form).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.open = false;
+          this.getList();
+        });
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const id = row.id;
+      this.$modal.confirm('是否确认删除预定舱计划编号为"' + id + '"的数据项?').then(function() {
+          return deleteFutureBox(id);
+        }).then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = {...this.queryParams};
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
+      // 执行导出
+      this.$modal.confirm('是否确认导出所有预定舱计划数据项?').then(() => {
+          this.exportLoading = true;
+          return exportFutureBoxExcel(params);
+        }).then(response => {
+          this.$download.excel(response, '${table.classComment}.xls');
+          this.exportLoading = false;
+        }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/ecw/customerComplaint/index.vue

@@ -266,14 +266,14 @@
           <dict-selector :type="DICT_TYPE.CUSTOMER_COMPLAINT_STATUS" form-type="radio" v-model="form.status"
                          :filter="(e) => e.value == '2' || e.value == '3'" :formatter="Number"></dict-selector>
         </el-form-item>
-        <el-form-item v-show="form.status == '2'" label="查明原因" required prop="ascertainReason">
+        <el-form-item v-show="form.status == '2'" label="查明原因" required >
           <el-input type="textarea" placeholder="请输入查明原因" v-model="form.ascertainReason"></el-input>
         </el-form-item>
         <el-form-item v-show="form.status == '2'" label="处理方案">
           <el-input v-model="form.plan" placeholder="请输入处理方案"></el-input>
         </el-form-item>
 
-        <el-form-item v-show="form.status == '3'" label="处理结果" required prop="result">
+        <el-form-item v-show="form.status == '3'" label="处理结果" required>
           <el-input type="textarea" placeholder="请输入处理结果" v-model="form.result"></el-input>
         </el-form-item>
         <el-form-item v-show="form.status == '3'" label="赔付金额">
@@ -287,7 +287,7 @@
               :type="DICT_TYPE.COMMISSION_CURRENCY_TYPE"></dict-selector>
           </el-input>
         </el-form-item>
-        <el-form-item v-show="form.status == '3'" label="处理时间" required prop="handleAt">
+        <el-form-item v-show="form.status == '3'" label="处理时间" required>
           <el-date-picker type="datetime" v-model="form.handleAt" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
         </el-form-item>
       </el-form>
@@ -360,9 +360,6 @@ export default {
         customerId: [{ required: true, message: "客户名称不能为空", trigger: "change" }],
         type: [{ required: true, message: "投诉类型不能为空", trigger: "change" }],
         content: [{ required: true, message: "投诉内容不能为空", trigger: "blur" }],
-        ascertainReason: [{ required: true, message: "查明原因不能为空", trigger: "blur" }],
-        result: [{ required: true, message: "处理结果不能为空", trigger: "blur" }],
-        handleAt: [{ required: true, message: "处理时间不能为空", trigger: "blur" }],
       },
 
       myFollowCustomerList: [],
@@ -491,13 +488,28 @@ export default {
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
-        console.log(valid)
-        console.log(this.form.handleAt)
         if (!valid) {
           return;
         }
+
         // 修改的提交
         if (this.form.id != null) {
+          if(this.form.status==2){
+            if(!this.form.ascertainReason){
+              this.$modal.msgError("请输入查明原因");
+              return
+            }
+          }
+          if(this.form.status==3){
+            if(!this.form.result){
+              this.$modal.msgError("请输入处理结果");
+              return
+            }
+            if(!this.form.handleAt){
+              this.$modal.msgError("请输入处理时间");
+              return
+            }
+          }
           updateCustomerComplaint(this.form).then(response => {
             this.$modal.msgSuccess("修改成功");
             this.open = false;
@@ -559,4 +571,8 @@ export default {
   .formShow div{
     flex: 1;
   }
+  .dialog-footer{
+    display: flex;
+    flex-direction: row !important;
+  }
 </style>

src/views/ecw/order/batchSingleApplication.vue

@@ -83,20 +83,10 @@
           调至
         </div></el-col>
         <el-col :span="8"><el-select v-model="params.warehouseInId">
-          <el-option v-for="(item ,index) in availableWarehouse" :value="item.id" :label="item.titleZh"
+          <el-option v-for="(item ,index) in availableWarehouse" v-if="item.status !== 1"  :value="item.id" :label="item.titleZh"
                      :key="index"></el-option>
         </el-select></el-col>
       </el-row>
-      <div style="display: flex;justify-content:center; margin-top: 20px">
-        <div style="width: 200px; margin: 0 10px">
-        </div>
-        <div>
-
-        </div>
-        <div style="width: 200px;">
-
-        </div>
-      </div>
       <el-divider></el-divider>
       <h1 class="title">
         审批流程

src/views/ecw/order/components/warehouseDetails.vue

@@ -50,7 +50,7 @@
     </el-table-column>
     <el-table-column
       label="出货渠道">
-
+        <template v-slot="{row}">{{row.channelName || '/'}}</template>
     </el-table-column>
     <el-table-column label="始发仓" prop="startWarehouseName"></el-table-column>
     <el-table-column label="目的地" prop="objectiveName"></el-table-column>

src/views/ecw/order/exception/index.vue

@@ -147,7 +147,6 @@ import {DICT_TYPE} from  '@/utils/dict'
 import { userList } from "@/api/system/user"
 import CustomerSelector from '@/components/CustomerSelector'
 import ProductSelector from '@/components/ProductSelector'
-import getProduct from '@/api/ecw/product'
 
 export default {
   name: "Exception",

src/views/ecw/order/feeApplication.vue

@@ -65,7 +65,7 @@
         <el-button v-if="!IsExamine" style="margin-right: 30px;" @click="submit">提交</el-button>
         <el-button v-if="IsExamine" style="margin-right: 30px;" @click="examineFn">审核中</el-button>
         <el-button v-if="IsExamine" style="margin-right: 30px;" @click="cancel">取消审核</el-button>
-        <el-button>取消</el-button>
+        <el-button @click="$emit('update:dialogVisible',false)">返回</el-button>
       </div>
     </div>
   </el-dialog>

src/views/ecw/order/pending.vue

@@ -106,6 +106,7 @@ import {getExceptionListByOrderId} from "@/api/ecw/orderException"
 import {DICT_TYPE} from  '@/utils/dict'
 import {getOrder} from '@/api/ecw/order'
 import FilePreview from '@/components/FilePreview'
+import {getProduct} from '@/api/ecw/product'
 
 export default {
   name: "Pending",
@@ -158,15 +159,14 @@ export default {
 
     handEdit(row){
       if(row.orderExceptionType=='order_no_quote_exception'){
-        getProduct(row.orderItemId).then(res=>{
-          this.$router.push({
-            name: 'ProductPrice',
-            query: {
-              product_id: row.orderItemId,
-              product_type: res.data.typeId
-            }
+        let url = '../../lineProject/product-price/edit'
+
+        if(row.orderItem){
+          getProduct(row.orderItemId).then(res=>{
+              url = '../../lineProject/product-price/edit?product_id='+row.orderItemId+'&product_type='+res.data.typeId
           })
-        })
+        }
+        return this.$router.push(url)
       }else if(row.orderExceptionType == 'order_heavy_cargo_exception'||row.orderExceptionType=='order_bulky_cargo_exception'){
         this.$router.push({
           path:"/order/weightDeal?id="+row.id+'&type='+row.orderExceptionType,

src/views/ecw/order/transferWarehousing.vue

@@ -332,7 +332,7 @@ export default {
       return ['合计：',text,text2]
     },
     cancellationOfOrder(){
-      this.$prompt('请输入审核调仓原因', '提示', {
+      this.$prompt('请输入取消调仓原因', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
       }).then(({ value }) => {

src/views/ecw/order/warehousing/index.vue

@@ -106,8 +106,8 @@
           <span slot="append">m³</span>
         </el-input>
       </el-form-item>
-      <el-form-item label="总方数量" style="width: 300px">
-        <el-input v-model="form.sumWeight" placeholder="请输入总数量">
+      <el-form-item label="总重量" style="width: 300px">
+        <el-input v-model="form.sumWeight" placeholder="请输入总重量">
           <span slot="append">kg</span>
         </el-input>
       </el-form-item>

src/views/ecw/productBrank/BrandForm/index.vue

@@ -8,7 +8,7 @@
         <el-input v-model="form.brandName" placeholder="商标"></el-input>
       </el-form-item>
       <el-form-item :label="`商标${index + 1}分类`">
-        <el-select v-model="form.productTypeId" :placeholder="`请选择商标${index + 1}分类`" @change="form.productIds = [], updateValue()">
+        <el-select v-model="form.productTypeId" :placeholder="`请选择商标${index + 1}分类`" @change="form.productIds = [0], updateValue()">
           <el-option
             v-for="item in productTypeList"
             :key="item.id"
@@ -19,7 +19,7 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="`商标${index + 1}商品`">
-        <el-select v-model="form.productIds" :placeholder="`请选择商标${index + 1}商品`" multiple filterable @change="updateValue">
+        <el-select v-model="form.productIds" :placeholder="`请选择商标${index + 1}商品`" multiple filterable clearable @change="updateValue">
           <el-option
             v-for="item in getProductListByTypeId(form.productTypeId)"
             :key="item.id"
@@ -73,9 +73,22 @@ export default {
   },
   methods: {
     getProductListByTypeId(typeId) {
-      return typeId === 0 ? [] : this.productList.filter((p) => p.typeId === typeId)
+      return [
+        {id: 0, titleZh: '全部'},
+        ...(typeId === 0 ? [] : this.productList.filter((p) => p.typeId === typeId))
+      ]
+    },
+    // 删除商品0
+    delete0(){
+      if (this.form.productIds.length > 1){
+        const index = this.form.productIds.indexOf(0)
+        if (index !== -1) {
+          this.form.productIds.splice(index, 1)
+        }
+      }
     },
     updateValue() {
+      this.delete0()
       const trademarkCategoryRelList = []
       this.form.productIds.forEach(productId => {
         trademarkCategoryRelList.push({

src/views/ecw/productBrank/index.vue

@@ -124,7 +124,7 @@
       trademarkCategoryRelList: []
       })">添加商标</el-button>
 
-      <div slot="footer" class="dialog-footer">
+      <div slot="footer" style="text-align: center">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
@@ -143,7 +143,6 @@ import {getProductList} from "@/api/ecw/product"
 import BrandForm from "@/views/ecw/productBrank/BrandForm"
 import Empower from "@/views/ecw/productBrank/Empower"
 
-
 export default {
   name: "ProductBrank",
   components: {
@@ -182,6 +181,10 @@ export default {
       form: {},
       // 表单校验
       rules: {
+        titleZh: [{ required: true, message: '请输入品牌中文标题', trigger: "blur" }],
+        titleEn: [{ required: true, message: '请输入品牌英文标题', trigger: "blur" }],
+        // aorder: [{ required: true, message: '请输入排序', trigger: "blur" }],
+        filing: [{ required: true, message: '请选择是否备案', trigger: "change" }],
       },
       recordStatus: getDictDatas(DICT_TYPE.BRAND_REG_TYPE),
 
@@ -196,7 +199,7 @@ export default {
   created() {
     this.getList();
     getProductTypeList().then(r => {
-      this.productTypeList = r.data
+      this.productTypeList = [{id: 0, titleZh: '全部'}, ...r.data]
     })
     getProductList().then(r => {
       this.productList = r.data

src/views/system/internalMessage/index.vue

@@ -45,7 +45,7 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
       <el-table-column label="" align="center" prop="id" />
-<!--      <el-table-column label="来源" align="center" prop="fromId" />-->
+      <el-table-column label="来源" align="center" prop="fromId" />
       <el-table-column label="发送时间" align="center" prop="sendTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.sendTime) }}</span>
@@ -58,11 +58,11 @@
           <dict-tag :type="DICT_TYPE.INTERNAL_MESSAGE_TYPE" :value="scope.row.type" />
         </template>
       </el-table-column>
-<!--      <el-table-column label="创建时间" align="center" prop="createTime" width="180">-->
-<!--        <template slot-scope="scope">-->
-<!--          <span>{{ parseTime(scope.row.createTime) }}</span>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -79,9 +79,9 @@
     <!-- 对话框(添加 / 修改) -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-<!--        <el-form-item label="来源" prop="fromId">-->
-<!--         <el-input v-model="form.fromId" placeholder="请输入站内信来源" />-->
-<!--       </el-form-item>-->
+        <el-form-item label="来源" prop="fromId">
+         <el-input v-model="form.fromId" placeholder="请输入站内信来源" />
+       </el-form-item>
         <el-form-item label="发送时间" prop="sendTime">
           <el-date-picker clearable v-model="form.sendTime" type="date" value-format="yyyy-MM-dd" placeholder="选择发送时间" />
         </el-form-item>