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

src/components/titleComponent/main.vue

@@ -27,7 +27,7 @@ export default {
     width: 4px;
     height: 13px;
     background-color: #d6000f;
-    margin: 2px 4px 0 0;
+    margin: 3px 4px 0 0;
   }
   .container-title {
     font-size: 12px;

src/enums/column-name.js

@@ -158,6 +158,10 @@ const columnName = [{
   {
     code: 51,
     name: '客户、供应商、公司'
+  },
+  {
+    code: 52,
+    name: '产品属性Label设置'
   }
 
 ]

src/page/index/logo.vue

@@ -51,7 +51,7 @@ export default {
   position: fixed;
   top: 0;
   left: 0;
-  width: 180px;
+  width: 140px;
   height: 40px;
   line-height: 40px;
   background-color: #20222a;
@@ -64,8 +64,8 @@ export default {
   &_title {
     display: block;
     text-align: center;
-    font-weight: 300;
-    font-size: 20px;
+    font-weight: 500;
+    font-size: 16px;
   }
   &_subtitle {
     display: block;

src/styles/media.scss

@@ -21,7 +21,7 @@
   position: fixed;
   left: 0;
   top: 0;
-  width: 180px;
+  width: 140px;
   height: 100%;
   z-index: 1025;
 }
@@ -43,7 +43,7 @@
 }
 
 .avue-header {
-  padding-left: 180px;
+  padding-left: 140px;
   width: 100%;
   background-color: #fff;
   box-sizing: border-box;
@@ -51,10 +51,10 @@
 
 .avue-main {
   position: absolute;
-  left: 180px;
+  left: 140px;
   padding: 0;
   // padding-bottom: 20px;
-  width: calc(100% - 180px);
+  width: calc(100% - 140px);
   height: calc(100% - 40px);
   box-sizing: border-box;
   overflow: hidden;

src/styles/tags.scss

@@ -26,7 +26,7 @@
         margin: 0 3px;
         height: 40px;
         line-height:40px;
-        font-size: 13px;
+        font-size: 12px;
         font-weight: normal;
         color: #ccc;
         &.is-active {

src/styles/variables.scss

@@ -10,11 +10,13 @@ p{
   margin: 0 !important;
 }
 .el-submenu__icon-arrow {
-  right: 10px !important;
+  right: 3px !important;
+  margin-top: -3px !important;
 }
 .el-menu-item, .el-submenu__title{
-  height: 40px !important;
-  line-height:40px !important;
+  font-size: 12px !important;
+  height: 30px !important;
+  line-height:30px !important;
 }
 
 .el-submenu .el-menu-item {

src/views/exportTrade/customerInquiry/config/customerContact.json

@@ -62,16 +62,9 @@
     },
     {
       "label": "配件信息",
-      "prop": "partsList",
-      "index": 8,
-      "width": 100,
-      "overHidden": true
-    },
-    {
-      "label": "配件描述",
       "prop": "partsDescribe",
-      "index": 9,
-      "width": 120,
+      "index": 8,
+      "width": 200,
       "overHidden": true
     },
     {
@@ -174,9 +167,16 @@
       "overHidden": true
     },
     {
+      "label": "单品毛利率",
+      "prop": "itemMargin",
+      "index": 23,
+      "width": 100,
+      "overHidden": true
+    },
+    {
       "label": "税率",
       "prop": "taxRate",
-      "index": 23,
+      "index": 24,
       "width": 100,
       "overHidden": true
     },

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -180,6 +180,7 @@
           @row-del="rowDel"
           :summary-method="summaryMethod"
           @saveColumn="saveColumn"
+          @resetColumn="resetColumn"
           :cell-style="cellStyle"
         >
           <template slot="menuLeft">
@@ -302,14 +303,21 @@
 
             <span v-else> {{ row.cname }}</span>
           </template>
-          <template slot="partsList" slot-scope="{ row, index }">
-            <el-button
-              size="small"
-              type="text"
-              @click="partrePick(row, index)"
-              :disabled="disabled"
-              >操作</el-button
-            >
+          <template slot="partsDescribe" slot-scope="{ row, index }">
+            <span v-if="row.$cellEdit" style="display:flex">
+              <el-input
+                v-model="row.partsDescribe"
+                :readonly="true"
+                size="small"
+                placeholder="请点击右边按钮"
+              ></el-input>
+              <el-button
+                icon="el-icon-edit"
+                size="mini"
+                @click="partrePick(row, index)"
+              ></el-button>
+            </span>
+            <span v-else>{{ row.partsDescribe }}</span>
           </template>
           <template slot="priorityReferrer" slot-scope="{ row }">
             <el-checkbox
@@ -1519,6 +1527,20 @@ export default {
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }
     },
+    async resetColumn() {
+      this.tableOption = tableOption;
+      const inSave = await this.delColumnData(
+        this.getColumnName(5),
+        tableOption
+      );
+      if (inSave) {
+        this.$message.success("重置成功");
+        //关闭窗口
+        setTimeout(() => {
+          this.$refs.crud.$refs.dialogColumn.columnBox = false;
+        }, 1000);
+      }
+    },
     async saveGoodsColumn() {
       const inSave = await this.saveColumnData(
         this.getColumnName(26),

src/views/exportTrade/salesContract/config/customerContact.json

@@ -64,50 +64,43 @@
     },
     {
       "label": "配件信息",
-      "prop": "partsList",
+      "prop": "partsDescribe",
       "index": 8,
       "width": 100,
       "overHidden": true
     },
     {
-      "label": "配件描述",
-      "prop": "partsDescribe",
-      "index": 9,
-      "width": 120,
-      "overHidden": true
-    },
-    {
       "label": "配件价格",
       "prop": "partsPrice",
-      "index": 10,
+      "index": 9,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "配件价格描述",
       "prop": "partsPriceDescribe",
-      "index": 11,
+      "index": 10,
       "width": 120,
       "overHidden": true
     },
     {
       "label": "供应商",
       "prop": "corpId",
-      "index": 12,
+      "index": 11,
       "width": 200,
       "overHidden": true
     },
     {
       "label": "重点推荐",
       "prop": "priorityReferrer",
-      "index": 13,
+      "index": 12,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "推荐理由",
       "prop": "referrerReason",
-      "index": 14,
+      "index": 13,
       "width": 100,
       "overHidden": true,
       "cell": true
@@ -115,14 +108,14 @@
     {
       "label": "销售价",
       "prop": "price",
-      "index": 15,
+      "index": 14,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "计价单位",
       "prop": "unit",
-      "index": 16,
+      "index": 15,
       "width": 100,
       "overHidden": true,
       "cell": true,
@@ -136,56 +129,56 @@
     {
       "label": "数量",
       "prop": "orderQuantity",
-      "index": 17,
+      "index": 16,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "发货数量",
       "prop": "actualQuantity",
-      "index": 18,
+      "index": 17,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "保险",
       "prop": "insurance",
-      "index": 19,
+      "index": 18,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "运费",
       "prop": "freight",
-      "index": 20,
+      "index": 19,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "折扣",
       "prop": "discount",
-      "index": 21,
+      "index": 20,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "金额",
       "prop": "amount",
-      "index": 22,
+      "index": 21,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "税率",
       "prop": "taxRate",
-      "index": 23,
+      "index": 22,
       "width": 100,
       "overHidden": true
     },
     {
       "label": "备注",
       "prop": "remarks",
-      "index": 24,
+      "index": 23,
       "width": 100,
       "overHidden": true,
       "cell": true

src/views/exportTrade/salesContract/detailsPage.vue

@@ -1623,15 +1623,14 @@ export default {
       }
     },
     async resetColumn() {
+      this.tableOption = tableOption;
       const inSave = await this.delColumnData(
         this.getColumnName(5),
         tableOption
       );
       if (inSave) {
         this.$message.success("重置成功");
-        this.tableOption = tableOption;
-        //关闭窗口
-        this.$refs.crud.$refs.dialogColumn.columnBox = false;
+       this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }
     },
     summaryMethod({ columns, data }) {