Merge remote-tracking branch 'origin/dev' into dev

src/api/ecw/warehouse.js

@@ -9,6 +9,16 @@ export function createWarehouse(data) {
   })
 }
 
+//创建提单模板
+export function createTemplate(data) {
+  console.log(data);
+  return request({
+    url: '/ecw/lading-template/create',
+    method: 'post',
+    data: data
+  })
+}
+
 // 更新仓库
 export function updateWarehouse(data) {
   return request({
@@ -80,6 +90,14 @@ export function changeRouteStatus(data) {
   })
 }
 
+export function getLadingTemplate(data) {
+  console.log(data);
+  return request({
+    url: '/ecw/lading-template/getByLineId?lineId='+data,
+    method: 'get'
+  })
+}
+
 /**查看已开通线路列表 */
 export function openedRouterList(data = {}) {
   return request({

src/utils/dict.js

@@ -91,6 +91,7 @@ export const DICT_TYPE = {
   ECW_TRADE_TYPE: 'trade_type', // 交货放肆
   ECW_OFFER_RESULT: 'offer_result', //  报单结果 赢单 输单
   ECW_WAREHOUSING_TYPE: 'warehousing_type', //  入仓类型
+  ECW_OFFER_STATUS: 'offer_status', // 销售阶段（报价单）
   //--------ecw---------
   CUSTOMER_STATUS: 'customer_status',
   CUSTOMER_SOURCE: 'customer_source',

src/views/ecw/warehouse/index.vue

@@ -108,6 +108,8 @@
           <template slot-scope="scope">
             <el-button size="mini" type="text" @click="routeStatusClick(scope.row)"
                       v-hasPermi="['ecw:warehouse:routerQuery']">{{scope.row.lineId ? '关闭线路' : '开通线路'}}</el-button>
+            <el-button size="mini" type="primary" @click="templateClick(scope.row)" v-if="scope.row.lineId != null"
+                       v-hasPermi="['ecw:warehouse:routerQuery']">设置路线提单模板</el-button>
           </template>
         </el-table-column>
      </el-table>
@@ -245,11 +247,77 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog title="设置路线提单模板" :visible.sync="templateOpen" width="1000px" append-to-body>
+      <el-form ref="form" :model="ladingform" :rules="rules" label-width="80px">
+        <el-form-item label="货柜前缀" prop="prefixCounter">
+          <el-input v-model="ladingform.prefixCounter" placeholder="请输入货柜前缀" />
+        </el-form-item>
+        <el-form-item label="抬头" prop="titleZh">
+          <editor v-model="ladingform.titleZh" :min-height="192"/>
+        </el-form-item>
+
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>账户详情</span>
+            <el-button style="float: right;" size="small" type="primary" @click="handleAddAccount">添加账户+</el-button>
+          </div>
+          <el-table
+            :data="arr"
+            style="width: 100%"
+          >
+            <el-table-column
+              prop="detail"
+              label="详情"
+              width=""
+            >
+              <template v-slot="{ row, column, $index }">
+                <el-input v-model="row.detail" placeholder="请输入详情" size="mini"/>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="名称"
+              width=""
+            >
+              <template v-slot="{row}">
+                <el-input v-model="row.name" placeholder="请输入名称" size="mini"/>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="company"
+              label="公司"
+            >
+              <template v-slot="{row}">
+                <el-input v-model="row.company" placeholder="请输入公司" size="mini"/>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="operate"
+              label="操作"
+            >
+              <template slot-scope="scope">
+                <el-button type="danger" @click="delRow(scope.$index)">删除</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
+
+        <el-form-item label="条款" prop="contentZh">
+          <editor v-model="ladingform.contentZh" :min-height="192"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitTemplateForm">保 存</el-button>
+        <el-button @click="resetTemplate()">重 置</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { createWarehouse, updateWarehouse, deleteWarehouse, getWarehouse, getWarehousePage,
+import { createWarehouse, updateWarehouse, deleteWarehouse, getWarehouse, getWarehousePage,createTemplate,getLadingTemplate,
 exportWarehouseExcel,routerList,changeRouteStatus,deptBind,deptList } from "@/api/ecw/warehouse";
 import { getNodePage } from "@/api/ecw/node";
 import { getListTree } from "@/api/ecw/region";
@@ -257,11 +325,15 @@ import { getDictDatas, DICT_TYPE } from '@/utils/dict'
 import {CommonStatusEnum} from '@/utils/constants'
 import { uploadFile } from "@/api/infra/file";
 import { listDept } from "@/api/system/dept";
+import Editor from '@/components/Editor';
 import { has } from 'min-dash';
+import Template from "../../cms/template/index";
 
 export default {
   name: "Warehouse",
   components: {
+      Template,
+      Editor
   },
   data() {
 
@@ -315,6 +387,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      templateOpen:false,
       dateRangeCreateTime: [],
 
       isUpdate: false,
@@ -331,7 +404,8 @@ export default {
         id: null,
         tradeType: null
       },
-
+      arr:[],
+        cols:[{prop:"detail",label:"详情"},{prop:"name",label:"名称"},{prop:"company",label:"公司"},{prop:"operate",label:"操作"}],
       // 查询参数
       queryParams: {
         pageNo: 1,
@@ -356,6 +430,7 @@ export default {
       },
       // 表单参数
       form: {checkList:[],},
+      ladingform: {prefixCounter:null,titleZh:null,contentZh:null,account:null,acctArr:[]},
       // 表单校验
       rules: {
         nodeId: [{ required: true, message: "服务网点不能为空", trigger: "blur" }],
@@ -446,6 +521,16 @@ export default {
       });
     },
 
+      delRow(index){
+          this.arr.splice(index, 1);
+      },
+
+    handleAddAccount(){
+        const obj = {"detail": "",
+            "name": "",
+            "company": ""};
+        this.arr.push(obj)
+    },
     /** 查询部门列表 */
     getDeptList() {
       listDept(this.queryParams).then(response => {
@@ -556,6 +641,21 @@ export default {
       });
     },
 
+      templateClick(row) {
+          getLadingTemplate(row.lineId).then(response => {
+              if(response.data!=null){
+                  this.ladingform = response.data;
+                  var jsonArr = JSON.parse(response.data.account);
+                  for (var i in jsonArr) {
+                      this.arr.push(jsonArr[i]);
+
+                  }
+              }
+          });
+          this.templateOpen = true;
+          this.ladingform.lineId = row.lineId;
+      },
+
     routeStatusClick(row) {
       this.routeQueryParam.transportType = row.transportType;
       this.routeQueryParam.warehouseId = row.id;
@@ -650,6 +750,14 @@ export default {
       this.open = false;
       this.reset();
     },
+    resetTemplate(){
+        this.ladingform={
+            prefixCounter:undefined,
+            titleZh:undefined,
+            account:undefined,
+            contentZh:undefined
+        }
+    },
     /** 表单重置 */
     reset() {
       this.form = {
@@ -766,6 +874,16 @@ export default {
         });
       });
     },
+
+      submitTemplateForm(){
+        console.log(this.arr);
+        this.ladingform.account = JSON.stringify(this.arr);
+          createTemplate(this.ladingform).then(response => {
+              this.$modal.msgSuccess("设置路线提单模板成功");
+              this.templateOpen = false;
+              this.arr = [];
+          });
+      },
     /** 删除按钮操作 */
     handleDelete(row) {
       const id = row.id;