no message

src/views/engineeringMaintenance/applicationWithoutFee/index.vue

@@ -1,17 +1,27 @@
 <template>
-  <template-page ref="pageRef" :getList="getList" :operation="operation()" :exportList="exportList"
-    :columnParsing="columnParsing" :tableAttributes="tableAttributes" :tableEvents="tableEvents"
-    :moreParameters="moreParameters">
+  <template-page
+    ref="pageRef"
+    :getList="getList"
+    :operation="operation()"
+    :exportList="exportList"
+    :columnParsing="columnParsing"
+    :tableAttributes="tableAttributes"
+    :tableEvents="tableEvents"
+    :moreParameters="moreParameters"
+  >
     <div class="cartographer_big">
       <el-dialog title="详情" width="100%" :modal="false" :visible.sync="formBool" :before-close="handleClose">
         <zj-page-container v-if="formBool">
           <zj-page-fill class="neibuview">
             <zj-form-container ref="formRef" :form-data="formData" :formAttributes="{ 'label-position': 'top' }">
-              <zj-form-module title="费用信息" :form-data="formData" :form-items="formItems">
-              </zj-form-module>
-              <zj-form-module v-if="formBool && formData.payType !== 'WECHAT'" title="审批信息" :form-data="formData"
-                :form-items="spFormItems">
-                <div v-if="openType === 1" style="text-align:right">
+              <zj-form-module title="费用信息" :form-data="formData" :form-items="formItems"> </zj-form-module>
+              <zj-form-module
+                v-if="formBool && formData.payType !== 'WECHAT'"
+                title="审批信息"
+                :form-data="formData"
+                :form-items="spFormItems"
+              >
+                <div v-if="openType === 1" style="text-align: right">
                   <el-button size="mini" type="danger" plain @click="WAITfun">确定</el-button>
                 </div>
               </zj-form-module>
@@ -27,12 +37,17 @@
 import TemplatePage from '@/components/template/template-page-1.vue'
 import import_mixin from '@/components/template/import_mixin.js'
 import operation_mixin from '@/components/template/operation_mixin.js'
-import { enginMaterialList, enginMaterialListExport, enginMaterialDetail, enginMaterialExamine } from "@/api/applicationWithoutFee.js"
+import {
+  enginMaterialList,
+  enginMaterialListExport,
+  enginMaterialDetail,
+  enginMaterialExamine
+} from '@/api/applicationWithoutFee.js'
 import { required } from '@/components/template/rules_verify.js'
-import feel from "../mixins/feel.js"
+import feel from '../mixins/feel.js'
 export default {
   components: {
-    TemplatePage,
+    TemplatePage
   },
   mixins: [import_mixin, operation_mixin, feel],
   data() {
@@ -41,16 +56,16 @@ export default {
       // 表格属性
       tableAttributes: {
         // 启用勾选列
-        selectColumn: false,
+        selectColumn: false
       },
       // 表格事件
       tableEvents: {
         'selection-change': this.selectionChange
       },
       formData: {
-        examineStatus_cp: "",
-        examineStatus: "",
-        examineRemark: "",
+        examineStatus_cp: '',
+        examineStatus: '',
+        examineRemark: ''
       },
       openType: 0
     }
@@ -61,32 +76,38 @@ export default {
         {
           name: '状态',
           key: 'examineStatus',
-          value: this?.$route?.params?.pageCode||'',
+          value: this?.$route?.params?.pageCode || '',
           conditions: [
-            { label: "全部", value: "" },
-            { label: "待审核", value: "WAIT" },
-            { label: "审核通过", value: "OK" },
-            { label: "驳回", value: "FAIL" },
-            { label: "取消", value: "NO" },
-            { label: "已支付", value: "PAID" },
-            { label: "未支付", value: "NO_PAID" },
+            { label: '全部', value: '' },
+            { label: '待审核', value: 'WAIT' },
+            { label: '审核通过', value: 'OK' },
+            { label: '驳回', value: 'FAIL' },
+            { label: '取消', value: 'NO' },
+            { label: '已支付', value: 'PAID' },
+            { label: '未支付', value: 'NO_PAID' }
           ]
         }
       ]
     },
     spFormItems() {
-      return [{
-        name: 'el-radio',
-        md: 24,
-        options: [{ value: "OK", label: "审批通过" }, { value: "FAIL", label: "审批驳回" }],
-        attributes: { disabled: this.openType == 0 },
-        formItemAttributes: { label: '审批状态', prop: 'examineStatus_cp', rules: [...required] },
-      }, {
-        name: 'el-input',
-        md: 24,
-        attributes: { disabled: this.openType == 0, type: "textarea", placeholder: '' },
-        formItemAttributes: { label: '审批备注', prop: 'examineRemark' },
-      }]
+      return [
+        {
+          name: 'el-radio',
+          md: 24,
+          options: [
+            { value: 'OK', label: '审批通过' },
+            { value: 'FAIL', label: '审批驳回' }
+          ],
+          attributes: { disabled: this.openType == 0 },
+          formItemAttributes: { label: '审批状态', prop: 'examineStatus_cp', rules: [...required] }
+        },
+        {
+          name: 'el-input',
+          md: 24,
+          attributes: { disabled: this.openType == 0, type: 'textarea', placeholder: '' },
+          formItemAttributes: { label: '审批备注', prop: 'examineRemark' }
+        }
+      ]
     }
   },
   created() {
@@ -100,12 +121,12 @@ export default {
     getList(p, cb) {
       try {
         var pam = JSON.parse(JSON.stringify(p))
-        pam.params.push({ "param": "is_all_fee", "compare": "=", "value": "NO" })
+        pam.params.push({ param: 'is_all_fee', compare: '=', value: 'NO' })
         if (pam.examineStatus) {
-          pam.params.push({ "param": "examine_status", "compare": "=", "value": pam.examineStatus })
+          pam.params.push({ param: 'examine_status', compare: '=', value: pam.examineStatus })
         }
         if (this.$route.query.rpProjectRepairId) {
-          pam.params.push({ "param": "rp_project_repair_id", "compare": "=", "value": this.$route.query.rpProjectRepairId })
+          pam.params.push({ param: 'rp_project_repair_id', compare: '=', value: this.$route.query.rpProjectRepairId })
         }
         cb && cb(pam)
         return enginMaterialList(pam)
@@ -148,7 +169,7 @@ export default {
         },
         examine: {
           conditions: ({ row, index, column }) => {
-            return row.examineStatus == "WAIT"
+            return row.examineStatus == 'WAIT'
           },
           click: ({ row, index, column }) => {
             enginMaterialDetail({
@@ -161,7 +182,7 @@ export default {
               })
             })
           }
-        },
+        }
       })
     },
 
