Merge branch 'dev' of git.echepei.com:caojunjie/Smart_platform_ui into dev

src/components/collection/config/mainList.json

@@ -0,0 +1,152 @@
+{
+  "searchShow": true,
+  "searchMenuSpan": 8,
+  "border": true,
+  "index": true,
+  "viewBtn": false,
+  "editBtn": false,
+  "delBtn": false,
+  "addBtn": false,
+  "headerAlign": "center",
+  "menuWidth": "70",
+  "showSummary": true,
+  "searchIcon": true,
+  "searchIndex": 2,
+  "selection": true,
+  "tip": false,
+  "column": [
+    {
+        "index": 1,
+        "prop": "corpid",
+        "label": "客户名称",
+        "overHidden": true,
+        "width": 260
+    },
+    {
+        "index": 2,
+        "prop": "feeid",
+        "label": "费用名称",
+        "overHidden": true,
+        "width": 200
+    },
+    {
+        "index": 3,
+        "prop": "feeUnitid",
+        "label": "计价单位",
+        "overHidden": true,
+        "width": 130
+    },
+    {
+        "index": 4,
+        "prop": "qty",
+        "label": "数量",
+        "overHidden": true,
+        "width": 80
+    },
+    {
+        "index": 5,
+        "prop": "unitprice",
+        "label": "单价",
+        "overHidden": true,
+        "width": 80
+    },
+    {
+        "index": 6,
+        "prop": "amount",
+        "label": "金额",
+        "overHidden": true,
+        "width": 130
+    },
+    {
+        "index": 7,
+        "prop": "stltypeid",
+        "label": "结算方式",
+        "overHidden": true,
+        "width": 100
+    },
+    {
+        "index": 8,
+        "prop": "currency",
+        "label": "币别",
+        "overHidden": true,
+        "width": 100
+    },
+    {
+        "index": 9,
+        "prop": "exrate",
+        "label": "汇率",
+        "overHidden": true,
+        "width": 80
+    },
+    {
+        "index": 10,
+        "prop": "taxrate",
+        "label": "税率",
+        "overHidden": true,
+        "width": 80
+    },
+    {
+        "index": 11,
+        "prop": "businessType",
+        "label": "作业类型",
+        "overHidden": true,
+        "width": 180
+    },
+    {
+        "index": 12,
+        "prop": "mblno",
+        "label": "提单号",
+        "overHidden": true,
+        "width": 150
+    },
+    {
+        "index": 13,
+        "prop": "productName",
+        "label": "品名",
+        "overHidden": true,
+        "width": 140
+    },
+    {
+        "index": 14,
+        "prop": "marks",
+        "label": "品牌",
+        "overHidden": true,
+        "width": 130
+    },
+    {
+        "index": 15,
+        "prop": "srcTypeId",
+        "label": "来源",
+        "overHidden": true,
+        "width": 130
+    },
+    {
+        "index": 16,
+        "prop": "accamount",
+        "label": "对账金额",
+        "overHidden": true,
+        "width": 130
+    },
+    {
+        "index": 17,
+        "prop": "stlamount",
+        "label": "结算金额",
+        "overHidden": true,
+        "width": 130
+    },
+    {
+        "index": 18,
+        "prop": "stlamountDate",
+        "label": "结算日期",
+        "overHidden": true,
+        "width": 130
+    },
+    {
+        "index": 19,
+        "prop": "remark",
+        "label": "备注",
+        "overHidden": true,
+        "width": 150
+    }
+]
+}

src/components/collection/main.vue

@@ -0,0 +1,102 @@
+<template>
+    <div class="customer-main">
+        <trade-card title="入库明细">
+            <avue-crud ref="crud" :data="data" :option="tableOption" @row-del="rowDel" @saveColumn="saveColumn"
+                @resetColumn="resetColumn" :cell-style="cellStyle">
+            </avue-crud>
+        </trade-card>
+    </div>
+</template>
+
+<script>
+import tableOption from "./config/mainList.json";
+export default {
+    name: "detailsPageEdit",
+    data() {
+        return {
+            treeStyle: "height:" + (window.innerHeight - 315) + "px",
+            tableOption: {},
+            data: [],
+        };
+    },
+    props: {
+        detailData: {
+            type: Object
+        }
+    },
+    async created() {
+        if (this.detailData.id) {
+            this.getDetail(this.detailData.id);
+        }
+        this.tableOption = await this.getColumnData(
+            this.getColumnName(162),
+            tableOption
+        );
+
+    },
+    methods: {
+        cellStyle() {
+            return "padding:0;height:40px;";
+        },
+        addRow() {
+            this.data.push({ $cellEdit: true });
+        },
+        rowCell(row, index) {
+            if (row.$cellEdit == true) {
+                this.$set(row, "$cellEdit", false);
+            } else {
+                this.$set(row, "$cellEdit", true);
+            }
+        },
+        rowDel(row) {
+            this.$confirm("确定删除数据?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(() => {
+                this.$message({
+                    type: "success",
+                    message: "删除成功!"
+                });
+                this.data.splice(row.$index, 1);
+            });
+        },
+        async saveColumn() {
+            const inSave = await this.saveColumnData(
+                this.getColumnName(162),
+                this.tableOption
+            );
+            if (inSave) {
+                this.$nextTick(() => {
+                    this.$refs.crud.doLayout();
+                });
+                this.$message.success("保存成功");
+                //关闭窗口
+                this.$refs.crud.$refs.dialogColumn.columnBox = false;
+            }
+        },
+        async resetColumn() {
+            this.tableOption = tableOption;
+            const inSave = await this.delColumnData(
+                this.getColumnName(162),
+                tableOption
+            );
+            if (inSave) {
+                this.$nextTick(() => {
+                    this.$refs.crud.doLayout();
+                });
+                this.$message.success("重置成功");
+                //关闭窗口
+                setTimeout(() => {
+                    this.$refs.crud.$refs.dialogColumn.columnBox = false;
+                }, 1000);
+            }
+        }
+    },
+    watch: {
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+</style>

src/router/views/index.js

@@ -1485,4 +1485,60 @@ export default [{
       component: () => import( /* webpackChunkName: "views" */ '@/views/dealer/purchaseContract/index')
     }]
   },
