Merge branch 'linwenxin_workOrder' of ssh://gogs.zfire.top:2222/zfire-front/zfire-newmall-admin

src/components/template/template-page-1.vue

@@ -484,7 +484,7 @@ export default {
     },
     // 导出
     export() {
-      this.columnList = this.$refs.zjpage.columnList
+      this.columnList = this.$refs.zjpage.columnList.filter(item=>!item.hidden)
     },
     async exportDetermine(data) {
       if (!this.exportList) {

src/views/valueAddedService/extendedWarrantyWork/index.vue

@@ -49,8 +49,7 @@ export default {
       var pam = JSON.parse(JSON.stringify(p))
       try {
         pam.params.push(
-          { "param": "a.order_status", "compare": "=", "value": "YWG" },
-          { "param": "a.order_status", "compare": "=", "value": "YJS" }
+          { "param": "a.order_status", "compare": "=", "value": ["YWG","YJS"] }
         )
         pam.isYb = true
         cb && cb(pam)

src/views/valueAddedService/orderBranchAccount/index.vue

@@ -4,7 +4,7 @@
     :operation="operation" :exportList="exportList">
     <div class="cartographer">
       <el-dialog title="明细" width="100%" :modal="false" :visible.sync="formDialog" :before-close="()=>{formDialog = false}">
-        <template-page v-if="formDialog" :get-list="getList2" />
+        <template-page v-if="formDialog" :get-list="getList2" :columnParsing="columnParsing2"/>
       </el-dialog>
     </div>
   </template-page>
@@ -90,6 +90,28 @@ export default {
       } catch (err) {
       }
     },
+    // 表格列解析渲染数据更改
+    columnParsing2(item, defaultData) {
+      if (item.jname === 'residuNum') {
+        defaultData.render = (h, { row, index, column }) => {
+          return (
+            <div style="padding:0 6px;cursor: pointer;">
+              {row["increType"] != 1 ? row["residuNum"] : ""}
+            </div>
+          )
+        }
+      }
+      if (item.jname === 'serviceEndTime') {
+        defaultData.render = (h, { row, index, column }) => {
+          return (
+            <div style="padding:0 6px;cursor: pointer;">
+              {row[column.columnAttributes.prop] ? row[column.columnAttributes.prop].split(" ")[0] : ""}
+            </div>
+          )
+        }
+      }
+      return defaultData
+    },
   }
 }
 </script>