@@ -194,13 +215,13 @@ export default {
   box-sizing: border-box;
   padding-left: 16px;
 
-  ::v-deep &>.zj-page-fill-scroll {
+  ::v-deep & > .zj-page-fill-scroll {
     box-sizing: border-box;
     padding-right: 16px;
 
-    &>div:nth-child(1) {
+    & > div:nth-child(1) {
       margin-top: 20px;
     }
   }
 }
-</style>
+</style>

src/views/mallManagement/settleManagElecpay/index.vue

@@ -16,9 +16,9 @@
           :options-evens-group="optionsEvensGroup"
           :moreParameters="moreParameters"
           :column-parsing="columnParsing"
-          :operation="operation()"
           :exportList="exportList"
           :defaultSearchData="defaultSearchData"
+          :operation="operation()"
         >
         </template-page>
       </div>
@@ -209,9 +209,9 @@ export default {
     moreParameters() {
       return [
         {
-          name: '状态',
+          name: '结算状态',
           key: 'status',
-          value: this?.$route?.params?.pageCode,
+          value: this?.$route?.params?.pageCode || '',
           conditions: [
             {
               label: '全部',
@@ -259,9 +259,6 @@ export default {
           ]
         ]
       ]
-    },
-    formItems() {
-      return []
     }
   },
   methods: {

src/views/partsManagement/accessoryWebsite/website-parts-to-sales/website-new-parts-to-sales/index.vue

@@ -55,7 +55,7 @@ export default {
         {
           name: '单据状态',
           key: 'flag',
-          value: this?.$route?.params?.pageCode,
+          value: this?.$route?.params?.pageCode || '',
           conditions: [
             {
               label: '全部',

src/views/partsManagement/accessoryWebsite/website-parts-to-sales/website-outside-new-parts-to-sales/index.vue

@@ -61,7 +61,7 @@ export default {
         {
           name: '单据状态',
           key: 'flag',
-          value: this?.$route?.params?.pageCode,
+          value: this?.$route?.params?.pageCode || '',
           conditions: [
             {
               label: '全部',

src/views/partsManagement/accessoryWebsite/website-parts-worker-refund-manage/website-new-parts-worker-refund/index.vue

@@ -59,7 +59,7 @@ export default {
         {
           name: '单据状态',
           key: 'flag',
-          value: this?.$route?.params?.pageCode,
+          value: this?.$route?.params?.pageCode || '',
           conditions: [
             {
               label: '全部',

src/views/partsManagement/accessoryWebsite/website-parts-worker-refund-manage/website-old-parts-worker-refund/index.vue

@@ -62,7 +62,7 @@ export default {
         {
           name: '单据状态',
           key: 'flag',
-          value: this?.$route?.params?.pageCode,
+          value: this?.$route?.params?.pageCode || '',
           conditions: [
             {
               label: '全部',

src/views/secondHandMall/orderManagement/add.vue

@@ -1,21 +1,21 @@
 <template>
   <zj-page-container>
     <zj-page-fill>
-      <div style="box-sizing: border-box; padding:10px;">
+      <div style="box-sizing: border-box; padding: 10px">
         <zj-form-container ref="formRef" :form-data="formData" :form-attributes="{ size: 'mini' }">
           <zj-form-module title="客户信息" label-width="80px" :form-data="formData" :form-items="formItems" />
           <zj-form-module title="商品信息" label-width="80px" :form-data="formData" :form-items="formItems2" />
         </zj-form-container>
       </div>
     </zj-page-fill>
-    <div style="box-sizing: border-box; padding: 10px; text-align: right;">
+    <div style="box-sizing: border-box; padding: 10px; text-align: right">
       <el-button type="primary" size="small" @click="queding">确定</el-button>
     </div>
   </zj-page-container>
 </template>
 
 <script>
-import getLbsAmapRegion from "./getLbsAmapRegion.js"
+import getLbsAmapRegion from './getLbsAmapRegion.js'
 import ImageUpload from '@/components/file-upload'
 import editTable from '@/components/template/editTable.js'
 import { getClassifyList } from '@/api/goods'
@@ -23,140 +23,159 @@ import { esGoodsList } from '@/api/commodityManagement'
 import { esOrderAdd } from '@/api/orderManagement'
 import { required, mobileRequired, mobile, httpUrl, email } from '@/components/template/rules_verify.js'
 export default {
-  components: {ImageUpload},
+  components: { ImageUpload },
   mixins: [getLbsAmapRegion, editTable],
-  props:{
+  props: {
     detailsType: {
       type: [String, Number],
-      default: ""
-    },
+      default: ''
+    }
   },
-  data(){
+  data() {
     return {
       formData: {
-        "area": "",
-        "brandName": "",
-        "city": "",
-        "companyName": "",
-        "companyWechatId": "",
-        "createBy": "",
-        "createTime": "",
-        "energyLabel": "",
-        "esCategoryId": "",
-        "esCategoryName": "",
-        "esGoodsId": "",
-        "esGoodsName": "",
-        "esOrderId": "",
-        "esOrderInfos": [],
-        "fileUrl": [],
-        "goodsNote": "",
-        "goodsPrice": 0,
-        "goodsUrl": "",
-        "logisticsCode": "",
-        "logisticsName": "",
-        "logisticsNo": "",
-        "num": 0,
-        "overTime": "",
-        "payStartTime": "",
-        "payTime": "",
-        "payType": "",
-        "pickType": "",
-        "power": "",
-        "productionTime": "",
-        "province": "",
-        "receAddress": "",
-        "refundNum": 0,
-        "refundPrice": 0,
-        "remark": "",
-        "saleType": 2,
-        "sellId": "",
-        "sellMobile": "",
-        "sellName": "",
-        "sellTime": "",
-        "sellUrl": "",
-        "sendName": "",
-        "sendTime": "",
-        "source": "",
-        "status": "",
-        "street": "",
-        "totalAmount": 0,
-        "transactionId": "",
-        "unit": "",
-        "updateBy": "",
-        "updateTime": "",
-        "userAddressId": "",
-        "userMobile": "",
-        "userName": "",
-        "wechatUserId": "",
-        "wechatUserMobile": "",
-        "wechatUserName": "",
-        "wechatUserUrl": "",
+        area: '',
+        brandName: '',
+        city: '',
+        companyName: '',
+        companyWechatId: '',
+        createBy: '',
+        createTime: '',
+        energyLabel: '',
+        esCategoryId: '',
+        esCategoryName: '',
+        esGoodsId: '',
+        esGoodsName: '',
+        esOrderId: '',
+        esOrderInfos: [],
+        fileUrl: [],
+        goodsNote: '',
+        goodsPrice: 0,
+        goodsUrl: '',
+        logisticsCode: '',
+        logisticsName: '',
+        logisticsNo: '',
+        num: 0,
+        overTime: '',
+        payStartTime: '',
+        payTime: '',
+        payType: '',
+        pickType: '',
+        power: '',
+        productionTime: '',
+        province: '',
+        receAddress: '',
+        refundNum: 0,
+        refundPrice: 0,
+        remark: '',
+        saleType: 2,
+        sellId: '',
+        sellMobile: '',
+        sellName: '',
+        sellTime: '',
+        sellUrl: '',
+        sendName: '',
+        sendTime: '',
+        source: '',
+        status: '',
+        street: '',
+        totalAmount: 0,
+        transactionId: '',
+        unit: '',
+        updateBy: '',
+        updateTime: '',
+        userAddressId: '',
+        userMobile: '',
+        userName: '',
+        wechatUserId: '',
+        wechatUserMobile: '',
+        wechatUserName: '',
+        wechatUserUrl: '',
         // 省
-        provinceId: "",
+        provinceId: '',
         // 市
-        cityId: "",
+        cityId: '',
         // 区
-        areaId: "",
+        areaId: '',
         // 街道
-        streetId: "",
+        streetId: ''
       },
       classifyList: [],
       esGoodsList: []
     }
   },
   computed: {
-    formItems(){
-      return [{
-        name: 'el-input',
-        md: 6,
-        attributes: { disabled: false },
-        formItemAttributes: { label: '客户名称', prop: 'userName', rules:[{ required: true, message: '请填写', trigger: 'blur' }] }
-      },{
-        name: 'el-input',
-        md: 6,
-        attributes: { disabled: false },
-        formItemAttributes: { label: '客户电话', prop: 'userMobile', rules: mobileRequired }
-      },{
-        name: 'el-radio',
-        options: [
-          { label: '到店支付', value: "CASH" },
-          { label: '转账支付', value: "TRANSFER" },
-          // { label: '微信支付', value: "WECHAT" },
-        ],
-        md: 6,
-        attributes: { disabled: this.disabled },
-        formItemAttributes: { label: '支付方式', prop: 'payType', rules:[{ required: true, message: '请填写', trigger: 'blur' }] }
-      },{
-        name: 'el-radio',
-        options: [
-          { label: '线上销售', value: 1 },
-          { label: '线下销售', value: 2 },
-        ],
-        md: 6,
-        attributes: { disabled: true },
-        formItemAttributes: { label: '销售方式', prop: 'saleType', rules:[{ required: true, message: '请填写', trigger: 'blur' }] }
-      }, ...this.amapRegion, {
-        name: 'el-input',
-        md: 24,
-        attributes: { disabled: false, type:"textarea" },
-        formItemAttributes: { label: '备注', prop: 'remark' }
-      },{
-        md: 24,
-        name: 'slot-component',
-        formItemAttributes: {
-          label: '附件',
-          prop: 'fileUrl',
-          rules: []
+    formItems() {
+      return [
+        {
+          name: 'el-input',
+          md: 6,
+          attributes: { disabled: false },
+          formItemAttributes: {
+            label: '客户名称',
+            prop: 'userName',
+            rules: [{ required: true, message: '请填写', trigger: 'blur' }]
+          }
+        },
+        {
+          name: 'el-input',
+          md: 6,
+          attributes: { disabled: false },
+          formItemAttributes: { label: '客户电话', prop: 'userMobile', rules: mobileRequired }
+        },
+        {
+          name: 'el-radio',
+          options: [
+            { label: '到店支付', value: 'CASH' },
+            { label: '转账支付', value: 'TRANSFER' }
+            // { label: '微信支付', value: "WECHAT" },
+          ],
+          md: 6,
+          attributes: { disabled: this.disabled },
+          formItemAttributes: {
+            label: '支付方式',
+            prop: 'payType',
+            rules: [{ required: true, message: '请填写', trigger: 'blur' }]
+          }
+        },
+        {
+          name: 'el-radio',
+          options: [
+            { label: '线上销售', value: 1 },
+            { label: '线下销售', value: 2 }
+          ],
+          md: 6,
+          attributes: { disabled: true },
+          formItemAttributes: {
+            label: '销售方式',
+            prop: 'saleType',
+            rules: [{ required: true, message: '请填写', trigger: 'blur' }]
+          }
         },
-        render: (h, { props, onInput }) => {
-          return (
-            <ImageUpload fileList={this.formData.fileUrl} limit={1}/>
-          )
+        ...this.amapRegion,
+        {
+          name: 'el-input',
+          md: 24,
+          attributes: { disabled: false, type: 'textarea' },
+          formItemAttributes: { label: '备注', prop: 'remark' }
+        },
+        {
+          md: 24,
+          name: 'slot-component',
+          formItemAttributes: {
+            label: '附件',
+            prop: 'fileUrl',
+            rules: []
+          },
+          render: (h, { props, onInput }) => {
+            return <ImageUpload fileList={this.formData.fileUrl} limit={1} />
+          }
         }
-      }]
+      ]
     },
-    formItems2(){
-      return [{
+    formItems2() {
+      return [
+        {
           name: 'slot-component',
           md: 24,
           formItemAttributes: {
@@ -190,25 +209,34 @@ export default {
                           prop={`esOrderInfos.${index}.${column.columnAttributes.prop}`}
                           rules={[{ required: true, message: '请填写', trigger: 'blur' }]}
                         >
-                          <el-select 
-                              filterable={true}
-                              value={row[column.columnAttributes.prop]}
-                              onInput={val => {
-                                var data = this.esGoodsList.find( item => item.id===val )
-                                row[column.columnAttributes.prop] = val
-                                row.esCategoryId = data?.categoryId ||''
-                                row.esCategoryName = data?.categoryName ||''
-                                row.brandName = data?.brand ||''
-                                console.log(data)
-                                row.unit = '台'
-                                row.sjNum = data?.qty ||''
-                                row.totalAmount = (Number(data?.price) * Number(data?.qty)).toFixed(2);
-                                row.power = data?.power ||''
-                                row.productionTime = data?.makeDate ||''
-                                row.energyLabel = data?.mark ||''
-                              }}
-                              placeholder="请输入内容">
-                            {this.esGoodsList.filter(item=>!this.formData.esOrderInfos.find(v=>v.esGoodsId==item.id ) || row.esGoodsId==item.id ).map((item, index_) => <el-option key={index_} label={item.goodsName} value={item.id}></el-option>)}
+                          <el-select
+                            filterable={true}
+                            value={row[column.columnAttributes.prop]}
+                            onInput={val => {
+                              var data = this.esGoodsList.find(item => item.id === val)
+                              row[column.columnAttributes.prop] = val
+                              row.esCategoryId = data?.categoryId || ''
+                              row.esCategoryName = data?.categoryName || ''
+                              row.brandName = data?.brand || ''
+                              console.log(data)
+                              row.unit = '台'
+                              row.sjNum = data?.qty || ''
+                              row.totalAmount = (Number(data?.price) * Number(data?.qty)).toFixed(2)
+                              row.power = data?.power || ''
+                              row.productionTime = data?.makeDate || ''
+                              row.energyLabel = data?.mark || ''
+                            }}
+                            placeholder="请输入内容"
+                          >
+                            {this.esGoodsList
+                              .filter(
+                                item =>
+                                  !this.formData.esOrderInfos.find(v => v.esGoodsId == item.id) ||
+                                  row.esGoodsId == item.id
+                              )
+                              .map((item, index_) => (
+                                <el-option key={index_} label={item.goodsName} value={item.id}></el-option>
+                              ))}
                           </el-select>
                         </el-form-item>
                       </div>
@@ -223,14 +251,17 @@ export default {
                           prop={`esOrderInfos.${index}.${column.columnAttributes.prop}`}
                           rules={[{ required: true, message: '请填写', trigger: 'blur' }]}
                         >
-                          <el-select 
-                              disabled={true}
-                              value={row[column.columnAttributes.prop]}
-                              onInput={val => {
-                                row[column.columnAttributes.prop] = val
-                              }}
-                              placeholder="请输入内容">
-                            {this.esGoodsList.map((item, index_) => <el-option key={index_} label={item.goodsName} value={item.id}></el-option>)}
+                          <el-select
+                            disabled={true}
+                            value={row[column.columnAttributes.prop]}
+                            onInput={val => {
+                              row[column.columnAttributes.prop] = val
+                            }}
+                            placeholder="请输入内容"
+                          >
+                            {this.esGoodsList.map((item, index_) => (
+                              <el-option key={index_} label={item.goodsName} value={item.id}></el-option>
+                            ))}
                           </el-select>
                         </el-form-item>
                       </div>
@@ -338,7 +369,7 @@ export default {
                     label: '能效标识',
                     prop: 'energyLabel'
                   }
-                },
+                }
               ],
               {
                 isEdit: true,
@@ -348,63 +379,63 @@ export default {
               {
                 add: () => {
                   this.formData.esOrderInfos.push({
-                    "area": "",
-                    "brandName": "",
-                    "city": "",
-                    "companyName": "",
-                    "companyWechatId": "",
-                    "createBy": "",
-                    "createTime": "",
-                    "energyLabel": "",
-                    "esCategoryId": "",
-                    "esCategoryName": "",
-                    "esGoodsId": "",
-                    "esGoodsName": "",
-                    "esOrderId": "",
-                    "fileUrl": "",
-                    "goodsNote": "",
-                    "goodsPrice": "",
-                    "goodsUrl": "",
-                    "logisticsCode": "",
-                    "logisticsName": "",
-                    "logisticsNo": "",
-                    "num": "",
-                    "overTime": "",
-                    "payStartTime": "",
-                    "payTime": "",
-                    "payType": "",
-                    "pickType": "",
-                    "power": "",
-                    "productionTime": "",
-                    "province": "",
-                    "receAddress": "",
-                    "refundNum": 0,
-                    "refundPrice": 0,
-                    "remark": "",
-                    "saleType": 2,
-                    "sellId": "",
-                    "sellMobile": "",
-                    "sellName": "",
-                    "sellTime": "",
-                    "sellUrl": "",
-                    "sendName": "",
-                    "sendTime": "",
-                    "source": "",
-                    "status": "",
-                    "street": "",
-                    "totalAmount": "",
-                    "transactionId": "",
-                    "unit": "",
-                    "updateBy": "",
-                    "updateTime": "",
-                    "userAddressId": "",
-                    "userMobile": "",
-                    "userName": "",
-                    "wechatUserId": "",
-                    "wechatUserMobile": "",
-                    "wechatUserName": "",
-                    "wechatUserUrl": "",
-                    sjNum:""
+                    area: '',
+                    brandName: '',
+                    city: '',
+                    companyName: '',
+                    companyWechatId: '',
+                    createBy: '',
+                    createTime: '',
+                    energyLabel: '',
+                    esCategoryId: '',
+                    esCategoryName: '',
+                    esGoodsId: '',
+                    esGoodsName: '',
+                    esOrderId: '',
+                    fileUrl: '',
+                    goodsNote: '',
+                    goodsPrice: '',
+                    goodsUrl: '',
+                    logisticsCode: '',
+                    logisticsName: '',
+                    logisticsNo: '',
+                    num: '',
+                    overTime: '',
+                    payStartTime: '',
+                    payTime: '',
+                    payType: '',
+                    pickType: '',
+                    power: '',
+                    productionTime: '',
+                    province: '',
+                    receAddress: '',
+                    refundNum: 0,
+                    refundPrice: 0,
+                    remark: '',
+                    saleType: 2,
+                    sellId: '',
+                    sellMobile: '',
+                    sellName: '',
+                    sellTime: '',
+                    sellUrl: '',
+                    sendName: '',
+                    sendTime: '',
+                    source: '',
+                    status: '',
+                    street: '',
+                    totalAmount: '',
+                    transactionId: '',
+                    unit: '',
+                    updateBy: '',
+                    updateTime: '',
+                    userAddressId: '',
+                    userMobile: '',
+                    userName: '',
+                    wechatUserId: '',
+                    wechatUserMobile: '',
+                    wechatUserName: '',
+                    wechatUserUrl: '',
+                    sjNum: ''
                   })
                   this.isEditTableIndex = this.formData.esOrderInfos.length - 1
                 },
@@ -416,7 +447,7 @@ export default {
                           `esOrderInfos.${isEditTableIndex}.esCategoryId`,
                           `esOrderInfos.${isEditTableIndex}.esGoodsId`,
                           `esOrderInfos.${isEditTableIndex}.num`,
-                          `esOrderInfos.${isEditTableIndex}.goodsPrice`,
+                          `esOrderInfos.${isEditTableIndex}.goodsPrice`
                         ],
                         v => {
                           if (v) {
@@ -430,97 +461,98 @@ export default {
                       r(true)
                     }
                   })
-                },
+                }
               }
             )
           }
-        }]
+        }
+      ]
     }
   },
-  created(){
+  created() {
     getClassifyList({
-      status:true,
-      type:5
-    }).then(res=>{
+      status: true,
+      type: 5
+    }).then(res => {
       this.classifyList = res.data
     })
-    esGoodsList({"pageNum":1,"pageSize":-1,"params":[{"param":"a.status","compare":"=","value":"ON"}]}).then(res=>{
+    esGoodsList({ pageNum: 1, pageSize: -1, params: [{ param: 'a.status', compare: '=', value: 'ON' }] }).then(res => {
       this.esGoodsList = res.data.records
-      if(this?.$route?.params?.pageType==="add" && this?.$route?.params?.pageCode && this.detailsType == 0){
-        var data = this.esGoodsList.find( item => item.id===this?.$route?.params?.pageCode )
+      if (this?.$route?.params?.pageType === 'add' && this?.$route?.params?.pageCode && this.detailsType == 0) {
+        var data = this.esGoodsList.find(item => item.id === this?.$route?.params?.pageCode)
         this.formData.esOrderInfos.push({
-          "area": "",
-          "brandName": data?.brand ||'',
-          "city": "",
-          "companyName": "",
-          "companyWechatId": "",
-          "createBy": "",
-          "createTime": "",
-          "energyLabel": data?.mark ||'',
-          "esCategoryId": data?.categoryId ||'',
-          "esCategoryName": data?.categoryName ||'',
-          "esGoodsId": this?.$route?.params?.pageCode,
-          "esGoodsName": "",
-          "esOrderId": "",
-          "fileUrl": "",
-          "goodsNote": "",
-          "goodsPrice": "",
-          "goodsUrl": "",
-          "logisticsCode": "",
-          "logisticsName": "",
-          "logisticsNo": "",
-          "num": "",
-          "overTime": "",
-          "payStartTime": "",
-          "payTime": "",
-          "payType": "",
-          "pickType": "",
-          "power": data?.power ||'',
-          "productionTime": data?.makeDate ||'',
-          "province": "",
-          "receAddress": "",
-          "refundNum": 0,
-          "refundPrice": 0,
-          "remark": "",
-          "saleType": 2,
-          "sellId": "",
-          "sellMobile": "",
-          "sellName": "",
-          "sellTime": "",
-          "sellUrl": "",
-          "sendName": "",
-          "sendTime": "",
-          "source": "",
-          "status": "",
-          "street": "",
-          "totalAmount": (Number(data?.price) * Number(data?.qty)).toFixed(2),
-          "transactionId": "",
-          "unit": '台',
-          "updateBy": "",
-          "updateTime": "",
-          "userAddressId": "",
-          "userMobile": "",
-          "userName": "",
-          "wechatUserId": "",
-          "wechatUserMobile": "",
-          "wechatUserName": "",
-          "wechatUserUrl": "",
-          sjNum:data?.qty ||''
+          area: '',
+          brandName: data?.brand || '',
+          city: '',
+          companyName: '',
+          companyWechatId: '',
+          createBy: '',
+          createTime: '',
+          energyLabel: data?.mark || '',
+          esCategoryId: data?.categoryId || '',
+          esCategoryName: data?.categoryName || '',
+          esGoodsId: this?.$route?.params?.pageCode,
+          esGoodsName: '',
+          esOrderId: '',
+          fileUrl: '',
+          goodsNote: '',
+          goodsPrice: '',
+          goodsUrl: '',
+          logisticsCode: '',
+          logisticsName: '',
+          logisticsNo: '',
+          num: '',
+          overTime: '',
+          payStartTime: '',
+          payTime: '',
+          payType: '',
+          pickType: '',
+          power: data?.power || '',
+          productionTime: data?.makeDate || '',
+          province: '',
+          receAddress: '',
+          refundNum: 0,
+          refundPrice: 0,
+          remark: '',
+          saleType: 2,
+          sellId: '',
+          sellMobile: '',
+          sellName: '',
+          sellTime: '',
+          sellUrl: '',
+          sendName: '',
+          sendTime: '',
+          source: '',
+          status: '',
+          street: '',
+          totalAmount: (Number(data?.price) * Number(data?.qty)).toFixed(2),
+          transactionId: '',
+          unit: '台',
+          updateBy: '',
+          updateTime: '',
+          userAddressId: '',
+          userMobile: '',
+          userName: '',
+          wechatUserId: '',
+          wechatUserMobile: '',
+          wechatUserName: '',
+          wechatUserUrl: '',
+          sjNum: data?.qty || ''
         })
         this.isEditTableIndex = 0
       }
     })
   },
   methods: {
-    queding(){
+    queding() {
       this.$refs.formRef.validate((valid, invalidFields, errLabels) => {
-        if(valid){
+        if (valid) {
           esOrderAdd({
             ...this.formData,
-            fileUrl: this.formData.fileUrl.map(item=>item.url).join(",")
-          }).then(res=>{
+            fileUrl: this.formData.fileUrl.map(item => item.url).join(',')
+          }).then(res => {
             this.$message({ type: 'success', message: `成功!` })
-            this.$emit("removeTab")
+            this.$emit('removeTab')
           })
         }
       })
@@ -529,5 +561,4 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

src/views/valueAddedService/orderSettleManag/pages/collect.vue

@@ -1,19 +1,49 @@
 <template>
-  <template-page ref="pageRef" :get-list="getList" :exportList="exportList" :table-attributes="tableAttributes"
-    :table-events="tableEvents" :moreParameters="moreParameters" :column-parsing="columnParsing" :operation="operation()"
-    :operationColumnWidth="200" :optionsEvensGroup="optionsEvensGroup" :defaultSearchData="defaultSearchData">
+  <template-page
+    ref="pageRef"
+    :get-list="getList"
+    :exportList="exportList"
+    :table-attributes="tableAttributes"
+    :table-events="tableEvents"
+    :moreParameters="moreParameters"
+    :column-parsing="columnParsing"
+    :operation="operation()"
+    :operationColumnWidth="200"
+    :optionsEvensGroup="optionsEvensGroup"
+    :defaultSearchData="defaultSearchData"
+  >
     <div class="cartographer">
-      <el-dialog :title="formTypeName[formType]" width="100%" :modal="false" :visible.sync="formDialog"
-        :before-close="formCancel">
+      <el-dialog
+        :title="formTypeName[formType]"
+        width="100%"
+        :modal="false"
+        :visible.sync="formDialog"
+        :before-close="formCancel"
+      >
         <zj-form-container v-if="formDialog" ref="formRef" :form-data="formData" :styleSwitch="false">
-          <zj-form-module title="基础信息" label-width="120px" :showPackUp="false" :form-data="formData"
-            :form-items="formItems">
+          <zj-form-module
+            title="基础信息"
+            label-width="120px"
+            :showPackUp="false"
+            :form-data="formData"
+            :form-items="formItems"
+          >
           </zj-form-module>
-          <zj-form-module title="订单信息" label-width="120px" :showPackUp="false" :form-data="formData"
-            :form-items="formItemsList">
+          <zj-form-module
+            title="订单信息"
+            label-width="120px"
+            :showPackUp="false"
+            :form-data="formData"
+            :form-items="formItemsList"
+          >
           </zj-form-module>
-          <zj-form-module title="附件图片" label-width="120px" :showPackUp="false" :form-data="formData"
-            :form-items="formItemsImgs">
+          <zj-form-module
+            title="附件图片"
+            label-width="120px"
+            :showPackUp="false"
+            :form-data="formData"
+            :form-items="formItemsImgs"
+          >
           </zj-form-module>
         </zj-form-container>
         <div slot="footer" v-if="formType" class="dialog-footer">
@@ -28,14 +58,20 @@
 <script>
 import TemplatePage from '@/components/template/template-page-1.vue'
 import import_mixin from '@/components/template/import_mixin.js'
-import { increOrderSettleList, increOrderSettleListExport, increOrderSettleDetail, increOrderSettleConfirm, increOrderSettleRefund } from "@/api/orderSettleManag.js"
+import {
+  increOrderSettleList,
+  increOrderSettleListExport,
+  increOrderSettleDetail,
+  increOrderSettleConfirm,
+  increOrderSettleRefund
+} from '@/api/orderSettleManag.js'
 import operation_mixin from '@/components/template/operation_mixin.js'
-import formItems from "../mixins/formItems.js"
+import formItems from '../mixins/formItems.js'
 export default {
   props: {
     storageType: {
       type: String,
-      default: ""
+      default: ''
     }
   },
   components: { TemplatePage },
@@ -54,13 +90,13 @@ export default {
       },
       // 勾选选中数据
       recordSelected: [],
-      formTypeName: ["查看", "结算"],
+      formTypeName: ['查看', '结算'],
       formType: -1,
       formData: {
         pgIncreItems: []
       },
       formDialog: false,
-      defaultSearchData: [],
+      defaultSearchData: []
     }
   },
   computed: {
@@ -69,7 +105,7 @@ export default {
       return [
         [
           [
-            this.optionsEvensAuth("bulkSettlemen", {
+            this.optionsEvensAuth('bulkSettlemen', {
               click: () => {
                 if (this.recordSelected.length === 0) {
                   this.$message.warning('请勾选订单')
@@ -81,7 +117,7 @@ export default {
                 })
               }
             })
-          ],
+          ]
         ]
       ]
     },
@@ -94,50 +130,61 @@ export default {
           value: this?.$route?.params?.pageCode || '',
           conditions: [
             {
-              label: "全部",
-              value: ""
-            }, {
-              label: "已支付",
-              value: "PAID"
-            }, {
-              label: "待支付",
-              value: "WAIT"
-            }, {
-              label: "已退款",
-              value: "REFUND"
-            }, {
-              label: "过期",
-              value: "EXPIRE"
-            }, {
-              label: "取消",
-              value: "CANCEL"
-            }]
-        },
+              label: '全部',
+              value: ''
+            },
+            {
+              label: '已支付',
+              value: 'PAID'
+            },
+            {
+              label: '待支付',
+              value: 'WAIT'
+            },
+            {
+              label: '已退款',
+              value: 'REFUND'
+            },
+            {
+              label: '过期',
+              value: 'EXPIRE'
+            },
+            {
+              label: '取消',
+              value: 'CANCEL'
+            }
+          ]
+        }
       ]
     }
   },
   created() {
-    if (this.pageCode && !~['PAID','WAIT','REFUND','EXPIRE','CANCEL'].indexOf(this.pageCode)) {
-      this.defaultSearchData = [{ "param": "a.id", "compare": "=", "value": this.pageCode, label: "订单单号" }]
+    if (this.pageCode && !~['PAID', 'WAIT', 'REFUND', 'EXPIRE', 'CANCEL'].indexOf(this.pageCode)) {
+      this.defaultSearchData = [{ param: 'a.id', compare: '=', value: this.pageCode, label: '订单单号' }]
     }
   },
   methods: {
     selectable(row, index) {
-      return ["PAID"].includes(Object.entries(row.selectMapData.payStatus).find(([key, val]) => val == row.payStatus)?.[0]) &&
-        ["ING"].includes(Object.entries(row.selectMapData.settleStatus).find(([key, val]) => val == row.settleStatus)?.[0])
+      return (
+        ['PAID'].includes(
+          Object.entries(row.selectMapData.payStatus).find(([key, val]) => val == row.payStatus)?.[0]
+        ) &&
+        ['ING'].includes(
+          Object.entries(row.selectMapData.settleStatus).find(([key, val]) => val == row.settleStatus)?.[0]
+        )
+      )
     },
     // 列表请求函数
     getList(p, cb) {
       var pam = JSON.parse(JSON.stringify(p))
       try {
         if (pam.payStatus) {
-          pam.params.push({ "param": "a.pay_status", "compare": "=", "value": pam.payStatus })
+          pam.params.push({ param: 'a.pay_status', compare: '=', value: pam.payStatus })
         }
-        pam.params.push({ "param": "a.order_channel", "compare": "=", "value": "ONLINE" })
+        pam.params.push({ param: 'a.order_channel', compare: '=', value: 'ONLINE' })
         cb && cb(pam)
         return increOrderSettleList(pam)
-      } catch (err) {
-      }
+      } catch (err) {}
     },
     // 列表导出函数
     exportList: increOrderSettleListExport,
@@ -145,18 +192,14 @@ export default {
     columnParsing(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>
-          )
+          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] : ""}
+              {row[column.columnAttributes.prop] ? row[column.columnAttributes.prop].split(' ')[0] : ''}
             </div>
           )
         }
@@ -180,7 +223,7 @@ export default {
         orderDetail: {
           btnType: 'text',
           conditions: ({ row, index, column }) => {
-            return ["PAID", "REFUND"].includes(row.payStatus)
+            return ['PAID', 'REFUND'].includes(row.payStatus)
           },
           click: ({ row, index, column }) => {
             this.$router.push({
@@ -188,8 +231,8 @@ export default {
               params: {
                 pageName: row.id,
                 pageType: 'pgIncreItemId',
-                pageCode: row.id,
-              },
+                pageCode: row.id
+              }
             })
           }
         },
@@ -197,14 +240,18 @@ export default {
           btnType: 'text',
           prompt: '是否确定退款？',
           conditions: ({ row, index, column }) => {
-            return ["PAID"].includes(row.payStatus) && ["ING"].includes(row.settleStatus) && (() => {
-              var currentDate = new Date(row.payTime);
-              currentDate.setDate(currentDate.getDate() + 7);
-              currentDate.setHours(23);
-              currentDate.setMinutes(59);
-              currentDate.setSeconds(59);
-              return currentDate > new Date()
-            })()
+            return (
+              ['PAID'].includes(row.payStatus) &&
+              ['ING'].includes(row.settleStatus) &&
+              (() => {
+                var currentDate = new Date(row.payTime)
+                currentDate.setDate(currentDate.getDate() + 7)
+                currentDate.setHours(23)
+                currentDate.setMinutes(59)
+                currentDate.setSeconds(59)
+                return currentDate > new Date()
+              })()
+            )
           },
           click: ({ row, index, column }) => {
             increOrderSettleRefund({ id: row.id }).then(res => {
@@ -217,13 +264,13 @@ export default {
           btnType: 'text',
           prompt: '是否确定结算？',
           conditions: ({ row, index, column }) => {
-            return ["PAID"].includes(row.payStatus) && ["ING"].includes(row.settleStatus)
+            return ['PAID'].includes(row.payStatus) && ['ING'].includes(row.settleStatus)
           },
           click: ({ row, index, column }) => {
             this.formType = 1
             this.getDetail(row.id)
           }
-        },
+        }
       })
     },
     getDetail(id) {
@@ -251,14 +298,9 @@ export default {
           })
         }
       })
-    },
+    }
   }
 }
-
-
-
-
-
 </script>
 
 <style lang="scss">
@@ -269,4 +311,3 @@ export default {
   }
 }
 </style>
-