+  {
+    path: '/warehousing/inStock/index',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: '/warehousing/inStock/index',
+      name: '入库',
+      meta: {
+        i18n: '/warehousing/inStock/index',
+        keepAlive: true,
+      },
+      component: () => import( /* webpackChunkName: "views" */ '@/views/warehousing/inStock/index')
+    }]
+  },
+  {
+    path: '/warehousing/outStock/index',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: '/warehousing/outStock/index',
+      name: '出库',
+      meta: {
+        i18n: '/warehousing/outStock/index',
+        keepAlive: true,
+      },
+      component: () => import( /* webpackChunkName: "views" */ '@/views/warehousing/outStock/index')
+    }]
+  },
+  {
+    path: '/warehousing/stockTransfer/index',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: '/warehousing/stockTransfer/index',
+      name: '调拨',
+      meta: {
+        i18n: '/warehousing/stockTransfer/index',
+        keepAlive: true,
+      },
+      component: () => import( /* webpackChunkName: "views" */ '@/views/warehousing/stockTransfer/index')
+    }]
+  },
+  {
+    path: '/warehousing/goodsTransfer/index',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: '/warehousing/goodsTransfer/index',
+      name: '货转',
+      meta: {
+        i18n: '/warehousing/goodsTransfer/index',
+        keepAlive: true,
+      },
+      component: () => import( /* webpackChunkName: "views" */ '@/views/warehousing/goodsTransfer/index')
+    }]
+  },
 ]

src/views/basicData/customerInformation/detailsPageEdit.vue

@@ -3,81 +3,33 @@
     <div class="customer-head">
       <div class="customer-back">
         <!--        <i class="back-icon el-icon-arrow-left"></i><i style="font-style:normal">返回管理列表</i>-->
-        <el-button
-          type="danger"
-          style="border: none;background: none;color: red"
-          icon="el-icon-arrow-left"
-          @click="backToList"
-          >返回列表
+        <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
+          @click="backToList">返回列表
         </el-button>
       </div>
       <div class="add-customer-btn">
-        <el-button
-          type="primary"
-          @click="synchronization"
-          size="small"
-          :disabled="!form.id"
-          >同 步
+        <el-button type="primary" @click="synchronization" size="small" :disabled="!form.id">同 步
         </el-button>
-        <el-button
-          type="primary"
-          @click="openFlow"
-          size="small"
-          :disabled="!form.id"
-          >审 核
+        <el-button type="primary" @click="openFlow" size="small" :disabled="!form.id">审 核
         </el-button>
-        <el-button
-          type="primary"
-          :disabled="disabled"
-          @click="editCustomer"
-          size="small"
-          >{{ form.id ? "确认修改" : "确认新增" }}
+        <el-button type="primary" :disabled="disabled" @click="editCustomer" size="small">{{ form.id ? "确认修改" : "确认新增"
+        }}
         </el-button>
       </div>
     </div>
     <div class="customer-main">
-      <el-form
-        :model="form"
-        ref="form"
-        label-width="100px"
-        class="demo-ruleForm"
-      >
+      <el-form :model="form" ref="form" label-width="100px" class="demo-ruleForm">
         <containerTitle title="基础资料"></containerTitle>
         <basic-container>
           <el-row>
-            <el-col
-              v-for="(item, index) in basicData.column"
-              :key="index"
-              :span="item.span ? item.span : 8"
-            >
-              <el-form-item
-                :label="item.label"
-                :prop="item.prop"
-                :rules="item.rules"
-              >
-                <avue-input-tree
-                  v-if="item.prop === 'corpsTypeId'"
-                  leaf-only
-                  multiple
-                  style="width: 100%;"
-                  size="small"
-                  :props="{ label: 'title' }"
-                  v-model="form[item.prop]"
-                  placeholder=" "
-                  type="tree"
-                  :dic="dic"
-                ></avue-input-tree>
-                <el-cascader
-                  v-else-if="item.prop === 'belongtoarea'"
-                  v-model="form[item.prop]"
-                  collapse-tags
-                  :options="dicArea"
-                  :props="props"
-                  size="small"
-                  style="width: 100%;"
-                  :show-all-levels="false"
-                  @change="addressChange"
-                ></el-cascader>
+            <el-col v-for="(item, index) in basicData.column" :key="index" :span="item.span ? item.span : 8">
+              <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
+                <avue-input-tree v-if="item.prop === 'corpsTypeId'" leaf-only multiple style="width: 100%;" size="small"
+                  :props="{ label: 'title' }" v-model="form[item.prop]" placeholder=" " type="tree" :dic="dic">
+                </avue-input-tree>
+                <el-cascader v-else-if="item.prop === 'belongtoarea'" v-model="form[item.prop]" collapse-tags
+                  :options="dicArea" :props="props" size="small" style="width: 100%;" :show-all-levels="false"
+                  @change="addressChange"></el-cascader>
                 <!--                <avue-input-tree-->
                 <!--                  v-else-if="item.prop === 'belongtoarea'"-->
                 <!--                  leaf-only-->
@@ -91,51 +43,21 @@
                 <!--                  type="tree"-->
                 <!--                  :dic="dicArea"-->
                 <!--                ></avue-input-tree>-->
-                <el-select
-                  v-else-if="item.prop === 'adminProfiles'"
-                  size="small"
-                  style="width: 100%;"
-                  v-model="form[item.prop]"
-                  multiple
-                  placeholder=""
-                >
-                  <el-option
-                    v-for="item in userList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
-                  >
+                <el-select v-else-if="item.prop === 'adminProfiles'" size="small" style="width: 100%;"
+                  v-model="form[item.prop]" multiple placeholder="">
+                  <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id">
                   </el-option>
                 </el-select>
-                <el-select
-                  v-else-if="item.prop === 'creditRating'"
-                  size="small"
-                  style="width: 100%;"
-                  v-model="form[item.prop]"
-                  placeholder=""
-                >
-                  <el-option
-                    v-for="item in creditRatingList"
-                    :key="item.id"
-                    :label="item.dictValue"
-                    :value="item.dictValue"
-                  >
+                <el-select v-else-if="item.prop === 'creditRating'" size="small" style="width: 100%;"
+                  v-model="form[item.prop]" placeholder="">
+                  <el-option v-for="item in creditRatingList" :key="item.id" :label="item.dictValue"
+                    :value="item.dictValue">
                   </el-option>
                 </el-select>
