QuKatie 3 anni fa
parent
commit
02488f993a

+ 8 - 0
src/views/exportTrade/customerInquiry/config/customerContact.json

@@ -202,6 +202,14 @@
       "width": 100,
       "overHidden": true,
       "cell": true
+    },
+    {
+      "label": "商品信息",
+      "prop": "productRemark",
+      "index": 27,
+      "width": 100,
+      "overHidden": true,
+      "cell": true
     }
   ]
 }

+ 6 - 5
src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -1727,12 +1727,13 @@ export default {
               );
             }
             this.data.forEach(e => {
+              const ename = e.ename ? e.ename : "";
+              const itemDescription = e.itemDescription
+                ? e.itemDescription
+                : "";
+              const partsDescribe = e.partsDescribe ? e.partsDescribe : "";
               e.productRemark =
-                e.ename + "\n" + e.itemDescription
-                  ? e.itemDescription
-                  : "" + " " + e.partsDescribe
-                  ? e.partsDescribe
-                  : "";
+                ename + "\n" + itemDescription + " " + partsDescribe;
             });
           }
           for (let i = 0; i < orderFeesList.length; i++) {

+ 8 - 0
src/views/exportTrade/salesContract/config/customerContact.json

@@ -197,6 +197,14 @@
       "width": 100,
       "overHidden": true,
       "cell": true
+    },
+    {
+      "label": "商品信息",
+      "prop": "productRemark",
+      "index": 26,
+      "width": 100,
+      "overHidden": true,
+      "cell": true
     }
   ]
 }

+ 6 - 5
src/views/exportTrade/salesContract/detailsPage.vue

@@ -1863,12 +1863,13 @@ export default {
               );
             }
             this.data.forEach(e => {
+              const ename = e.ename ? e.ename : "";
+              const itemDescription = e.itemDescription
+                ? e.itemDescription
+                : "";
+              const partsDescribe = e.partsDescribe ? e.partsDescribe : "";
               e.productRemark =
-                e.ename + "\n" + e.itemDescription
-                  ? e.itemDescription
-                  : "" + " " + e.partsDescribe
-                  ? e.partsDescribe
-                  : "";
+                ename + "\n" + itemDescription + " " + partsDescribe;
             });
           }
           const orderFeesList = this.$refs.feeInfo.submitData();

+ 0 - 8
src/views/salaryManagement/primarySchool/detailsPage.vue

@@ -57,7 +57,6 @@
           @row-save="rowSave"
           @row-update="rowUpdate"
           :cell-style="cellStyle"
-          :row-style="rowStyle"
           :header-cell-class-name="headerCellClassName"
         >
           <template slot="menuLeft">
@@ -847,13 +846,6 @@ export default {
         return "headerCellClass";
       }
     },
-    rowStyle({ row, column, rowIndex }) {
-      if (rowIndex % 2 === 1) {
-        return {
-          backgroundColor: "#FAFAFA",
-        };
-      }
-    },
     getDetail(id) {
       detail(id).then(res => {
         this.form = res.data.data;

+ 1 - 0
src/views/salaryManagement/primarySchool/index.vue

@@ -76,6 +76,7 @@ export default {
         searchIcon: true,
         searchIndex: 2,
         addBtnText: "新单",
+        stripe:true,
         column: [
           {
             label: "年",

+ 1 - 0
src/views/salaryManagement/primarySchool/js/optionList.js

@@ -36,6 +36,7 @@ export const optionList = {
   // refreshBtn: false,
   menuWidth: 100,
   // labelWidth:250,
+  stripe:true,
   dialogFullscreen: true,
   column: [{
       label: "学科",