-                <crop-select
-                  v-else-if="item.prop === 'belongtocompany'"
-                  v-model="form[item.prop]"
-                  @getCorpData="getCorpName"
-                  corpType="GS"
-                ></crop-select>
-                <el-input
-                  type="age"
-                  v-else
-                  v-model="form[item.prop]"
-                  size="small"
-                  autocomplete="off"
-                  :disabled="item.disabled"
-                ></el-input>
+                <crop-select v-else-if="item.prop === 'belongtocompany'" v-model="form[item.prop]"
+                  @getCorpData="getCorpName" corpType="GS"></crop-select>
+                <el-input type="age" v-else v-model="form[item.prop]" size="small" autocomplete="off"
+                  :disabled="item.disabled"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -143,22 +65,9 @@
         <containerTitle title="联系方式"></containerTitle>
         <basic-container>
           <el-row>
-            <el-col
-              v-for="(item, index) in contactInformation.column"
-              :key="index"
-              :span="item.span ? item.span : 8"
-            >
-              <el-form-item
-                :label="item.label"
-                :prop="item.prop"
-                :rules="item.rules"
-              >
-                <el-input
-                  type="age"
-                  v-model="form[item.prop]"
-                  size="small"
-                  autocomplete="off"
-                ></el-input>
+            <el-col v-for="(item, index) in contactInformation.column" :key="index" :span="item.span ? item.span : 8">
+              <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
+                <el-input type="age" v-model="form[item.prop]" size="small" autocomplete="off"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
@@ -166,87 +75,41 @@
         <containerTitle title="财务资料"></containerTitle>
         <basic-container>
           <el-row>
-            <el-col
-              v-for="(item, index) in financialInformation.column"
-              :key="index"
-              :span="item.span ? item.span : 8"
-            >
-              <el-form-item
-                :label="item.label"
-                :prop="item.prop"
-                :rules="item.rules"
-              >
-                <el-switch
-                  v-if="item.prop === 'creditstatus'"
-                  v-model="form[item.prop]"
-                  active-value="0"
-                  inactive-value="1"
-                  active-text="开启"
-                  inactive-text="关闭"
-                >
+            <el-col v-for="(item, index) in financialInformation.column" :key="index" :span="item.span ? item.span : 8">
+              <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules" v-if="!item.hide">
+                <el-switch v-if="item.prop === 'creditstatus'" v-model="form[item.prop]" active-value="0"
+                  inactive-value="1" active-text="开启" inactive-text="关闭">
                 </el-switch>
-                <el-select
-                  v-else-if="item.prop === 'paymentType'"
-                  v-model="form[item.prop]"
-                  clearable
-                  filterable
-                  size="small"
-                  style="width: 100%;"
-                >
-                  <el-option
-                    v-for="(item, index) in paymentOption"
-                    :key="index"
-                    :label="item.dictValue"
-                    :value="item.dictValue"
-                  ></el-option>
+                <el-select v-else-if="item.prop === 'paymentType'" v-model="form[item.prop]" clearable filterable
+                  size="small" style="width: 100%;">
+                  <el-option v-for="(item, index) in paymentOption" :key="index" :label="item.dictValue"
+                    :value="item.dictValue"></el-option>
                 </el-select>
-                <el-select
-                  v-else-if="item.prop === 'packageRemarks'"
-                  v-model="form[item.prop]"
-                  clearable
-                  filterable
-                  size="small"
-                  style="width: 100%;"
-                >
-                  <el-option
-                    v-for="(item, index) in packageOptions"
-                    :key="index"
-                    :label="item.dictValue"
-                    :value="item.dictValue"
-                  ></el-option>
+                <el-select v-else-if="item.prop === 'packageRemarks'" v-model="form[item.prop]" clearable filterable
+                  size="small" style="width: 100%;">
+                  <el-option v-for="(item, index) in packageOptions" :key="index" :label="item.dictValue"
+                    :value="item.dictValue"></el-option>
                 </el-select>
-                <el-input
-                  v-else
-                  type="age"
-                  v-model="form[item.prop]"
-                  size="small"
-                  autocomplete="off"
-                ></el-input>
+                <el-select v-else-if="item.prop === 'a'" v-model="form[item.prop]" clearable filterable size="small"
+                  style="width: 100%;" @change="aChange">
+                  <el-option v-for="(item, index) in settingOption" :key="index" :label="item.dictValue"
+                    :value="item.dictValue"></el-option>
+                </el-select>
+                <el-date-picker v-else-if="item.prop === 'c'" v-model="form[item.prop]" type="month" size="small"
+                  format="yyyy年MM月05日" value-format="yyyy-MM-05" placeholder="请选择月" style="width: 100%;">
+                </el-date-picker>
+                <el-input v-else type="age" v-model="form[item.prop]" size="small" autocomplete="off"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
         </basic-container>
         <containerTitle title="客户联系人"></containerTitle>
         <basic-container>
-          <avue-crud
-            ref="crud"
-            :option="customerContact"
-            v-model="contactsForm"
-            :data="contactsData"
-            @saveColumn="saveColumn"
-            @resetColumn="resetColumn"
-            @row-save="rowSave"
-            @row-update="rowUpdate"
-            @row-del="rowDel"
-          >
+          <avue-crud ref="crud" :option="customerContact" v-model="contactsForm" :data="contactsData"
+            @saveColumn="saveColumn" @resetColumn="resetColumn" @row-save="rowSave" @row-update="rowUpdate"
+            @row-del="rowDel">
             <template slot-scope="{ type, size, row }" slot="menu">
-              <el-button
-                icon="el-icon-check"
-                :size="size"
-                :type="type"
-                @click="creatingUsers(row)"
-                >创建用户</el-button
-              >
+              <el-button icon="el-icon-check" :size="size" :type="type" @click="creatingUsers(row)">创建用户</el-button>
             </template>
           </avue-crud>
         </basic-container>
@@ -263,65 +126,35 @@
         </basic-container> -->
         <containerTitle title="客户开户行"></containerTitle>
         <basic-container>
-          <avue-crud
-            ref="crud2"
-            :option="bankOfDeposit"
-            v-model="bankOfDepositForm"
-            :data="bankOfDepositData"
-            @saveColumn="saveColumn2"
-            @resetColumn="resetColumn2"
-            @row-save="rowSaveBankOfDeposit"
-            @row-update="rowUpdateBankOfDeposit"
-            @row-del="rowDelBankOfDeposit"
-          ></avue-crud>
+          <avue-crud ref="crud2" :option="bankOfDeposit" v-model="bankOfDepositForm" :data="bankOfDepositData"
+            @saveColumn="saveColumn2" @resetColumn="resetColumn2" @row-save="rowSaveBankOfDeposit"
+            @row-update="rowUpdateBankOfDeposit" @row-del="rowDelBankOfDeposit"></avue-crud>
         </basic-container>
         <containerTitle title="收发货地址"></containerTitle>
         <basic-container>
-          <avue-crud
-            ref="crud3"
-            :option="addressOption"
-            v-model="addressForm"
-            :data="addressData"
-            @saveColumn="saveColumn3"
-            @resetColumn="resetColumn3"
-            @row-save="rowSaveAddress"
-            @row-update="rowUpdateAddress"
-            @row-del="rowDelAddress"
-          ></avue-crud>
+          <avue-crud ref="crud3" :option="addressOption" v-model="addressForm" :data="addressData"
+            @saveColumn="saveColumn3" @resetColumn="resetColumn3" @row-save="rowSaveAddress"
+            @row-update="rowUpdateAddress" @row-del="rowDelAddress"></avue-crud>
         </basic-container>
       </el-form>
     </div>
     <flow-dialog :switchDialog="switchDialog" @onClose="onClose()">
       <template slot="content"> </template>
     </flow-dialog>
-    <el-dialog
-      title="同 步"
-      :visible.sync="dialogVisible"
-      append-to-body
-      width="60%"
-    >
+    <el-dialog title="同 步" :visible.sync="dialogVisible" append-to-body width="60%">
       <avue-form ref="formData" v-model="formData" :option="option">
       </avue-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="confirmSynchronization"
-          >确 定</el-button
-        >
+        <el-button type="primary" @click="confirmSynchronization">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog
-      title="创建用户"
-      :visible.sync="dialogVisibleBt"
-      append-to-body
-      width="60%"
-    >
+    <el-dialog title="创建用户" :visible.sync="dialogVisibleBt" append-to-body width="60%">
       <avue-form ref="formDataTwo" v-model="formDataTwo" :option="optionData">
       </avue-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisibleBt = false">取 消</el-button>
-        <el-button type="primary" @click="confirmSynchronizationTwo"
-          >确 定</el-button
-        >
+        <el-button type="primary" @click="confirmSynchronizationTwo">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -557,6 +390,7 @@ export default {
           {
             label: "账户名称",
             prop: "accountName",
+            span:8,
             rules: [
               {
                 required: false,
@@ -568,6 +402,7 @@ export default {
           {
             label: "开户银行",
             prop: "accountBank",
+            span:8,
             rules: [
               {
                 required: false,
@@ -579,6 +414,7 @@ export default {
           {
             label: "银行帐号",
             prop: "accountNo",
+            span:8,
             rules: [
               {
                 required: false,
@@ -590,6 +426,7 @@ export default {
           {
             label: "CNAPS",
             prop: "cnaps",
+            span:8,
             rules: [
               {
                 required: false,
@@ -601,6 +438,7 @@ export default {
           {
             label: "银行地址",
             prop: "localBankAddress",
+            span:8,
             rules: [
               {
                 required: false,
@@ -612,6 +450,7 @@ export default {
           {
             label: "外币账户名称",
             prop: "accountNameFcy",
+            span:8,
             rules: [
               {
                 required: false,
@@ -623,6 +462,7 @@ export default {
           {
             label: "外币开户银行",
             prop: "accountBankFcy",
+            span:8,
             rules: [
               {
                 required: false,
@@ -634,6 +474,7 @@ export default {
           {
             label: "外币银行账号",
             prop: "accountNoFcy",
+            span:8,
             rules: [
               {
                 required: false,
@@ -645,6 +486,7 @@ export default {
           {
             label: "Swift Code",
             prop: "swiftCode",
+            span:8,
             rules: [
               {
                 required: false,
@@ -656,6 +498,7 @@ export default {
           {
             label: "外币银行地址",
             prop: "foreignBankAddress",
+            span:8,
             rules: [
               {
                 required: false,
@@ -667,6 +510,7 @@ export default {
           {
             label: "授信状态",
             prop: "creditstatus",
+            span:8,
             rules: [
               {
                 required: false,
@@ -678,6 +522,7 @@ export default {
           {
             label: "授信等级",
             prop: "creditLevel",
+            span:8,
             rules: [
               {
                 required: false,
@@ -689,6 +534,7 @@ export default {
           {
             label: "授信额度",
             prop: "creditGrant",
+            span:8,
             rules: [
               {
                 required: false,
@@ -700,6 +546,7 @@ export default {
           {
             label: "授信天数",
             prop: "creditDay",
+            span:8,
             rules: [
               {
                 required: false,
@@ -711,6 +558,7 @@ export default {
           {
             label: "授信利率",
             prop: "creditRate",
+            span:8,
             rules: [
               {
                 required: false,
@@ -721,15 +569,60 @@ export default {
           },
           {
             label: "FOB系数",
+            span:8,
             prop: "coefficient"
           },
           {
             label: "付款方式",
+            span:8,
             prop: "paymentType"
           },
           {
             label: "包装要求",
+            span:8,
             prop: "packageRemarks"
+          },
+          {
+            label: "账期设置",
+            span:8,
+            prop: "a"
+          },
+          {
+            label: "天数",
+            span:8,
+            hide: true,
+            prop: "b"
+          },
+          {
+            label: "每月某日结清",
+            span:8,
+            hide: true,
+            prop: "c"
+          },
+          {
+            label: "日利息万分",
+            span:8,
+            prop: "d"
+          },
+          {
+            label: "最大欠款额",
+            span:8,
+            prop: "e"
+          },
+          {
+            label: "协议号",
+            span:8,
+            prop: "f"
+          },
+          {
+            label: "账期日期",
+            span:8,
+            prop: "g"
+          },
+          {
+            label: "账期备注",
+            span:24,
+            prop: "h"
           }
         ]
       },
@@ -863,6 +756,7 @@ export default {
         ]
       },
       paymentOption: [],
+      settingOption: [],
       addressOption: {},
       addressForm: {},
       addressData: [],
@@ -925,6 +819,9 @@ export default {
     this.getWorkDicts("payment_term").then(res => {
       this.paymentOption = res.data.data;
     });
+    this.getWorkDicts("account_period").then(res => {
+      this.settingOption = res.data.data;
+    });
     this.getWorkDicts("credit_rating").then(res => {
       this.creditRatingList = res.data.data;
     });
@@ -1058,6 +955,37 @@ export default {
         }
       });
     },
+    aChange(row) {
+      console.log(row)
+      if (row == '月结') {
+        this.financialInformation.column.forEach(e => {
+          if (e.prop == 'b') {
+            e.hide = true
+          }
+          if (e.prop == 'c') {
+            e.hide = false
+          }
+        })
+      } else if (row == '业务后') {
+        this.financialInformation.column.forEach(e => {
+          if (e.prop == 'b') {
+            e.hide = false
+          }
+          if (e.prop == 'c') {
+            e.hide = true
+          }
+        })
+      } else {
+        this.financialInformation.column.forEach(e => {
+          if (e.prop == 'b') {
+            e.hide = true
+          }
+          if (e.prop == 'c') {
+            e.hide = true
+          }
+        })
+      }
+    },
     creatingUsers(row) {
       if (row.id) {
         if (row.tel) {
@@ -1377,7 +1305,7 @@ export default {
     onClose(val) {
       this.switchDialog = val;
     },
-    getCorpName(row) {}
+    getCorpName(row) { }
   }
 };
 </script>

src/views/basicData/productInformation/detailsPageEdit.vue

@@ -2,21 +2,12 @@
   <div class="borderless">
     <div class="customer-head">
       <div class="customer-back">
-        <el-button
-            type="danger"
-            style="border: none;background: none;color: red"
-            icon="el-icon-arrow-left"
-            @click="backToList"
-        >返回列表
+        <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
+          @click="backToList">返回列表
         </el-button>
       </div>
-      <el-button
-          class="el-button--small-yh add-customer-btn"
-          type="primary"
-          :disabled="disabled"
-          @click="editProductInfo"
-          size="small"
-      >{{ form.id ? "确认修改" : "确认新增" }}
+      <el-button class="el-button--small-yh add-customer-btn" type="primary" :disabled="disabled"
+        @click="editProductInfo" size="small">{{ form.id ? "确认修改" : "确认新增" }}
       </el-button>
     </div>
     <div style="margin-top: 60px">
@@ -24,114 +15,50 @@
       <basic-container style="margin-bottom: 10px">
         <avue-form ref="form" v-model="form" :option="option">
           <template slot="goodsTypeId" slot-scope="scope">
-            <avue-input-tree
-                v-model="form.goodsTypeId"
-                :props="{ label: 'title', value: 'id' }"
-                multiple
-                placeholder=" "
-                type="tree"
-                :dic="dicData"
-            />
+            <avue-input-tree v-model="form.goodsTypeId" :props="{ label: 'title', value: 'id' }" multiple
+              placeholder=" " type="tree" :dic="dicData" />
           </template>
           <template slot="corpId" slot-scope="scope">
-            <selectComponent
-                v-model="form.corpId"
-                :configuration="configuration"
-                style="width: 100%"
-                typeData="GYS"
-            />
+            <selectComponent v-model="form.corpId" :configuration="configuration" style="width: 100%" typeData="GYS" />
           </template>
           <template slot="artsVision">
-            <crop-select
-                v-model="form.artsVision"
-                @getCorpData="getCorpName"
-                @getCorpList="getCorpList"
-                corpType="GS"
-                :multiple="true"
-                :collapseTags="true"
-            ></crop-select>
+            <crop-select v-model="form.artsVision" @getCorpData="getCorpName" @getCorpList="getCorpList" corpType="GS"
+              :multiple="true" :collapseTags="true"></crop-select>
           </template>
           <template slot="brand">
-            <el-select
-                v-model="form.brand"
-                clearable
-                filterable
-                placeholder="请选择 品牌"
-            >
-              <el-option
-                  v-for="(item, index) in brandOption"
-                  :key="index"
-                  :label="item.dictValue"
-                  :value="item.dictValue"
-              />
+            <el-select v-model="form.brand" clearable filterable placeholder="请选择 品牌">
+              <el-option v-for="(item, index) in brandOption" :key="index" :label="item.dictValue"
+                :value="item.dictValue" />
             </el-select>
           </template>
           <template slot="cntrVolumn">
-            <el-input
-                v-input-limit="2"
-                v-model="form.cntrVolumn"
-                clearable
-                placeholder="请输入 箱立方"
-            ></el-input>
+            <el-input v-input-limit="2" v-model="form.cntrVolumn" clearable placeholder="请输入 箱立方"></el-input>
           </template>
           <template slot="cartonWeight">
-            <el-input
-                v-input-limit="2"
-                v-model="form.cartonWeight"
-                clearable
-                placeholder="请输入 箱重量"
-            >
+            <el-input v-input-limit="2" v-model="form.cartonWeight" clearable placeholder="请输入 箱重量">
               <template slot="append">kg</template>
             </el-input>
           </template>
           <template slot="integralMultiples">
-            <el-input
-                v-input-limit="2"
-                v-model="form.integralMultiples"
-                clearable
-                placeholder="请输入 积分倍数"
-            ></el-input>
+            <el-input v-input-limit="2" v-model="form.integralMultiples" clearable placeholder="请输入 积分倍数"></el-input>
           </template>
           <template slot="integral">
-            <el-input
-                v-input-limit="2"
-                v-model="form.integral"
-                clearable
-                placeholder="请输入 兑换积分"
-            ></el-input>
+            <el-input v-input-limit="2" v-model="form.integral" clearable placeholder="请输入 兑换积分"></el-input>
           </template>
           <template slot="batch">
-            <el-switch
-                v-model="form.batch"
-                active-text="是"
-                inactive-text="否"
-                :active-value="1"
-                :inactive-value="0"
-            />
+            <el-switch v-model="form.batch" active-text="是" inactive-text="否" :active-value="1" :inactive-value="0" />
           </template>
           <template slot="unit">
-            <el-select
-                v-model="form.unit"
-                clearable
-                filterable
-                placeholder="请选择 计量单位"
-            >
-              <el-option
-                  v-for="(item, index) in unitOption"
-                  :key="index"
-                  :label="item.dictValue"
-                  :value="item.dictValue"
-              />
+            <el-select v-model="form.unit" clearable filterable placeholder="请选择 计量单位">
+              <el-option v-for="(item, index) in unitOption" :key="index" :label="item.dictValue"
+                :value="item.dictValue" />
             </el-select>
           </template>
         </avue-form>
       </basic-container>
       <containerTitle title="主图附件"></containerTitle>
-      <c-upload
-          :data="bankOfDepositData"
-          display
-          deleteUrl="/api/blade-client/goodsfiles/delete"
-          :enumerationValue="160"/>
+      <c-upload :data="bankOfDepositData" display deleteUrl="/api/blade-client/goodsfiles/delete"
+        :enumerationValue="160" />
     </div>
   </div>
 </template>
@@ -157,9 +84,9 @@ export default {
         placeholder: "请点击右边按钮选择",
         dicData: []
       },
-      optionTwo:[],
+      optionTwo: [],
       form: {},
-      bankOfDepositData:[],
+      bankOfDepositData: [],
       disabled: false,
       userDialog: false, //供应商导入窗口
       dicData: [],
@@ -394,6 +321,11 @@ export default {
             span: 8
           },
           {
+            label: "销售价浮动系数",
+            prop: "coefficient",
+            span: 8
+          },
+          {
             label: "备注",
             prop: "remarks",
             type: "textarea",
@@ -492,7 +424,7 @@ export default {
           }
           const params = {
             ...this.form,
-            filesList:this.bankOfDepositData,
+            filesList: this.bankOfDepositData,
             type: 0
           };
           this.openFullScreen(false, '正在努力的加载...');

src/views/warehousing/goodsTransfer/config/customerContact.json

@@ -14,204 +14,194 @@
   "column": [
     {
       "index": 1,
-      "prop": "billstatus",
-      "label": "状态",
+      "prop": "goodsids",
+      "label": "品名",
+      "overHidden": true,
       "width": 100
     },
     {
       "index": 2,
-      "prop": "bsdate",
-      "label": "入库日期",
-      "width": 100
+      "prop": "billstatus",
+      "label": "状态",
+      "overHidden": true,
+      "width": 80,
+      "fixed": "left"
     },
     {
       "index": 3,
-      "prop": "mblno",
-      "label": "提单号",
-      "checked": 1,
-      "width": 100
+      "prop": "bsdate",
+      "label": "货转日期",
+      "overHidden": true,
+      "width": 200,
+      "fixed": "left"
     },
     {
       "index": 4,
-      "prop": "goodsid",
-      "label": "品名",
-      "width": 100
+      "prop": "marks",
+      "label": "品牌",
+      "overHidden": true,
+      "width": 200,
+      "fixed": "left"
     },
     {
       "index": 5,
       "prop": "businessType",
       "label": "货物属性",
+      "overHidden": true,
       "width": 100
     },
     {
       "index": 6,
       "prop": "marks",
       "label": "属性详情",
+      "overHidden": true,
       "width": 100
     },
     {
       "index": 7,
-      "prop": "warehouseInformation",
-      "label": "库区",
+      "prop": "mblno",
+      "label": "提单号",
+      "overHidden": true,
       "width": 100
     },
     {
       "index": 8,
-      "prop": "cntrtype",
-      "label": "箱型",
-      "width": 100
+      "prop": "orgwarehouseInformation",
+      "label": "库位",
+      "overHidden": true,
+      "width": 150
     },
     {
       "index": 9,
-      "prop": "cntqty",
-      "label": "箱量",
+      "prop": "originalbillno",
+      "label": "原始入库单号",
+      "overHidden": true,
       "width": 100
     },
     {
       "index": 10,
       "prop": "planqty",
-      "label": "计划件数",
-      "checked": 1,
+      "label": "结余件数",
+      "overHidden": true,
       "width": 100
     },
     {
       "index": 11,
       "prop": "plangrossweight",
-      "label": "计划毛重",
-      "checked": 1,
-      "width": 100
+      "label": "库存毛重(kg)",
+      "overHidden": true,
+      "width": 120
     },
     {
       "index": 12,
       "prop": "plannetweight",
-      "label": "计划净重",
-      "checked": 1,
-      "width": 100
+      "label": "库存净重(kg)",
+      "overHidden": true,
+      "width": 120
     },
     {
       "index": 13,
       "prop": "qty",
-      "label": "入库件数",
+      "label": "货转件数",
+      "overHidden": true,
       "width": 100
     },
     {
       "index": 14,
       "prop": "grossweight",
-      "label": "入库毛重(kg)",
+      "label": "货转毛重(kg)",
+      "overHidden": true,
       "width": 120
     },
     {
       "index": 15,
       "prop": "netweight",
-      "label": "入库净重(kg)",
+      "label": "货转净重(kg)",
+      "overHidden": true,
       "width": 120
     },
     {
       "index": 16,
-      "prop": "actualWeight",
-      "label": "溢短重(kg)",
-      "width": 120
+      "prop": "cntqty",
+      "label": "箱量",
+      "overHidden": true,
+      "width": 100
     },
     {
       "index": 17,
-      "prop": "packagespecs",
-      "label": "包装规格",
+      "prop": "cntrno",
+      "label": "箱号",
+      "overHidden": true,
       "width": 100
     },
     {
       "index": 18,
-      "prop": "elabel",
-      "label": "电子标签",
+      "prop": "packagespecs",
+      "label": "包装规格",
+      "overHidden": true,
       "width": 100
     },
     {
       "index": 19,
-      "prop": "fleet",
-      "label": "车队",
+      "prop": "shipper",
+      "label": "发货方",
+      "overHidden": true,
       "width": 100
     },
     {
       "index": 20,
-      "prop": "truckno",
-      "label": "车号",
-      "width": 100
-    },
-    {
-      "index": 21,
-      "prop": "driverName",
-      "label": "司机名称",
-      "width": 100
-    },
-    {
-      "index": 22,
-      "prop": "driverTel",
-      "label": "司机电话",
-      "width": 100
-    },
-    {
-      "index": 23,
-      "prop": "driverIdCar",
-      "label": "司机身份证",
-      "width": 120
-    },
-    {
-      "index": 24,
-      "prop": "serialNumber",
-      "label": "流水号",
-      "width": 100
-    },
-    {
-      "index": 25,
-      "prop": "cntrno",
-      "label": "箱号",
-      "width": 100
-    },
-    {
-      "index": 26,
       "prop": "lntype",
       "label": "装卸方式",
+      "overHidden": true,
       "width": 100
     },
     {
-      "index": 27,
+      "index": 21,
       "prop": "forkliftman",
       "label": "叉车工",
+      "overHidden": true,
       "width": 100
     },
     {
-      "index": 28,
+      "index": 22,
       "prop": "stevedore",
       "label": "装卸工",
+      "overHidden": true,
       "width": 100
     },
     {
-      "index": 29,
+      "index": 23,
       "prop": "localcntrno",
       "label": "库内箱号",
+      "overHidden": true,
       "width": 100
     },
     {
-      "index": 30,
+      "index": 24,
       "prop": "sealno",
       "label": "封号",
+      "overHidden": true,
       "width": 100
     },
     {
-      "index": 31,
+      "index": 25,
       "prop": "goodsval",
       "label": "货值",
+      "overHidden": true,
       "width": 100
     },
     {
-      "index": 32,
-      "prop": "chargedate",
-      "label": "仓储费日期",
+      "index": 26,
+      "prop": "remark",
+      "label": "备注",
+      "overHidden": true,
       "width": 100
     },
     {
-      "index": 33,
-      "prop": "remark",
-      "label": "备注",
+      "index": 27,
+      "prop": "elabel",
+      "label": "电子标签",
+      "overHidden": true,
       "width": 100
     }
   ]

src/views/warehousing/goodsTransfer/detailsPage.vue

@@ -49,83 +49,83 @@ export default {
           {
             label: "提单号",
             prop: "mblno",
-            span: 8
+            span: 6
           },
           {
             label: "客户名称",
             prop: "corpid",
-            span: 8
+            span: 6
           },
           {
             label: "新客户名称",
             prop: "tocorpid",
-            span: 8
+            span: 6
           },
           {
             label: "货转日期",
             prop: "bsdate",
-            span: 8
+            span: 6
           },
           {
             label: "仓储费日期",
             prop: "chargedate",
-            span: 8
+            span: 6
           },
           {
             label: "仓库",
             prop: "warehouseid",
-            span: 8
+            span: 6
           },
           {
             label: "结算方式",
             prop: "stltypeid",
-            span: 8
+            span: 6
           },
 
           {
             label: "计费单位",
             prop: "feetUnit",
-            span: 8
+            span: 6
           },
           {
             label: "贸易方式",
             prop: "trademodeid",
-            span: 8
+            span: 6
           },
           {
             label: "业务编号",
             prop: "billno",
-            span: 8
+            span: 6
           },
           {
             label: "原始入库单号",
             prop: "originalbillno",
-            span: 8
+            span: 6
           },
           {
             label: "原始入库日期",
             prop: "orgStorageDate",
-            span: 8
+            span: 6
           },
           {
             label: "品牌",
             prop: "marks",
-            span: 8
+            span: 6
           },
           {
             label: "品名",
             prop: "productName",
-            span: 8
+            span: 6
           },
           {
             label: "制单人",
             prop: "createBy",
-            span: 8
+            span: 6
           },
           {
             label: "打印抬头",
             prop: "company",
-            span: 8
+            span: 6
           }
         ]
       },

src/views/warehousing/inStock/detailsPage.vue

@@ -49,158 +49,158 @@ export default {
           {
             label: "客户名称",
             prop: "corpid",
-            span: 8
+            span: 6
           },
           {
             label: "提单号",
             prop: "mblno",
-            span: 8
+            span: 6
           },
           {
             label: "单据编号",
             prop: "billno",
-            span: 8
+            span: 6
           },
           {
             label: "计划日期",
             prop: "bsdate",
-            span: 8
+            span: 6
           },
 
           {
             label: "入库时间",
             prop: "bstime",
-            span: 8
+            span: 6
           },
           {
             label: "仓储费方式",
             prop: "chargetype",
-            span: 8
+            span: 6
           },
           {
             label: "品名",
             prop: "goodsid",
-            span: 8
+            span: 6
           },
           {
             label: "仓库",
             prop: "warehouseid",
-            span: 8
+            span: 6
           },
 
           {
             label: "仓管员",
             prop: "storekeeper",
-            span: 8
+            span: 6
           },
           {
             label: "到港日期",
             prop: "eta",
-            span: 8
+            span: 6
           },
           {
             label: "计费单位",
             prop: "feetUnit",
-            span: 8
+            span: 6
           },
           {
             label: "作业类型",
             prop: "businessType",
-            span: 8
+            span: 6
           },
           {
             label: "报关单号",
             prop: "customno",
-            span: 8
+            span: 6
           },
           {
             label: "计划件数",
             prop: "planqty",
-            span: 8
+            span: 6
           },
           {
             label: "计划毛重(kg)",
             prop: "plangrossweight",
-            span: 8
+            span: 6
           },
           {
             label: "计划净重(kg)",
             prop: "plannetweight",
-            span: 8
+            span: 6
           },
           {
             label: "计费单位",
             prop: "feetUnit",
-            span: 8
+            span: 6
           },
           {
             label: "作业类型",
             prop: "businessType",
-            span: 8
+            span: 6
           },
           {
             label: "劳务公司",
             prop: "labour",
-            span: 8
+            span: 6
           },
           {
             label: "车队",
             prop: "fleet",
-            span: 8
+            span: 6
           },
           {
             label: "结算方式",
             prop: "stltypeid",
-            span: 8
+            span: 6
           },
           {
             label: "车号",
             prop: "truckno",
-            span: 8
+            span: 6
           },
           {
             label: "司机姓名",
             prop: "driverName",
-            span: 8
+            span: 6
           },
           {
             label: "司机身份证",
             prop: "driverIdCar",
-            span: 8
+            span: 6
           },
           {
             label: "司机电话",
             prop: "driverTel",
-            span: 8
+            span: 6
           },
           {
             label: "发货方(货主)",
             prop: "shipper",
-            span: 8
+            span: 6
           },
           {
             label: "打印抬头",
             prop: "company",
-            span: 8
+            span: 6
           },
           {
             label: "备案序号",
             prop: "emsSeqNo",
-            span: 8
+            span: 6
           },
           {
             label: "备注",
             prop: "remark",
             type: "textarea",
             minRows: 2,
-            span: 8
+            span: 12
           },
           {
             label: "收费指示",
             prop: "remarksFees",
             type: "textarea",
             minRows: 2,
-            span: 8
+            span: 12
           }
         ]
       },

src/views/warehousing/outStock/detailsPage.vue

@@ -49,117 +49,117 @@ export default {
           {
             label: "客户名称",
             prop: "corpid",
-            span: 8
+            span: 6
           },
           {
             label: "提单号",
             prop: "mblno",
-            span: 8
+            span: 6
           },
           {
             label: "单据编号",
             prop: "billno",
-            span: 8
+            span: 6
           },
           {
             label: "业务日期",
             prop: "bsdate",
-            span: 8
+            span: 6
           },
           {
             label: "车辆类型",
             prop: "cartype",
-            span: 8
+            span: 6
           },
           {
             label: "出口单号",
             prop: "emblno",
-            span: 8
+            span: 6
           },
           {
             label: "仓库",
             prop: "warehouseid",
-            span: 8
+            span: 6
           },
 
           {
             label: "仓管员",
             prop: "storekeeper",
-            span: 8
+            span: 6
           },
           {
             label: "计费单位",
             prop: "feetUnit",
-            span: 8
+            span: 6
           },
           {
             label: "作业类型",
             prop: "businessType",
-            span: 8
+            span: 6
           },
           {
             label: "计划件数",
             prop: "planqty",
-            span: 8
+            span: 6
           },
           {
             label: "计划毛重(kg)",
             prop: "plangrossweight",
-            span: 8
+            span: 6
           },
           {
             label: "计划净重(kg)",
             prop: "plannetweight",
-            span: 8
+            span: 6
           },
           {
             label: "劳务公司",
             prop: "labour",
-            span: 8
+            span: 6
           },
           {
             label: "车队",
             prop: "fleet",
-            span: 8
+            span: 6
           },
           {
             label: "车号",
             prop: "truckno",
-            span: 8
+            span: 6
           },
           {
             label: "司机姓名",
             prop: "driverName",
-            span: 8
+            span: 6
           },
           {
             label: "司机身份证",
             prop: "driverIdCar",
-            span: 8
+            span: 6
           },
           {
             label: "司机电话",
             prop: "driverTel",
-            span: 8
+            span: 6
           },
           {
             label: "打印抬头",
             prop: "company",
-            span: 8
+            span: 6
           },
           {
             label: "备注",
             prop: "remark",
             type: "textarea",
             minRows: 2,
-            span: 8
+            span: 12
           },
           {
             label: "收费指示",
             prop: "remarksFees",
             type: "textarea",
             minRows: 2,
-            span: 8
+            span: 12
           }
         ]
       },

src/views/warehousing/stockTransfer/detailsPage.vue

@@ -49,122 +49,122 @@ export default {
           {
             label: "客户名称",
             prop: "corpid",
-            span: 8
+            span: 6
           },
           {
             label: "作业类型",
             prop: "businessType",
-            span: 8
+            span: 6
           },
           {
             label: "提单号",
             prop: "mblno",
-            span: 8
+            span: 6
           },
 
           {
             label: "业务日期",
             prop: "bsdate",
-            span: 8
+            span: 6
           },
 
           {
             label: "业务时间",
             prop: "bstime",
-            span: 8
+            span: 6
           },
           {
             label: "仓管员",
             prop: "storekeeper",
-            span: 8
+            span: 6
           },
           {
             label: "调入仓库",
             prop: "warehouseid",
-            span: 8
+            span: 6
           },
           {
             label: "调入仓库",
             prop: "inwarehouseid",
-            span: 8
+            span: 6
           },
           {
             label: "单据编号",
             prop: "billno",
-            span: 8
+            span: 6
           },
           {
             label: "计划调拨件数",
             prop: "planqty",
-            span: 8
+            span: 6
           },
           {
-            label: "计划调拨毛重(kg)",
+            label: "计划毛重(kg)",
             prop: "plangrossweight",
-            span: 8
+            span: 6
           },
           {
-            label: "计划调拨净重(kg)",
+            label: "计划净重(kg)",
             prop: "plannetweight",
-            span: 8
+            span: 6
           },
           {
             label: "结算方式",
             prop: "stltypeid",
-            span: 8
+            span: 6
           },
           {
             label: "劳务公司",
             prop: "labour",
-            span: 8
+            span: 6
           },
           {
             label: "车队",
             prop: "fleet",
-            span: 8
+            span: 6
           },
 
           {
             label: "车号",
             prop: "truckno",
-            span: 8
+            span: 6
           },
           {
             label: "司机姓名",
             prop: "driverName",
-            span: 8
+            span: 6
           },
           {
             label: "司机身份证",
             prop: "driverIdCar",
-            span: 8
+            span: 6
           },
           {
             label: "司机电话",
             prop: "driverTel",
-            span: 8
+            span: 6
           },
           {
             label: "贸易方式",
             prop: "trademodeid",
-            span: 8
+            span: 6
           },
           {
             label: "打印抬头",
             prop: "company",
-            span: 8
+            span: 6
           },
           {
             label: "备案序号",
             prop: "emsSeqNo",
-            span: 8
+            span: 6
           },
           {
             label: "备注",
             prop: "remark",
             type: "textarea",
             minRows: 2,
-            span: 8
+            span: 12
           }
         ]
       },