no message

src/views/auxiliaryFittings/attachmentProfile/index.vue

@@ -232,17 +232,6 @@ export default {
         {
           md: 6,
           isShow: true,
-          name: 'el-input',
-          attributes: { placeholder: '请输入', disabled: true },
-          formItemAttributes: {
-            label: '所属商户',
-            prop: 'companyName',
-            rules: [...required]
-          }
-        },
-        {
-          md: 6,
-          isShow: true,
           name: 'slot-component',
           attributes: {},
           formItemAttributes: {

src/views/auxiliaryFittings/auxiliaryDataManagement/auxiliaryChargeManagement/index.vue

@@ -223,17 +223,6 @@ export default {
         {
           md: 6,
           isShow: true,
-          name: 'el-input',
-          attributes: { placeholder: '请输入', disabled: true },
-          formItemAttributes: {
-            label: '所属商户',
-            prop: 'companyWechatName',
-            rules: [...required]
-          }
-        },
-        {
-          md: 6,
-          isShow: true,
           name: 'el-radio',
           options: [
             { label: '上架', value: 'ON' },

src/views/auxiliaryFittings/auxiliaryDataManagement/auxiliaryMaterialClass/index.vue

@@ -130,17 +130,6 @@ export default {
     },
     formItems() {
       return [
-        {
-          md: 6,
-          isShow: true,
-          name: 'el-input',
-          attributes: { placeholder: '请输入', disabled: true },
-          formItemAttributes: {
-            label: '所属商户',
-            prop: 'companyWechatName',
-            rules: []
-          }
-        },
         ...(() => {
           if (this.formData.categoryLevel == 2) {
             return [

src/views/auxiliaryFittings/auxiliaryDataManagement/auxiliaryMaterialClass/index_cp.vue

@@ -94,17 +94,6 @@ export default {
     },
     formItems() {
       return [
-        {
-          md: 24,
-          isShow: true,
-          name: 'el-input',
-          attributes: { placeholder: '请输入', disabled: true },
-          formItemAttributes: {
-            label: '所属商户',
-            prop: 'companyWechatName',
-            rules: []
-          }
-        },
         ...(() => {
           if (this.formData.categoryLevel == 2) {
             return [

src/views/auxiliaryFittings/auxiliaryDataManagement/auxiliaryPriceManagement/index.vue

@@ -199,17 +199,6 @@ export default {
         {
           md: 6,
           isShow: true,
-          name: 'el-input',
-          attributes: { placeholder: '请输入', disabled: true },
-          formItemAttributes: {
-            label: '所属商户',
-            prop: 'companyWechatName',
-            rules: [...required]
-          }
-        },
-        {
-          md: 6,
-          isShow: true,
           name: 'el-radio',
           options: [
             { label: '上架', value: 'ON' },

src/views/auxiliaryFittings/auxiliaryDataManagement/masterAuxiliaryMaterials/index.vue

@@ -121,17 +121,6 @@ export default {
         {
           md: 6,
           isShow: true,
-          name: 'el-input',
-          attributes: { placeholder: '请输入', disabled: true },
-          formItemAttributes: {
-            label: '所属商户',
-            prop: 'companyWechatName',
-            rules: [...required]
-          }
-        },
-        {
-          md: 6,
-          isShow: true,
           name: 'el-radio',
           options: [
             { label: '上架', value: 'ON' },

src/views/auxiliaryFittings/projectAttachmentManage/detail.vue

@@ -10,11 +10,6 @@
         <el-form ref="formData" :rules="rules" :model="formData" label-width="110px" size="small" label-position="left">
           <el-row :gutter="20" justify="start">
             <el-col :span="12">
-              <el-form-item label="所属商户" :required="true">
-                <el-input type="text" :value="companyName" disabled></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
               <el-form-item label="工程名称" :required="true">
                 <el-input type="text" v-model="formData.projectName" disabled></el-input>
               </el-form-item>

src/views/auxiliaryFittings/projectAuxiliaryManage/detail.vue

@@ -10,11 +10,6 @@
         <el-form ref="formData" :rules="rules" :model="formData" label-width="110px" size="small" label-position="left">
           <el-row :gutter="20" justify="start">
             <el-col :span="12">
-              <el-form-item label="所属商户" :required="true">
-                <el-input type="text" :value="companyName" disabled></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
               <el-form-item label="工程名称" :required="true">
                 <el-input type="text" v-model="formData.projectName" disabled></el-input>
               </el-form-item>

src/views/auxiliaryFittings/purchasingManagement/mixins/form_tpl.js

@@ -743,7 +743,7 @@ export default {
                 <el-descriptions
                   border
                   title=""
-                  column={4}
+                  column={2}
                   colon={false}
                   labelStyle={{ width: '8%' }}
                   contentStyle={{ width: '17%' }}
@@ -756,9 +756,6 @@ export default {
                       ? this.formData.purchaseId
                       : this.formData.purchaseRetId) || ''}
                   </el-descriptions-item>
-                  <el-descriptions-item label="所属商户" contentStyle={{ width: '42%' }}>
-                    {this.formData.companyWechatName}
-                  </el-descriptions-item>
                 </el-descriptions>
                 <el-descriptions
                   border

src/views/auxiliaryFittings/salesManagement/components/attachmentNewReturnDetail.vue

@@ -32,11 +32,6 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="所属商户" :required="true">
-                <el-input type="text" :value="companyName" disabled></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
               <el-form-item label="网点名称" prop="websitId" :required="true">
                 <el-select
                   v-model="formData.websit"

src/views/auxiliaryFittings/salesManagement/components/attachmentOldReturnDetail.vue

@@ -31,12 +31,7 @@
                 <el-input type="text" :value="formData.partsRetId" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="所属商户" :required="true">
-                <el-input type="text" :value="companyName" disabled></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
+            <el-col :span="16">
               <el-form-item label="网点名称" prop="websitId" :required="true">
                 <el-select
                   v-model="formData.websit"

src/views/auxiliaryFittings/salesManagement/components/attachmentSalesOrderDetail.vue

@@ -35,12 +35,7 @@
                 <el-input type="text" :value="formData.salesId" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="所属商户" :required="true">
-                <el-input type="text" :value="companyName" disabled></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
+            <el-col :span="16">
               <el-form-item label="网点名称" prop="websitId" :required="true">
                 <el-select
                   v-model="formData.websit"

src/views/auxiliaryFittings/salesManagement/components/auxiliaryAdjustPriceOrderDetail.vue

@@ -53,12 +53,7 @@
                 <el-input type="text" :value="formData.confirmTime" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item label="所属商户" :required="true">
-                <el-input type="text" :value="companyName" disabled></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item label="网点名称" prop="websitId" :required="true">
                 <el-select
                   v-model="formData.websit"

src/views/auxiliaryFittings/salesManagement/components/auxiliarySalesOrderDetail.vue

@@ -35,12 +35,7 @@
                 <el-input type="text" :value="formData.salesId" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="所属商户" :required="true">
-                <el-input type="text" :value="companyName" disabled></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
+            <el-col :span="16">
               <el-form-item label="网点名称" prop="websitId">
                 <el-select
                   v-model="formData.websit"

src/views/auxiliaryFittings/salesManagement/components/auxiliarySalesReturnOrderDetail.vue

@@ -31,12 +31,7 @@
                 <el-input type="text" :value="formData.salesRetId" disabled></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item label="所属商户" :required="true">
-                <el-input type="text" :value="companyName" disabled></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
+            <el-col :span="16">
               <el-form-item label="网点名称" prop="websitId" :required="true">
                 <el-select
                   v-model="formData.websit"

src/views/auxiliaryFittings/salesManagement/mixins/form_tpl.js

@@ -1,6 +1,6 @@
 import ImageUpload from '@/components/file-upload'
-import { getWebsit } from "@/api/customerManagement.js"
-import { listPageV2 } from "@/api/auxiliaryFittings/supplier";
+import { getWebsit } from '@/api/customerManagement.js'
+import { listPageV2 } from '@/api/auxiliaryFittings/supplier'
 export default {
   data() {
     return {
@@ -13,8 +13,8 @@ export default {
               isRole: true,
               click: this.addData
             }
-          ],
-        ],
+          ]
+        ]
       ],
       // 表格属性
       tableAttributes: {
@@ -29,7 +29,7 @@ export default {
       formDialog: false,
       formDialogType: 0, // 0:新增, 1:编辑, 2:查看, 3:审核
       formDialogTitles: ['新增', '编辑', '查看', '审核'],
-      pageType: this?.$route?.name,
+      pageType: this?.$route?.name
     }
   },
   computed: {
@@ -46,301 +46,411 @@ export default {
             },
             {
               label: `已保存`,
-              value: "SAVE"
+              value: 'SAVE'
             },
             {
               label: `已审核`,
-              value: "OK"
-            }, {
-              label: `失败`,
-              value: "FAIL"
+              value: 'OK'
             },
+            {
+              label: `失败`,
+              value: 'FAIL'
+            }
           ]
-        },
+        }
       ]
     },
     columns() {
       return [
         ...(() => {
           if (!!~['auxiliaryMaterialsStorage', 'returnAuxiliaryMaterials'].indexOf(this.pageType)) {
-            return [{
-              columnAttributes: {
-                label: '大类名称',
-                prop: 'parentCategoryId',
-              },
-              render: (h, { row, column, index }) => {
-                return (
-                  row.isEditRow ?
-                    <el-select value={row[column.prop]} onInput={(val) => { row[column.prop] = val }} placeholder="请选择">
-                      {[].map((item, index_) => <el-option key={index_} label={item.label} value={item.value}></el-option>)}
-                    </el-select> :
+            return [
+              {
+                columnAttributes: {
+                  label: '大类名称',
+                  prop: 'parentCategoryId'
+                },
+                render: (h, { row, column, index }) => {
+                  return row.isEditRow ? (
+                    <el-select
+                      value={row[column.prop]}
+                      onInput={val => {
+                        row[column.prop] = val
+                      }}
+                      placeholder="请选择"
+                    >
+                      {[].map((item, index_) => (
+                        <el-option key={index_} label={item.label} value={item.value}></el-option>
+                      ))}
+                    </el-select>
+                  ) : (
                     <div>{row[column.prop]}</div>
-                )
+                  )
+                }
               }
-            }]
+            ]
           }
           return []
         })(),
         ...(() => {
           if (!!~['auxiliaryMaterialsStorage', 'returnAuxiliaryMaterials'].indexOf(this.pageType)) {
-            return [{
-              columnAttributes: {
-                label: '小类名称',
-                prop: 'goodsCategoryId',
-              },
-              render: (h, { row, column, index }) => {
-                return (
-                  row.isEditRow ?
-                    <el-select value={row[column.prop]} onInput={(val) => { row[column.prop] = val }} placeholder="请选择">
-                      {[].map((item, index_) => <el-option key={index_} label={item.label} value={item.value}></el-option>)}
-                    </el-select> :
+            return [
+              {
+                columnAttributes: {
+                  label: '小类名称',
+                  prop: 'goodsCategoryId'
+                },
+                render: (h, { row, column, index }) => {
+                  return row.isEditRow ? (
+                    <el-select
+                      value={row[column.prop]}
+                      onInput={val => {
+                        row[column.prop] = val
+                      }}
+                      placeholder="请选择"
+                    >
+                      {[].map((item, index_) => (
+                        <el-option key={index_} label={item.label} value={item.value}></el-option>
+                      ))}
+                    </el-select>
+                  ) : (
                     <div>{row[column.prop]}</div>
-                )
+                  )
+                }
               }
-            }]
+            ]
           }
           return []
         })(),
         ...(() => {
           if (!!~['auxiliaryMaterialsStorage', 'returnAuxiliaryMaterials'].indexOf(this.pageType)) {
-            return [{
-              columnAttributes: {
-                label: '辅材名称',
-                prop: 'goodsName',
-              },
-              render: (h, { row, column, index }) => {
-                return (
-                  row.isEditRow ?
-                    <el-select value={row[column.prop]} onInput={(val) => { row[column.prop] = val }} placeholder="请选择">
-                      {[].map((item, index_) => <el-option key={index_} label={item.label} value={item.value}></el-option>)}
-                    </el-select> :
+            return [
+              {
+                columnAttributes: {
+                  label: '辅材名称',
+                  prop: 'goodsName'
+                },
+                render: (h, { row, column, index }) => {
+                  return row.isEditRow ? (
+                    <el-select
+                      value={row[column.prop]}
+                      onInput={val => {
+                        row[column.prop] = val
+                      }}
+                      placeholder="请选择"
+                    >
+                      {[].map((item, index_) => (
+                        <el-option key={index_} label={item.label} value={item.value}></el-option>
+                      ))}
+                    </el-select>
+                  ) : (
                     <div>{row[column.prop]}</div>
-                )
+                  )
+                }
               }
-            }]
+            ]
           }
           return []
         })(),
         ...(() => {
           if (!!~['partsStorage', 'partsReturn'].indexOf(this.pageType)) {
-            return [{
-              columnAttributes: {
-                label: '配件名称',
-                prop: 'goodsName',
-              },
-              render: (h, { row, column, index }) => {
-                return (
-                  row.isEditRow ?
-                    <el-select value={row[column.prop]} onInput={(val) => { row[column.prop] = val }} placeholder="请选择">
-                      {[].map((item, index_) => <el-option key={index_} label={item.label} value={item.value}></el-option>)}
-                    </el-select> :
+            return [
+              {
+                columnAttributes: {
+                  label: '配件名称',
+                  prop: 'goodsName'
+                },
+                render: (h, { row, column, index }) => {
+                  return row.isEditRow ? (
+                    <el-select
+                      value={row[column.prop]}
+                      onInput={val => {
+                        row[column.prop] = val
+                      }}
+                      placeholder="请选择"
+                    >
+                      {[].map((item, index_) => (
+                        <el-option key={index_} label={item.label} value={item.value}></el-option>
+                      ))}
+                    </el-select>
+                  ) : (
                     <div>{row[column.prop]}</div>
-                )
+                  )
+                }
               }
-            }]
+            ]
           }
           return []
         })(),
         ...(() => {
-          if (!!~['auxiliaryMaterialsStorage', 'returnAuxiliaryMaterials', 'partsStorage', 'partsReturn'].indexOf(this.pageType)) {
-            return [{
-              columnAttributes: {
-                label: '单位',
-                prop: 'goodsStockUnit',
+          if (
+            !!~['auxiliaryMaterialsStorage', 'returnAuxiliaryMaterials', 'partsStorage', 'partsReturn'].indexOf(
+              this.pageType
+            )
+          ) {
+            return [
+              {
+                columnAttributes: {
+                  label: '单位',
+                  prop: 'goodsStockUnit'
+                }
               }
-            }]
+            ]
           }
           return []
         })(),
         ...(() => {
           if (!!~['auxiliaryMaterialsStorage', 'partsStorage'].indexOf(this.pageType)) {
-            return [{
-              columnAttributes: {
-                label: '数量',
-                prop: 'recQty',
-              },
-              render: (h, { row, column, index }) => {
-                return (
-                  row.isEditRow ?
-                    <el-input type="number" value={row[column.prop]} onInput={(val) => { row[column.prop] = val }} placeholder="请选择">
-                    </el-input> :
+            return [
+              {
+                columnAttributes: {
+                  label: '数量',
+                  prop: 'recQty'
+                },
+                render: (h, { row, column, index }) => {
+                  return row.isEditRow ? (
+                    <el-input
+                      type="number"
+                      value={row[column.prop]}
+                      onInput={val => {
+                        row[column.prop] = val
+                      }}
+                      placeholder="请选择"
+                    ></el-input>
+                  ) : (
                     <div>{row[column.prop]}</div>
-                )
+                  )
+                }
               }
-            }]
+            ]
           }
           return []
         })(),
         ...(() => {
           if (!!~['returnAuxiliaryMaterials', 'partsReturn'].indexOf(this.pageType)) {
-            return [{
-              columnAttributes: {
-                label: '退货数量',
-                prop: 'retQty',
-              },
-              render: (h, { row, column, index }) => {
-                return (
-                  row.isEditRow ?
-                    <el-input type="number" value={row[column.prop]} onInput={(val) => { row[column.prop] = val }} placeholder="请选择">
-                    </el-input> :
+            return [
+              {
+                columnAttributes: {
+                  label: '退货数量',
+                  prop: 'retQty'
+                },
+                render: (h, { row, column, index }) => {
+                  return row.isEditRow ? (
+                    <el-input
+                      type="number"
+                      value={row[column.prop]}
+                      onInput={val => {
+                        row[column.prop] = val
+                      }}
+                      placeholder="请选择"
+                    ></el-input>
+                  ) : (
                     <div>{row[column.prop]}</div>
-                )
+                  )
+                }
               }
-            }]
+            ]
           }
           return []
         })(),
         ...(() => {
           if (!!~['returnAuxiliaryMaterials', 'partsReturn'].indexOf(this.pageType)) {
-            return [{
-              columnAttributes: {
-                label: '退款金额',
-                prop: 'retValue',
-              },
-              render: (h, { row, column, index }) => {
-                return (
-                  row.isEditRow ?
-                    <el-input type="number" value={row[column.prop]} onInput={(val) => { row[column.prop] = val }} placeholder="请选择">
-                    </el-input> :
+            return [
+              {
+                columnAttributes: {
+                  label: '退款金额',
+                  prop: 'retValue'
+                },
+                render: (h, { row, column, index }) => {
+                  return row.isEditRow ? (
+                    <el-input
+                      type="number"
+                      value={row[column.prop]}
+                      onInput={val => {
+                        row[column.prop] = val
+                      }}
+                      placeholder="请选择"
+                    ></el-input>
+                  ) : (
                     <div>{row[column.prop]}</div>
-                )
+                  )
+                }
               }
-            }]
+            ]
           }
           return []
         })(),
         ...(() => {
           if (!!~['auxiliaryMaterialsStorage', 'returnAuxiliaryMaterials'].indexOf(this.pageType)) {
-            return [{
-              columnAttributes: {
-                label: '商品代码',
-                prop: 'goodsCode',
+            return [
+              {
+                columnAttributes: {
+                  label: '商品代码',
+                  prop: 'goodsCode'
+                }
               }
-            }]
+            ]
           }
           return []
         })(),
         ...(() => {
           if (!!~['auxiliaryMaterialsStorage', 'returnAuxiliaryMaterials'].indexOf(this.pageType)) {
-            return [{
-              columnAttributes: {
-                label: '规格型号',
-                prop: 'goodsSpecification',
+            return [
+              {
+                columnAttributes: {
+                  label: '规格型号',
+                  prop: 'goodsSpecification'
+                }
               }
-            }]
+            ]
           }
           return []
         })(),
         ...(() => {
           if (!!~['partsStorage', 'partsReturn'].indexOf(this.pageType)) {
-            return [{
-              columnAttributes: {
-                label: '配件编码',
-                prop: 'goodsId',
+            return [
+              {
+                columnAttributes: {
+                  label: '配件编码',
+                  prop: 'goodsId'
+                }
               }
-            }]
+            ]
           }
           return []
         })(),
         ...(() => {
           if (!!~['partsStorage', 'partsReturn'].indexOf(this.pageType)) {
-            return [{
-              columnAttributes: {
-                label: '适用品牌',
-                prop: 'brand',
+            return [
+              {
+                columnAttributes: {
+                  label: '适用品牌',
+                  prop: 'brand'
+                }
               }
-            }]
+            ]
           }
           return []
         })(),
         ...(() => {
           if (!!~['partsStorage', 'partsReturn'].indexOf(this.pageType)) {
-            return [{
-              columnAttributes: {
-                label: '适用产品大类',
-                prop: 'productCategory',
+            return [
+              {
+                columnAttributes: {
+                  label: '适用产品大类',
+                  prop: 'productCategory'
+                }
               }
-            }]
+            ]
           }
           return []
         })(),
         ...(() => {
           if (!!~['returnAuxiliaryMaterials', 'partsReturn'].indexOf(this.pageType)) {
-            return [{
-              columnAttributes: {
-                label: '采购数量',
-                prop: 'recQty',
+            return [
+              {
+                columnAttributes: {
+                  label: '采购数量',
+                  prop: 'recQty'
+                }
               }
-            }]
+            ]
           }
           return []
         })(),
         ...(() => {
-          if (!!~['auxiliaryMaterialsStorage', 'returnAuxiliaryMaterials', 'partsStorage', 'partsReturn'].indexOf(this.pageType)) {
-            return [{
-              columnAttributes: {
-                label: '采购价格',
-                prop: 'cost',
+          if (
+            !!~['auxiliaryMaterialsStorage', 'returnAuxiliaryMaterials', 'partsStorage', 'partsReturn'].indexOf(
+              this.pageType
+            )
+          ) {
+            return [
+              {
+                columnAttributes: {
+                  label: '采购价格',
+                  prop: 'cost'
+                }
               }
-            }]
+            ]
           }
           return []
         })(),
         ...(() => {
-          if (!!~['auxiliaryMaterialsStorage', 'returnAuxiliaryMaterials', 'partsStorage', 'partsReturn'].indexOf(this.pageType)) {
-            return [{
-              columnAttributes: {
-                label: '采购金额',
-                prop: 'costValue',
+          if (
+            !!~['auxiliaryMaterialsStorage', 'returnAuxiliaryMaterials', 'partsStorage', 'partsReturn'].indexOf(
+              this.pageType
+            )
+          ) {
+            return [
+              {
+                columnAttributes: {
+                  label: '采购金额',
+                  prop: 'costValue'
+                }
               }
-            }]
+            ]
           }
           return []
         })(),
         ...(() => {
-          if (this.formData.flag === "SAVE" && !!~['auxiliaryMaterialsStorage', 'returnAuxiliaryMaterials', 'partsReturn'].indexOf(this.pageType)) {
-            return [{
-              columnAttributes: {
-                label: '库存数量',
-                prop: 'stockQty',
+          if (
+            this.formData.flag === 'SAVE' &&
+            !!~['auxiliaryMaterialsStorage', 'returnAuxiliaryMaterials', 'partsReturn'].indexOf(this.pageType)
+          ) {
+            return [
+              {
+                columnAttributes: {
+                  label: '库存数量',
+                  prop: 'stockQty'
+                }
               }
-            }]
+            ]
           }
           return []
         })(),
         ...(() => {
           if (!!~[0, 1].indexOf(this.formDialogType)) {
-            return [{
-              columnAttributes: {
-                label: '操作',
-                prop: '',
-              },
-              render: (h, { row, column, index }) => {
-                return (
-                  <div class='operation-btns'>
-                    <el-button type="text" onClick={() => {
-                      this.formData.items.splice(index, 1)
-                    }}>删除</el-button>
-                    {
-                      !row.isEditRow ?
-                      <el-button type="text" onClick={() => {
-                        this.formData.items.map((item, index_) => {
-                          if (index_ == index) {
-                            item.isEditRow = true
-                          } else {
-                            item.isEditRow = false
-                          }
-                        })
-                      }}>编辑</el-button> :
-                      null
-                    }
-                  </div>
-                )
+            return [
+              {
+                columnAttributes: {
+                  label: '操作',
+                  prop: ''
+                },
+                render: (h, { row, column, index }) => {
+                  return (
+                    <div class="operation-btns">
+                      <el-button
+                        type="text"
+                        onClick={() => {
+                          this.formData.items.splice(index, 1)
+                        }}
+                      >
+                        删除
+                      </el-button>
+                      {!row.isEditRow ? (
+                        <el-button
+                          type="text"
+                          onClick={() => {
+                            this.formData.items.map((item, index_) => {
+                              if (index_ == index) {
+                                item.isEditRow = true
+                              } else {
+                                item.isEditRow = false
+                              }
+                            })
+                          }}
+                        >
+                          编辑
+                        </el-button>
+                      ) : null}
+                    </div>
+                  )
+                }
               }
-            }]
+            ]
           }
           return []
-        })(),
+        })()
       ]
     },
     formItems1() {
@@ -358,78 +468,128 @@ export default {
             var { value } = props
             return (
               <div>
-                <el-descriptions border title="" column={4} colon={false} labelStyle={{ width: '8%' }} contentStyle={{ width: '17%' }}>
+                <el-descriptions
+                  border
+                  title=""
+                  column={2}
+                  colon={false}
+                  labelStyle={{ width: '8%' }}
+                  contentStyle={{ width: '17%' }}
+                >
                   <el-descriptions-item label="单据状态">
-                    {({ SAVE: "保存", OK: "通过", FAIL: "失败" })[this.formData.flag]}
+                    {{ SAVE: '保存', OK: '通过', FAIL: '失败' }[this.formData.flag]}
                   </el-descriptions-item>
                   <el-descriptions-item label="单据编号">
-                    {(!!~['auxiliaryMaterialsStorage', 'partsStorage'].indexOf(this.pageType) ? this.formData.purchaseId : this.formData.purchaseRetId) || ''}
-                  </el-descriptions-item>
-                  <el-descriptions-item label="所属商户" contentStyle={{ width: '42%' }}>
-                    {this.formData.companyWechatName}
+                    {(!!~['auxiliaryMaterialsStorage', 'partsStorage'].indexOf(this.pageType)
+                      ? this.formData.purchaseId
+                      : this.formData.purchaseRetId) || ''}
                   </el-descriptions-item>
                 </el-descriptions>
-                <el-descriptions border title="" column={2} colon={false} labelStyle={{ width: '8%' }} contentStyle={{ width: '42%' }} style="margin-top:-1px">
+                <el-descriptions
+                  border
+                  title=""
+                  column={2}
+                  colon={false}
+                  labelStyle={{ width: '8%' }}
+                  contentStyle={{ width: '42%' }}
+                  style="margin-top:-1px"
+                >
                   <el-descriptions-item label="网点名称">
-                    <el-select style="width:100%" value={this.formData.websitId} onInput={(val) => { this.formData.websitId = val }} placeholder="请选择">
-                      {this.getWebsitList.map(item => <el-option key={item.websitId} label={item.name} value={item.websitId}></el-option>)}
+                    <el-select
+                      style="width:100%"
+                      value={this.formData.websitId}
+                      onInput={val => {
+                        this.formData.websitId = val
+                      }}
+                      placeholder="请选择"
+                    >
+                      {this.getWebsitList.map(item => (
+                        <el-option key={item.websitId} label={item.name} value={item.websitId}></el-option>
+                      ))}
                     </el-select>
                   </el-descriptions-item>
                   <el-descriptions-item label="供应商名称">
-                    <el-select style="width:100%" value={this.formData.venderId} onInput={(val) => { this.formData.venderId = val }} placeholder="请选择">
-                      {this.listPageV2Data.map(item => <el-option key={item.venderId} label={item.venderName} value={item.venderId}></el-option>)}
+                    <el-select
+                      style="width:100%"
+                      value={this.formData.venderId}
+                      onInput={val => {
+                        this.formData.venderId = val
+                      }}
+                      placeholder="请选择"
+                    >
+                      {this.listPageV2Data.map(item => (
+                        <el-option key={item.venderId} label={item.venderName} value={item.venderId}></el-option>
+                      ))}
                     </el-select>
                   </el-descriptions-item>
                 </el-descriptions>
-                {
-                  !!~['returnAuxiliaryMaterials', 'partsReturn'].indexOf(this.pageType) ?
-                    <el-descriptions border title="" column={4} colon={false} labelStyle={{ width: '8%' }} contentStyle={{ width: '17%' }} style="margin-top:-1px">
-                      <el-descriptions-item label="采购入库单号" contentStyle={{ width: '42%' }}>
-                        {this.formData.purchaseId}
-                      </el-descriptions-item>
-                      <el-descriptions-item label="退货数量">
-                        {this.formData.retTotalQty}
-                      </el-descriptions-item>
-                      <el-descriptions-item label="退款金额">
-                        {this.formData.retTotalAmount}
-                      </el-descriptions-item>
-                    </el-descriptions> : null
-                }
-                <el-descriptions border title="" column={4} colon={false} labelStyle={{ width: '8%' }} contentStyle={{ width: '17%' }} style="margin-top:-1px">
-                  <el-descriptions-item label="制单人">
-                    {this.formData.createBy}
-                  </el-descriptions-item>
-                  <el-descriptions-item label="制单时间">
-                    {this.formData.createTime}
-                  </el-descriptions-item>
-                  <el-descriptions-item label="审核人">
-                    {this.formData.confirmBy}
-                  </el-descriptions-item>
-                  <el-descriptions-item label="审核时间">
-                    {this.formData.confirmTime}
-                  </el-descriptions-item>
+                {!!~['returnAuxiliaryMaterials', 'partsReturn'].indexOf(this.pageType) ? (
+                  <el-descriptions
+                    border
+                    title=""
+                    column={4}
+                    colon={false}
+                    labelStyle={{ width: '8%' }}
+                    contentStyle={{ width: '17%' }}
+                    style="margin-top:-1px"
+                  >
+                    <el-descriptions-item label="采购入库单号" contentStyle={{ width: '42%' }}>
+                      {this.formData.purchaseId}
+                    </el-descriptions-item>
+                    <el-descriptions-item label="退货数量">{this.formData.retTotalQty}</el-descriptions-item>
+                    <el-descriptions-item label="退款金额">{this.formData.retTotalAmount}</el-descriptions-item>
+                  </el-descriptions>
+                ) : null}
+                <el-descriptions
+                  border
+                  title=""
+                  column={4}
+                  colon={false}
+                  labelStyle={{ width: '8%' }}
+                  contentStyle={{ width: '17%' }}
+                  style="margin-top:-1px"
+                >
+                  <el-descriptions-item label="制单人">{this.formData.createBy}</el-descriptions-item>
+                  <el-descriptions-item label="制单时间">{this.formData.createTime}</el-descriptions-item>
+                  <el-descriptions-item label="审核人">{this.formData.confirmBy}</el-descriptions-item>
+                  <el-descriptions-item label="审核时间">{this.formData.confirmTime}</el-descriptions-item>
                 </el-descriptions>
-                <el-descriptions border title="" column={4} colon={false} labelStyle={{ width: '8%' }} contentStyle={{ width: '17%' }} style="margin-top:-1px">
+                <el-descriptions
+                  border
+                  title=""
+                  column={4}
+                  colon={false}
+                  labelStyle={{ width: '8%' }}
+                  contentStyle={{ width: '17%' }}
+                  style="margin-top:-1px"
+                >
                   <el-descriptions-item label="附件">
-                    <ImageUpload fileList={this.formData.imageUrl} uid="imgSrc666_materials_drawing_images" limit={1} isEdit={this.formDialogType < 2} />
+                    <ImageUpload
+                      fileList={this.formData.imageUrl}
+                      uid="imgSrc666_materials_drawing_images"
+                      limit={1}
+                      isEdit={this.formDialogType < 2}
+                    />
                   </el-descriptions-item>
                   <el-descriptions-item label="备注" contentStyle={{ width: '67%' }}>
                     <el-input
                       type="textarea"
                       placeholder="请输入内容"
                       value={this.formData.remark}
-                      onInput={(val) => { this.formData.remark = val }}
+                      onInput={val => {
+                        this.formData.remark = val
+                      }}
                       maxlength="200"
                       show-word-limit
                       autosize={{ minRows: 6, maxRows: 8 }}
-                    >
-                    </el-input>
+                    ></el-input>
                   </el-descriptions-item>
                 </el-descriptions>
               </div>
             )
           }
-        },]
+        }
+      ]
     },
     formItems2() {
       return [
@@ -446,52 +606,62 @@ export default {
             var { value } = props
             return (
               <div>
-                {!!~[0, 1].indexOf(this.formDialogType) ? <div style="margin-bottom:8px">
-                  <el-button onClick={() => {
-                    this.formData.items.map((item) => {item.isEditRow = false})
-                    this.formData.items.push({
-                      "brand": "",
-                      "companyWechatId": "",
-                      "cost": "",
-                      "costValue": "",
-                      "goodsCategoryId": "",
-                      "goodsCategoryName": "",
-                      "goodsCode": "",
-                      "goodsId": "",
-                      "goodsName": "",
-                      "goodsSpecification": "",
-                      "goodsStockUnit": "",
-                      "goodsType": "",
-                      "note": "",
-                      "parentCategoryId": "",
-                      "parentCategoryName": "",
-                      "productCategory": "",
-                      "purchaseId": "",
-                      "recQty": "",
-                      "retQty": "",
-                      "stockQty": "",
-                      "websitId": "",
-                      "websitName": "",
-                      "isEditRow": true
-                    })
-                    // if (this.pageType == "auxiliaryMaterialsStorage") {
-                    // } else if (this.pageType == "returnAuxiliaryMaterials") {
-                    // } else if (this.pageType == "partsStorage") {
-                    // } else if (this.pageType == "partsReturn") {
-                    // }
-                  }}>添加</el-button>
-                </div> : null}
+                {!!~[0, 1].indexOf(this.formDialogType) ? (
+                  <div style="margin-bottom:8px">
+                    <el-button
+                      onClick={() => {
+                        this.formData.items.map(item => {
+                          item.isEditRow = false
+                        })
+                        this.formData.items.push({
+                          brand: '',
+                          companyWechatId: '',
+                          cost: '',
+                          costValue: '',
+                          goodsCategoryId: '',
+                          goodsCategoryName: '',
+                          goodsCode: '',
+                          goodsId: '',
+                          goodsName: '',
+                          goodsSpecification: '',
+                          goodsStockUnit: '',
+                          goodsType: '',
+                          note: '',
+                          parentCategoryId: '',
+                          parentCategoryName: '',
+                          productCategory: '',
+                          purchaseId: '',
+                          recQty: '',
+                          retQty: '',
+                          stockQty: '',
+                          websitId: '',
+                          websitName: '',
+                          isEditRow: true
+                        })
+                        // if (this.pageType == "auxiliaryMaterialsStorage") {
+                        // } else if (this.pageType == "returnAuxiliaryMaterials") {
+                        // } else if (this.pageType == "partsStorage") {
+                        // } else if (this.pageType == "partsReturn") {
+                        // }
+                      }}
+                    >
+                      添加
+                    </el-button>
+                  </div>
+                ) : null}
                 <zj-table
                   columns={this.columns}
                   tableData={this.formData.items}
                   tableAttributes={{
                     size: 'mini',
-                    border: true,
-                  }} />
+                    border: true
+                  }}
+                />
               </div>
             )
           }
-        },]
+        }
+      ]
     }
   },
   methods: {
@@ -505,13 +675,13 @@ export default {
     },
     // 打开
     openForm() {
-      Promise.all([
-        getWebsit(),
-        listPageV2({ "pageNum": 1, "pageSize": -1, "params": [] })
-      ]).then(([res1, res2]) => {
-        this.getWebsitList = res1.data.filter(item => item.type == "B")
+      Promise.all([getWebsit(), listPageV2({ pageNum: 1, pageSize: -1, params: [] })]).then(([res1, res2]) => {
+        this.getWebsitList = res1.data.filter(item => item.type == 'B')
         this.listPageV2Data = res2.data.records
-        console.log(res1.data.filter(item => item.type == "B"), res2.data.records)
+        console.log(
+          res1.data.filter(item => item.type == 'B'),
+          res2.data.records
+        )
         this.formDialog = true
       })
     },
@@ -525,6 +695,6 @@ export default {
       this.$refs.formRef.$refs.inlineForm.clearValidate()
       this.$data.formData = this.$options.data().formData
       this.formDialog = false
-    },
-  },
+    }
+  }
 }

src/views/auxiliaryFittings/salesManagement/oldPartsReturnFactory/mixins/basicInfo.js

@@ -43,18 +43,6 @@ export default {
           }
         },
         {
-          name: 'el-input',
-          md: 6,
-          attributes: {
-            placeholder: '请输入',
-            disabled: true
-          },
-          formItemAttributes: {
-            label: '所属商户',
-            prop: 'companyWechatName'
-          }
-        },
-        {
           name: 'el-select',
           md: 6,
           options: this.websitList,

src/views/auxiliaryFittings/settleAccountManagement/auxiliaryHandworkFee/index.vue

@@ -1,135 +1,171 @@
 <template>
-	<zj-tab-page ref="tabPage" :defaultActives="[{ key: 'list', label: $route.meta.title+'-列表', essential: true }]">
-		<template slot-scope="{activeKey, data}">
-			<template-page ref="pageRef" v-if="tabIndexShow && activeKey == 'list'" :get-list="getList" :table-attributes="tableAttributes"
-				:table-events="tableEvents" :operationColumnWidth="120" :options-evens-group="optionsEvensGroup"
-				:moreParameters="moreParameters" :column-parsing="columnParsing" :operation="operation()"
-				:exportList="tabIndex == 1 ? exportList1 : exportList2">
-			  <div slot="moreSearch" style="margin-bottom: 10px;">
-			  	<el-radio-group v-model="tabIndex" size="mini" @change="changeType">
-			  		<el-radio-button label="1">汇总</el-radio-button>
-			  		<el-radio-button label="2">明细</el-radio-button>
-			  	</el-radio-group>
-			  </div>
-			  <div slot="moreSearch" v-if="tabIndex == 2">
-			  	<el-radio-group v-model="status" size="mini" @change="changeType">
-			  		<el-radio-button label="">全部</el-radio-button>
-			  		<el-radio-button label="WAIT">待结算</el-radio-button>
-			  		<el-radio-button label="OVER">已完成</el-radio-button>
-			  	</el-radio-group>
-			  	<br><br>
-			  </div>
-			</template-page>
-			<div v-if="~['detail'].indexOf(activeKey)">
-				<el-card class="box-card">
-					<div slot="header" class="clearfix">
-						<span>基础信息</span>
-					</div>
-					<table border="1" style="border-color: #fff;" width="100%" align="center" cellspacing="0" cellpadding="10">
-						<tr>
-							<td class="bold" align="center">所属商户</td>
-							<td>{{ formData.companyWechatName }}</td>
-							<td class="bold" align="center">网点名称</td>
-							<td>{{ formData.websitName }}</td>
-						</tr>
-						<tr>
-							<td class="bold" align="center">工单号</td>
-							<td>{{ formData.orderId }}</td>
-							<td class="bold" align="center">工单品牌</td>
-							<td>{{ formData.brand }}</td>
-						</tr>
-						<tr>
-							<td class="bold" align="center">客户姓名</td>
-							<td>{{ formData.userName }}</td>
-							<td class="bold" align="center">客户电话</td>
-							<td>{{ formData.userMobile }}</td>
-						</tr>
-						<tr>
-							<td class="bold" align="center">师傅姓名</td>
-							<td>{{ formData.workerName }}</td>
-							<td class="bold" align="center">师傅身份证号</td>
-							<td>{{ formData.identity }}</td>
-						</tr>
-						<tr>
-							<td class="bold" align="center">师傅联系电话</td>
-							<td>{{ formData.workerMobile }}</td>
-							<td class="bold" align="center">订单金额</td>
-							<td>{{ formData.totalAmount }}</td>
-						</tr>
-						<tr>
-							<td class="bold" align="center">库存类型</td>
-							<td>{{ formData.settlementType == 'OWN' ? '自有库存' : formData.settlementType == 'OUT' ? '外购库存' : '' }}</td>
-							<td class="bold" align="center">创建人</td>
-							<td>{{ formData.createBy }}</td>
-						</tr>
-						<tr>
-							<td class="bold" align="center">创建时间</td>
-							<td>{{ formData.createTime }}</td>
-							<td class="bold" align="center">支付状态</td>
-							<td>{{ formData.payStatus == 'CANCEL' ? '取消' : formData.payStatus == 'PAID' ? '已支付' : formData.payStatus ==
-								'WAIT' ? '待支付' : '' }}</td>
-						</tr>
-						<tr>
-							<td class="bold" align="center">结算人员</td>
-							<td>{{ formData.updateBy }}</td>
-							<td class="bold" align="center">操作时间</td>
-							<td>{{ formData.updateTime }}</td>
-						</tr>
-					</table>
-				</el-card>
-				<el-card class="box-card">
-					<div slot="header" class="clearfix">
-						<span>订单信息</span>
-					</div>
-					<table border="1" style="border-color: #fff;" width="100%" align="center" cellspacing="0" cellpadding="10">
-						<thead>
-							<tr>
-								<th class="bold" align="center">名称</th>
-								<th class="bold" align="center">收费类型</th>
-								<th class="bold" align="center">工单类型</th>
-								<th class="bold" align="center">数量</th>
-								<th class="bold" align="center">收费标准</th>
-								<th class="bold" align="center">订单金额</th>
-								<th class="bold" align="center">库存类型</th>
-								<th class="bold" align="center">师傅手工费用</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(item, index) in formData.settlementOrderManualItems" :key="index">
-								<td align="center">{{ item.goodsName }}</td>
-								<td align="center">{{ item.chargeType == 'ACC' ? '配件物料': item.chargeType == 'SERV' ? '服务收费':'辅材物料' }}</td>
-								<td align="center">{{ formData.saleType | saleTypeFilter }}</td>
-								<td align="center">{{ item.num }}</td>
-								<td align="center">{{ item.goodsAmount }}</td>
-								<td align="center">{{ item.totalAmount }}</td>
-								<td align="center">{{ item.settlementType == 'OWN' ? '自有' : item.settlementType == 'OUT' ? '外购' : '' }}</td>
-								<td align="center">{{ item.manualAmount }}</td>
-							</tr>
-							<!-- <tr>
+  <zj-tab-page ref="tabPage" :defaultActives="[{ key: 'list', label: $route.meta.title + '-列表', essential: true }]">
+    <template slot-scope="{ activeKey, data }">
+      <template-page
+        ref="pageRef"
+        v-if="tabIndexShow && activeKey == 'list'"
+        :get-list="getList"
+        :table-attributes="tableAttributes"
+        :table-events="tableEvents"
+        :operationColumnWidth="120"
+        :options-evens-group="optionsEvensGroup"
+        :moreParameters="moreParameters"
+        :column-parsing="columnParsing"
+        :operation="operation()"
+        :exportList="tabIndex == 1 ? exportList1 : exportList2"
+      >
+        <div slot="moreSearch" style="margin-bottom: 10px">
+          <el-radio-group v-model="tabIndex" size="mini" @change="changeType">
+            <el-radio-button label="1">汇总</el-radio-button>
+            <el-radio-button label="2">明细</el-radio-button>
+          </el-radio-group>
+        </div>
+        <div slot="moreSearch" v-if="tabIndex == 2">
+          <el-radio-group v-model="status" size="mini" @change="changeType">
+            <el-radio-button label="">全部</el-radio-button>
+            <el-radio-button label="WAIT">待结算</el-radio-button>
+            <el-radio-button label="OVER">已完成</el-radio-button>
+          </el-radio-group>
+          <br /><br />
+        </div>
+      </template-page>
+      <div v-if="~['detail'].indexOf(activeKey)">
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>基础信息</span>
+          </div>
+          <table border="1" style="border-color: #fff" width="100%" align="center" cellspacing="0" cellpadding="10">
+            <tr>
+              <td class="bold" align="center">网点名称</td>
+              <td>{{ formData.websitName }}</td>
+              <td class="bold" align="center"></td>
+              <td></td>
+            </tr>
+            <tr>
+              <td class="bold" align="center">工单号</td>
+              <td>{{ formData.orderId }}</td>
+              <td class="bold" align="center">工单品牌</td>
+              <td>{{ formData.brand }}</td>
+            </tr>
+            <tr>
+              <td class="bold" align="center">客户姓名</td>
+              <td>{{ formData.userName }}</td>
+              <td class="bold" align="center">客户电话</td>
+              <td>{{ formData.userMobile }}</td>
+            </tr>
+            <tr>
+              <td class="bold" align="center">师傅姓名</td>
+              <td>{{ formData.workerName }}</td>
+              <td class="bold" align="center">师傅身份证号</td>
+              <td>{{ formData.identity }}</td>
+            </tr>
+            <tr>
+              <td class="bold" align="center">师傅联系电话</td>
+              <td>{{ formData.workerMobile }}</td>
+              <td class="bold" align="center">订单金额</td>
+              <td>{{ formData.totalAmount }}</td>
+            </tr>
+            <tr>
+              <td class="bold" align="center">库存类型</td>
+              <td>
+                {{ formData.settlementType == 'OWN' ? '自有库存' : formData.settlementType == 'OUT' ? '外购库存' : '' }}
+              </td>
+              <td class="bold" align="center">创建人</td>
+              <td>{{ formData.createBy }}</td>
+            </tr>
+            <tr>
+              <td class="bold" align="center">创建时间</td>
+              <td>{{ formData.createTime }}</td>
+              <td class="bold" align="center">支付状态</td>
+              <td>
+                {{
+                  formData.payStatus == 'CANCEL'
+                    ? '取消'
+                    : formData.payStatus == 'PAID'
+                    ? '已支付'
+                    : formData.payStatus == 'WAIT'
+                    ? '待支付'
+                    : ''
+                }}
+              </td>
+            </tr>
+            <tr>
+              <td class="bold" align="center">结算人员</td>
+              <td>{{ formData.updateBy }}</td>
+              <td class="bold" align="center">操作时间</td>
+              <td>{{ formData.updateTime }}</td>
+            </tr>
+          </table>
+        </el-card>
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>订单信息</span>
+          </div>
+          <table border="1" style="border-color: #fff" width="100%" align="center" cellspacing="0" cellpadding="10">
+            <thead>
+              <tr>
+                <th class="bold" align="center">名称</th>
+                <th class="bold" align="center">收费类型</th>
+                <th class="bold" align="center">工单类型</th>
+                <th class="bold" align="center">数量</th>
+                <th class="bold" align="center">收费标准</th>
+                <th class="bold" align="center">订单金额</th>
+                <th class="bold" align="center">库存类型</th>
+                <th class="bold" align="center">师傅手工费用</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-for="(item, index) in formData.settlementOrderManualItems" :key="index">
+                <td align="center">{{ item.goodsName }}</td>
+                <td align="center">
+                  {{ item.chargeType == 'ACC' ? '配件物料' : item.chargeType == 'SERV' ? '服务收费' : '辅材物料' }}
+                </td>
+                <td align="center">{{ formData.saleType | saleTypeFilter }}</td>
+                <td align="center">{{ item.num }}</td>
+                <td align="center">{{ item.goodsAmount }}</td>
+                <td align="center">{{ item.totalAmount }}</td>
+                <td align="center">
+                  {{ item.settlementType == 'OWN' ? '自有' : item.settlementType == 'OUT' ? '外购' : '' }}
+                </td>
+                <td align="center">{{ item.manualAmount }}</td>
+              </tr>
+              <!-- <tr>
 								<td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>
 							</tr> -->
-							<tr>
-								<td align="center">总计</td>
-								<td></td>
-								<td></td>
-								<td></td>
-								<td></td>
-								<td align="center">{{ totalAmount }}</td>
-								<td></td>
-								<td align="center">{{ manualAmount }}</td>
-							</tr>
-						</tbody>
-					</table>
-				</el-card>
-				<div slot="footer" class="dialog-footer">
-					<el-button size="mini" @click="formDialog = false; formData = {};data.removeTab()">取 消</el-button>
-					<el-button size="mini" v-if="formData.status == 'WAIT'" type="primary"
-						@click="settleAccounts(formData.settlementOrderId,data.removeTab,2)">确认结算
-					</el-button>
-				</div>
-			</div>
-		</template>
-	</zj-tab-page>
+              <tr>
+                <td align="center">总计</td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td align="center">{{ totalAmount }}</td>
+                <td></td>
+                <td align="center">{{ manualAmount }}</td>
+              </tr>
+            </tbody>
+          </table>
+        </el-card>
+        <div slot="footer" class="dialog-footer">
+          <el-button
+            size="mini"
+            @click="
+              formDialog = false
+              formData = {}
+              data.removeTab()
+            "
+            >取 消</el-button
+          >
+          <el-button
+            size="mini"
+            v-if="formData.status == 'WAIT'"
+            type="primary"
+            @click="settleAccounts(formData.settlementOrderId, data.removeTab, 2)"
+            >确认结算
+          </el-button>
+        </div>
+      </div>
+    </template>
+  </zj-tab-page>
 </template>
 
 <script>
@@ -139,243 +175,260 @@ import operation_mixin from '@/components/template/operation_mixin.js'
 import ImageUpload from '@/components/file-upload'
 import { downloadFiles } from '@/utils/util'
 import { required, mobileRequired, mobile, httpUrl, email } from '@/components/template/rules_verify.js'
-import { listPageV1, listPageV2, pageExport1, pageExport2, getDetail, settleAccounts } from "@/api/auxiliaryFittings/auxiliaryHandworkFee";
+import {
+  listPageV1,
+  listPageV2,
+  pageExport1,
+  pageExport2,
+  getDetail,
+  settleAccounts
+} from '@/api/auxiliaryFittings/auxiliaryHandworkFee'
 export default {
-	components: { TemplatePage, ImageUpload },
-	mixins: [import_mixin, operation_mixin],
-	filters: {
-		saleTypeFilter(val) {
-			const MAP = {
-				1: '零售',
-				2: '工程',
-				3: '延保',
-				4: '工程维保',
-			}
-			return MAP[val];
-		}
-	},
-	data() {
-		return {
-			// 表格属性
-			tableAttributes: {
-				// 启用勾选列
-				selectColumn: true,
-				selectable: this.selectable
-			},
-			// 表格事件
-			tableEvents: {
-				'selection-change': this.selectionChange
-			},
-			// 勾选选中行
-			recordSelected: [],
-			formDialogType: 0,
-			formDialogTitles: ["新增", "编辑", "详情"],
-			formDialog: false,
-			formData: {},
-			status: '',
-			totalAmount: 0,
-			manualAmount: 0,
-			websitAmount: 0,
-			commissionAmount: 0,
-			tabIndex: 1,
-			workerId: '',
-			websitId: '',
-			tabIndexShow: true,
-			formType: 'add',
-			formVisible: false,
-		}
-	},
-	watch: {
-		tabIndex() {
-			this.tabIndexShow = false
-			this.$nextTick(() => {
-				if(this.tabIndex == 1){
-					this.status = ''
-					this.workerId = ''
-					this.websitId = ''
-				}
-				this.tabIndexShow = true
-			})
-		}
-	},
-	computed: {
-		// 事件组合
-		optionsEvensGroup() {
-			return [
-				[
-					[
-						this.optionsEvensAuth("bulkSettlement", {
-							isRole: this.tabIndex == 2,
-							click: () => {
-								this.batchSettleAccounts()
-							}
-						})
-					],
-				]
-			]
-		},
-		// 更多参数
-		moreParameters() {
-			return []
-		}
-	},
-	methods: {
-		// 切换状态
-		changeType(val) {
-			this.workerId = ''
-			this.websitId = ''
-			this.$refs.pageRef.refreshList()
-		},
-		// 列表请求函数
-		getList(p) {
-			try {
-				var pam = JSON.parse(JSON.stringify(p))
-				if (this.status && this.tabIndex == 2) {
-					pam.params.push({ "param": "a.status", "compare": "=", "value": this.status })
-				}
-				if (this.workerId) {
-					pam.params.push({ "param": "a.websit_id", "compare": "=", "value": this.websitId }, { "param": "a.worker_id", "compare": "=", "value": this.workerId })
-				}
-				return this.tabIndex == 1 ? listPageV1(pam) : listPageV2(pam)
-			} catch (error) {
-				console.log(error)
-			}
-		},
-		// 列表导出函数
-		exportList1: pageExport1,
-		exportList2: pageExport2,
-		// 表格列解析渲染数据更改
-		columnParsing(item, defaultData) {
-			return defaultData
-		},
-		selectable(row, index) {
-			if(this.tabIndex==2){
-				console.log(row,row.selectMapData)
-				return ["WAIT"].includes(Object.entries(row.selectMapData.status).find(([key, val]) => val == row.status)?.[0])
-			}
-		},
-		// 监听勾选变化
-		selectionChange(data) {
-			this.recordSelected = data
-		},
-		openForm(type, id) {
-			this.$refs.tabPage.addTab({
-				// 对应显示的模块
-				activeKey: type,
-				// 唯一标识
-				key: type,
-				// 页签名称
-				label: ({ detail: "详情" })[type],
-				// 打开时事件
-				triggerEvent: () => {
-					this.formCancel()
-					this.$nextTick(()=>{
-						this.formType = type
-						this.formVisible = true
-						if (type == 'detail') {
-							this.formDialogType = 1
-							this.totalAmount = 0
-							this.manualAmount = 0
-							getDetail({ id  }).then(res => {
-								Object.assign(this.formData, res.data)
-								res.data.settlementOrderManualItems.forEach(item => {
-									this.totalAmount += (item.totalAmount * 100 + this.totalAmount * 100) / 100
-									this.manualAmount = (item.manualAmount * 100 + this.manualAmount * 100) / 100
-								})
-							})
-						}
-					})
-				},
-				// 关闭时事件
-				closeEvent: () => {
-				
-				}
-			})
-		},
-		formCancel() {
-			this.formVisible = false
-			this.$refs?.formRef?.resetFields()
-			this.$data.formData = this.$options.data().formData
-		},
-		// 表格操作列
-		operation() {
-			return this.operationBtn({
-				detail: {
-					btnType: 'text',
-					name: ({ row, index, column }) => {
-						return this.tabIndex == 1 ? '查看明细' : '详情'
-					},
-					click: ({ row, index, column }) => {
-						if (this.tabIndex == 1) {
-							this.workerId = row.workerId
-							this.websitId = row.websitId
-							this.tabIndex = 2
-							this.$refs.pageRef.refreshList()
-						} else {
-							this.openForm('detail',row.settlementOrderId)
-						}
-					}
-				},
-				settle: {
-					btnType: 'text',
-					conditions: ({ row, index, column }) => {
-						if(this.tabIndex == 1){
-							return row.workerAmount != row.okAmount
-						}else{
-							return row.status == 'WAIT'
-						}
-					},
-					click: ({ row, index, column }) => {
-						if (this.tabIndex == 1) {
-							this.status = 'WAIT'
-							this.workerId = row.workerId
-							this.websitId = row.websitId
-							this.tabIndex = 2
-							this.$refs.pageRef.refreshList()
-						} else {
-							this.settleAccounts(row.settlementOrderId)
-						}
-					}
-				},
-			})
-		},
-		batchSettleAccounts() {
-			if (this.recordSelected.length == 0) {
-				return this.$message.warning('请至少勾选一条数据！');
-			}
-			this.settleAccounts(this.recordSelected.map(item => { return item.settlementOrderId }).join(','))
-		},
-		settleAccounts(id,cancel,type) {
-			this.$confirm(`请确认是否提交结算, 是否继续?`, '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning'
-			}).then(() => {
-				settleAccounts({
-					id
-				}).then(res => {
-					if (res.code == 200) {
-						this.$message({ type: 'success', message: `结算成功!` })
-						if(type== 2){cancel('list')}
-						this.$refs.pageRef.refreshList()
-						this.formDialog = false
-					} else {
-						this.$message.error(res.msg);
-					}
-				})
-			});
-		}
-	}
+  components: { TemplatePage, ImageUpload },
+  mixins: [import_mixin, operation_mixin],
+  filters: {
+    saleTypeFilter(val) {
+      const MAP = {
+        1: '零售',
+        2: '工程',
+        3: '延保',
+        4: '工程维保'
+      }
+      return MAP[val]
+    }
+  },
+  data() {
+    return {
+      // 表格属性
+      tableAttributes: {
+        // 启用勾选列
+        selectColumn: true,
+        selectable: this.selectable
+      },
+      // 表格事件
+      tableEvents: {
+        'selection-change': this.selectionChange
+      },
+      // 勾选选中行
+      recordSelected: [],
+      formDialogType: 0,
+      formDialogTitles: ['新增', '编辑', '详情'],
+      formDialog: false,
+      formData: {},
+      status: '',
+      totalAmount: 0,
+      manualAmount: 0,
+      websitAmount: 0,
+      commissionAmount: 0,
+      tabIndex: 1,
+      workerId: '',
+      websitId: '',
+      tabIndexShow: true,
+      formType: 'add',
+      formVisible: false
+    }
+  },
+  watch: {
+    tabIndex() {
+      this.tabIndexShow = false
+      this.$nextTick(() => {
+        if (this.tabIndex == 1) {
+          this.status = ''
+          this.workerId = ''
+          this.websitId = ''
+        }
+        this.tabIndexShow = true
+      })
+    }
+  },
+  computed: {
+    // 事件组合
+    optionsEvensGroup() {
+      return [
+        [
+          [
+            this.optionsEvensAuth('bulkSettlement', {
+              isRole: this.tabIndex == 2,
+              click: () => {
+                this.batchSettleAccounts()
+              }
+            })
+          ]
+        ]
+      ]
+    },
+    // 更多参数
+    moreParameters() {
+      return []
+    }
+  },
+  methods: {
+    // 切换状态
+    changeType(val) {
+      this.workerId = ''
+      this.websitId = ''
+      this.$refs.pageRef.refreshList()
+    },
+    // 列表请求函数
+    getList(p) {
+      try {
+        var pam = JSON.parse(JSON.stringify(p))
+        if (this.status && this.tabIndex == 2) {
+          pam.params.push({ param: 'a.status', compare: '=', value: this.status })
+        }
+        if (this.workerId) {
+          pam.params.push(
+            { param: 'a.websit_id', compare: '=', value: this.websitId },
+            { param: 'a.worker_id', compare: '=', value: this.workerId }
+          )
+        }
+        return this.tabIndex == 1 ? listPageV1(pam) : listPageV2(pam)
+      } catch (error) {
+        console.log(error)
+      }
+    },
+    // 列表导出函数
+    exportList1: pageExport1,
+    exportList2: pageExport2,
+    // 表格列解析渲染数据更改
+    columnParsing(item, defaultData) {
+      return defaultData
+    },
+    selectable(row, index) {
+      if (this.tabIndex == 2) {
+        console.log(row, row.selectMapData)
+        return ['WAIT'].includes(Object.entries(row.selectMapData.status).find(([key, val]) => val == row.status)?.[0])
+      }
+    },
+    // 监听勾选变化
+    selectionChange(data) {
+      this.recordSelected = data
+    },
+    openForm(type, id) {
+      this.$refs.tabPage.addTab({
+        // 对应显示的模块
+        activeKey: type,
+        // 唯一标识
+        key: type,
+        // 页签名称
+        label: { detail: '详情' }[type],
+        // 打开时事件
+        triggerEvent: () => {
+          this.formCancel()
+          this.$nextTick(() => {
+            this.formType = type
+            this.formVisible = true
+            if (type == 'detail') {
+              this.formDialogType = 1
+              this.totalAmount = 0
+              this.manualAmount = 0
+              getDetail({ id }).then(res => {
+                Object.assign(this.formData, res.data)
+                res.data.settlementOrderManualItems.forEach(item => {
+                  this.totalAmount += (item.totalAmount * 100 + this.totalAmount * 100) / 100
+                  this.manualAmount = (item.manualAmount * 100 + this.manualAmount * 100) / 100
+                })
+              })
+            }
+          })
+        },
+        // 关闭时事件
+        closeEvent: () => {}
+      })
+    },
+    formCancel() {
+      this.formVisible = false
+      this.$refs?.formRef?.resetFields()
+      this.$data.formData = this.$options.data().formData
+    },
+    // 表格操作列
+    operation() {
+      return this.operationBtn({
+        detail: {
+          btnType: 'text',
+          name: ({ row, index, column }) => {
+            return this.tabIndex == 1 ? '查看明细' : '详情'
+          },
+          click: ({ row, index, column }) => {
+            if (this.tabIndex == 1) {
+              this.workerId = row.workerId
+              this.websitId = row.websitId
+              this.tabIndex = 2
+              this.$refs.pageRef.refreshList()
+            } else {
+              this.openForm('detail', row.settlementOrderId)
+            }
+          }
+        },
+        settle: {
+          btnType: 'text',
+          conditions: ({ row, index, column }) => {
+            if (this.tabIndex == 1) {
+              return row.workerAmount != row.okAmount
+            } else {
+              return row.status == 'WAIT'
+            }
+          },
+          click: ({ row, index, column }) => {
+            if (this.tabIndex == 1) {
+              this.status = 'WAIT'
+              this.workerId = row.workerId
+              this.websitId = row.websitId
+              this.tabIndex = 2
+              this.$refs.pageRef.refreshList()
+            } else {
+              this.settleAccounts(row.settlementOrderId)
+            }
+          }
+        }
+      })
+    },
+    batchSettleAccounts() {
+      if (this.recordSelected.length == 0) {
+        return this.$message.warning('请至少勾选一条数据！')
+      }
+      this.settleAccounts(
+        this.recordSelected
+          .map(item => {
+            return item.settlementOrderId
+          })
+          .join(',')
+      )
+    },
+    settleAccounts(id, cancel, type) {
+      this.$confirm(`请确认是否提交结算, 是否继续?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        settleAccounts({
+          id
+        }).then(res => {
+          if (res.code == 200) {
+            this.$message({ type: 'success', message: `结算成功!` })
+            if (type == 2) {
+              cancel('list')
+            }
+            this.$refs.pageRef.refreshList()
+            this.formDialog = false
+          } else {
+            this.$message.error(res.msg)
+          }
+        })
+      })
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 .tab {
-	padding: 20px 20px 0 20px;
+  padding: 20px 20px 0 20px;
 }
 
 .bold {
-	width: 160px;
-	font-weight: bold;
-	background-color: #f0f0f0;
-}</style>
+  width: 160px;
+  font-weight: bold;
+  background-color: #f0f0f0;
+}
+</style>

src/views/auxiliaryFittings/settleAccountManagement/salesWithdraw/index.vue

@@ -24,10 +24,10 @@
 							<td>{{ formData.type == 1 ? '销售提现' : '服务提现' }}</td>
 							<td class="bold" align="center">单据编号</td>
 							<td>{{ formData.id }}</td>
-							<td class="bold" align="center">所属商户</td>
-							<td>{{ formData.companyWechatName }}</td>
 							<td class="bold" align="center">发放状态</td>
 							<td>{{ formData.status == 0 ? '待发放' : formData.status == 1 ? '已发放' : '' }}</td>
+							<td class="bold" align="center"></td>
+							<td></td>
 						</tr>
 						<tr>
 							<td class="bold" align="center">师傅姓名</td>
@@ -232,7 +232,7 @@ export default {
 				},
 				// 关闭时事件
 				closeEvent: () => {
-				
+
 				}
 			})
 		},

src/views/auxiliaryFittings/settleAccountManagement/settleAccountOfflinePay/index.vue

@@ -1,122 +1,164 @@
 <template>
-	<zj-tab-page ref="tabPage" :defaultActives="[{ key: 'list', label: $route.meta.title+'-列表', essential: true }]">
-		<template slot-scope="{activeKey, data}">
-			<template-page ref="pageRef" v-if="tabIndexShow && activeKey == 'list'" :get-list="getList" :table-attributes="tableAttributes" :table-events="tableEvents" :operationColumnWidth="120" :options-evens-group="optionsEvensGroup" :moreParameters="moreParameters" :column-parsing="columnParsing"
-			  :operation="operation()" :exportList="tabIndex==1?exportList1:exportList2">
-			  <div slot="moreSearch" style="margin-bottom: 10px;">
-				<el-radio-group v-model="tabIndex" size="mini" @change="changeType">
-					<el-radio-button label="1">汇总</el-radio-button>
-					<el-radio-button label="2">明细</el-radio-button>
-				</el-radio-group>
-			  </div>
-			  <div slot="moreSearch" v-if="tabIndex == 2">
-			    <el-radio-group v-model="status" size="mini" @change="changeType">
-			    	<el-radio-button label="">全部</el-radio-button>
-			    	<el-radio-button label="WAIT">待结算</el-radio-button>
-					<el-radio-button label="OVER">已完成</el-radio-button>
-			    </el-radio-group>
-			    <br><br>
-			  </div>
-			</template-page>
-			<div v-if="~['detail'].indexOf(activeKey)">
-				<el-card class="box-card">
-					<div slot="header" class="clearfix">
-						<span>基础信息</span>
-					</div>
-					<table border="1" style="border-color: #fff;" width="100%" align="center" cellspacing="0" cellpadding="10">
-						<tr>
-							<td class="bold" align="center">所属商户</td>
-							<td>{{formData.companyWechatName}}</td>
-							<td class="bold" align="center">关联工单号</td>
-							<td>{{formData.workerOrderId}}</td>
-							<td class="bold" align="center">结算单号</td>
-							<td>{{formData.settlementOrderId}}</td>
-							<td class="bold" align="center">工单品牌</td>
-							<td>{{formData.brand}}</td>
-						</tr>
-						<tr>
-							<td class="bold" align="center">客户姓名</td>
-							<td>{{formData.userName}}</td>
-							<td class="bold" align="center">客户电话</td>
-							<td>{{formData.userMobile}}</td>
-							<td class="bold" align="center">师傅姓名</td>
-							<td>{{formData.workerName}}</td>
-							<td class="bold" align="center">师傅身份证号</td>
-							<td>{{formData.identity}}</td>
-						</tr>
-						<tr>
-							<td class="bold" align="center">师傅联系电话</td>
-							<td>{{formData.workerMobile}}</td>
-							<td class="bold" align="center">订单金额</td>
-							<td>{{formData.totalAmount}}</td>
-							<td class="bold" align="center">销售类型</td>
-							<td>{{formData.settlementType == 'OWN'?'自由':formData.settlementType == 'OUT'?'外购':''}}</td>
-							<td class="bold" align="center">创建人</td>
-							<td>{{formData.createBy}}</td>
-						</tr>
-						<tr>
-							<td class="bold" align="center">创建时间</td>
-							<td>{{formData.createTime}}</td>
-							<td class="bold" align="center">支付状态</td>
-							<td>{{formData.payStatus == 'CANCEL'?'取消':formData.payStatus == 'PAID'?'已支付':formData.payStatus == 'WAIT'?'待支付':''}}</td>
-							<td class="bold" align="center">操作人</td>
-							<td>{{formData.updateBy}}</td>
-							<td class="bold" align="center">操作时间</td>
-							<td>{{formData.updateTime}}</td>
-						</tr>
-					</table>
-				</el-card>
-				<el-card class="box-card">
-					<div slot="header" class="clearfix">
-						<span>订单信息</span>
-					</div>
-					<table border="1" style="border-color: #fff;" width="100%" align="center" cellspacing="0" cellpadding="10">
-						<thead>
-							<tr>
-								<th class="bold" align="center">名称</th>
-								<th class="bold" align="center">收费类型</th>
-								<th class="bold" align="center">工单类型</th>
-								<th class="bold" align="center">数量</th>
-								<th class="bold" align="center">单价</th>
-								<th class="bold" align="center">订单金额</th>
-								<th class="bold" align="center">销售类型</th>
-								<th class="bold" align="center">师傅分账金额</th>
-								<th class="bold" align="center">商户分账金额</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(item,index) in formData.settlementOrderItemList" :key="index">
-								<td align="center">{{item.goodsName}}</td>
-								<td align="center">{{item.chargeType == 'ACC' ? '配件物料': item.chargeType == 'SERV' ? '服务收费':'辅材物料'}}</td>
-								<td align="center">{{ formData.saleType | saleTypeFilter }}</td>
-								<td align="center">{{item.num}}</td>
-								<td align="center">{{item.goodsAmount}}</td>
-								<td align="center">{{item.totalAmount}}</td>
-								<td align="center">{{item.settlementType == 'OWN'?'自有':item.settlementType == 'OUT'?'外购':''}}</td>
-								<td align="center">{{item.workerAmount}}</td>
-								<td align="center">{{item.websitAmount}}</td>
-							</tr>
-							<tr>
-								<td align="center">总计</td><td></td><td></td><td></td><td></td>
-								<td align="center">{{totalAmount}}</td><td></td>
-								<td align="center">{{workerAmount}}</td>
-								<td align="center">{{websitAmount}}</td>
-							</tr>
-						</tbody>
-					</table>
-				</el-card>
-				<div slot="footer" class="dialog-footer">
-					<el-button size="mini" @click="formDialog = false; formData = {};data.removeTab()">取 消</el-button>
-					<el-button size="mini" v-if="formData.status == 'WAIT'" type="primary"
-						@click="settleAccounts(formData.settlementOrderId,data.removeTab,2)">确认结算
-					</el-button>
-					<!-- <el-button size="mini" v-if="formData.status == 'WAIT_ING'" type="primary" @click="withdraw(formData.settlementOrderId,data.removeTab)">
+  <zj-tab-page ref="tabPage" :defaultActives="[{ key: 'list', label: $route.meta.title + '-列表', essential: true }]">
+    <template slot-scope="{ activeKey, data }">
+      <template-page
+        ref="pageRef"
+        v-if="tabIndexShow && activeKey == 'list'"
+        :get-list="getList"
+        :table-attributes="tableAttributes"
+        :table-events="tableEvents"
+        :operationColumnWidth="120"
+        :options-evens-group="optionsEvensGroup"
+        :moreParameters="moreParameters"
+        :column-parsing="columnParsing"
+        :operation="operation()"
+        :exportList="tabIndex == 1 ? exportList1 : exportList2"
+      >
+        <div slot="moreSearch" style="margin-bottom: 10px">
+          <el-radio-group v-model="tabIndex" size="mini" @change="changeType">
+            <el-radio-button label="1">汇总</el-radio-button>
+            <el-radio-button label="2">明细</el-radio-button>
+          </el-radio-group>
+        </div>
+        <div slot="moreSearch" v-if="tabIndex == 2">
+          <el-radio-group v-model="status" size="mini" @change="changeType">
+            <el-radio-button label="">全部</el-radio-button>
+            <el-radio-button label="WAIT">待结算</el-radio-button>
+            <el-radio-button label="OVER">已完成</el-radio-button>
+          </el-radio-group>
+          <br /><br />
+        </div>
+      </template-page>
+      <div v-if="~['detail'].indexOf(activeKey)">
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>基础信息</span>
+          </div>
+          <table border="1" style="border-color: #fff" width="100%" align="center" cellspacing="0" cellpadding="10">
+            <tr>
+              <td class="bold" align="center">关联工单号</td>
+              <td>{{ formData.workerOrderId }}</td>
+              <td class="bold" align="center">结算单号</td>
+              <td>{{ formData.settlementOrderId }}</td>
+              <td class="bold" align="center">工单品牌</td>
+              <td>{{ formData.brand }}</td>
+              <td class="bold" align="center"></td>
+              <td></td>
+            </tr>
+            <tr>
+              <td class="bold" align="center">客户姓名</td>
+              <td>{{ formData.userName }}</td>
+              <td class="bold" align="center">客户电话</td>
+              <td>{{ formData.userMobile }}</td>
+              <td class="bold" align="center">师傅姓名</td>
+              <td>{{ formData.workerName }}</td>
+              <td class="bold" align="center">师傅身份证号</td>
+              <td>{{ formData.identity }}</td>
+            </tr>
+            <tr>
+              <td class="bold" align="center">师傅联系电话</td>
+              <td>{{ formData.workerMobile }}</td>
+              <td class="bold" align="center">订单金额</td>
+              <td>{{ formData.totalAmount }}</td>
+              <td class="bold" align="center">销售类型</td>
+              <td>{{ formData.settlementType == 'OWN' ? '自由' : formData.settlementType == 'OUT' ? '外购' : '' }}</td>
+              <td class="bold" align="center">创建人</td>
+              <td>{{ formData.createBy }}</td>
+            </tr>
+            <tr>
+              <td class="bold" align="center">创建时间</td>
+              <td>{{ formData.createTime }}</td>
+              <td class="bold" align="center">支付状态</td>
+              <td>
+                {{
+                  formData.payStatus == 'CANCEL'
+                    ? '取消'
+                    : formData.payStatus == 'PAID'
+                    ? '已支付'
+                    : formData.payStatus == 'WAIT'
+                    ? '待支付'
+                    : ''
+                }}
+              </td>
+              <td class="bold" align="center">操作人</td>
+              <td>{{ formData.updateBy }}</td>
+              <td class="bold" align="center">操作时间</td>
+              <td>{{ formData.updateTime }}</td>
+            </tr>
+          </table>
+        </el-card>
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>订单信息</span>
+          </div>
+          <table border="1" style="border-color: #fff" width="100%" align="center" cellspacing="0" cellpadding="10">
+            <thead>
+              <tr>
+                <th class="bold" align="center">名称</th>
+                <th class="bold" align="center">收费类型</th>
+                <th class="bold" align="center">工单类型</th>
+                <th class="bold" align="center">数量</th>
+                <th class="bold" align="center">单价</th>
+                <th class="bold" align="center">订单金额</th>
+                <th class="bold" align="center">销售类型</th>
+                <th class="bold" align="center">师傅分账金额</th>
+                <th class="bold" align="center">商户分账金额</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-for="(item, index) in formData.settlementOrderItemList" :key="index">
+                <td align="center">{{ item.goodsName }}</td>
+                <td align="center">
+                  {{ item.chargeType == 'ACC' ? '配件物料' : item.chargeType == 'SERV' ? '服务收费' : '辅材物料' }}
+                </td>
+                <td align="center">{{ formData.saleType | saleTypeFilter }}</td>
+                <td align="center">{{ item.num }}</td>
+                <td align="center">{{ item.goodsAmount }}</td>
+                <td align="center">{{ item.totalAmount }}</td>
+                <td align="center">
+                  {{ item.settlementType == 'OWN' ? '自有' : item.settlementType == 'OUT' ? '外购' : '' }}
+                </td>
+                <td align="center">{{ item.workerAmount }}</td>
+                <td align="center">{{ item.websitAmount }}</td>
+              </tr>
+              <tr>
+                <td align="center">总计</td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td align="center">{{ totalAmount }}</td>
+                <td></td>
+                <td align="center">{{ workerAmount }}</td>
+                <td align="center">{{ websitAmount }}</td>
+              </tr>
+            </tbody>
+          </table>
+        </el-card>
+        <div slot="footer" class="dialog-footer">
+          <el-button
+            size="mini"
+            @click="
+              formDialog = false
+              formData = {}
+              data.removeTab()
+            "
+            >取 消</el-button
+          >
+          <el-button
+            size="mini"
+            v-if="formData.status == 'WAIT'"
+            type="primary"
+            @click="settleAccounts(formData.settlementOrderId, data.removeTab, 2)"
+            >确认结算
+          </el-button>
+          <!-- <el-button size="mini" v-if="formData.status == 'WAIT_ING'" type="primary" @click="withdraw(formData.settlementOrderId,data.removeTab)">
 						确认提现
 					</el-button> -->
-				</div>
-			</div>
-		</template>
-	</zj-tab-page>	
+        </div>
+      </div>
+    </template>
+  </zj-tab-page>
 </template>
 
 <script>
@@ -126,251 +168,268 @@ import operation_mixin from '@/components/template/operation_mixin.js'
 import ImageUpload from '@/components/file-upload'
 import { downloadFiles } from '@/utils/util'
 import { required, mobileRequired, mobile, httpUrl, email } from '@/components/template/rules_verify.js'
-import { listPageV1,listPageV2,pageExport1,pageExport2, getDetail, refund, settleAccounts } from "@/api/auxiliaryFittings/settleAccountOfflinePay";
+import {
+  listPageV1,
+  listPageV2,
+  pageExport1,
+  pageExport2,
+  getDetail,
+  refund,
+  settleAccounts
+} from '@/api/auxiliaryFittings/settleAccountOfflinePay'
 export default {
   components: { TemplatePage, ImageUpload },
-  mixins: [import_mixin,operation_mixin],
-	filters: {
-		saleTypeFilter(val) {
-			const MAP = {
-				1: '零售',
-				2: '工程',
-				3: '延保',
-				4: '工程维保',
-			}
-			return MAP[val];
-		}
-	},
+  mixins: [import_mixin, operation_mixin],
+  filters: {
+    saleTypeFilter(val) {
+      const MAP = {
+        1: '零售',
+        2: '工程',
+        3: '延保',
+        4: '工程维保'
+      }
+      return MAP[val]
+    }
+  },
   data() {
     return {
-		// 表格属性
-		tableAttributes: {
-			// 启用勾选列
-			selectColumn: true
-		},
-		// 表格事件
-		tableEvents: {
-			'selection-change': this.selectionChange
-		},
-		// 勾选选中行
-		recordSelected: [],
-		formDialogType: 0,
-		formDialogTitles: ["新增","编辑", "详情"],
-		formDialog: false,
-		formData: {},
-		tabIndex: this?.$route?.params?.pageType || 1,
-		status: this?.$route?.params?.pageCode || '',
-		totalAmount: 0,
-		workerAmount: 0,
-		websitAmount: 0,
-		workerId: '',
-		websitId: '',
-		tabIndexShow: true,
-		formType: 'add',
-		formVisible: false,
+      // 表格属性
+      tableAttributes: {
+        // 启用勾选列
+        selectColumn: true
+      },
+      // 表格事件
+      tableEvents: {
+        'selection-change': this.selectionChange
+      },
+      // 勾选选中行
+      recordSelected: [],
+      formDialogType: 0,
+      formDialogTitles: ['新增', '编辑', '详情'],
+      formDialog: false,
+      formData: {},
+      tabIndex: this?.$route?.params?.pageType || 1,
+      status: this?.$route?.params?.pageCode || '',
+      totalAmount: 0,
+      workerAmount: 0,
+      websitAmount: 0,
+      workerId: '',
+      websitId: '',
+      tabIndexShow: true,
+      formType: 'add',
+      formVisible: false
     }
   },
   watch: {
-  	tabIndex() {
-  		this.tabIndexShow = false
-  		this.$nextTick(() => {
-			if(this.tabIndex == 1){
-				this.status = ''
-				this.workerId = ''
-				this.websitId = ''
-			}
-  			this.tabIndexShow = true
-  		})
-  	}
+    tabIndex() {
+      this.tabIndexShow = false
+      this.$nextTick(() => {
+        if (this.tabIndex == 1) {
+          this.status = ''
+          this.workerId = ''
+          this.websitId = ''
+        }
+        this.tabIndexShow = true
+      })
+    }
   },
   computed: {
-	  // 事件组合
-	  optionsEvensGroup() {
-	  	return [
-	  		[
-	  			[
-	  				this.optionsEvensAuth("bulkSettlement", {
-						isRole: this.tabIndex== 2,
-	  					click: () => {
-	  						this.batchSettleAccounts()
-	  					}
-	  				})
-	  			],
-	  		]
-	  	]
-	  },
+    // 事件组合
+    optionsEvensGroup() {
+      return [
+        [
+          [
+            this.optionsEvensAuth('bulkSettlement', {
+              isRole: this.tabIndex == 2,
+              click: () => {
+                this.batchSettleAccounts()
+              }
+            })
+          ]
+        ]
+      ]
+    },
     // 更多参数
     moreParameters() {
       return []
     }
   },
   methods: {
-	// 切换状态
-	changeType(val) {
-	  this.workerId = ''
-	  this.websitId = ''
-	  this.$refs.pageRef.refreshList()
-	},
+    // 切换状态
+    changeType(val) {
+      this.workerId = ''
+      this.websitId = ''
+      this.$refs.pageRef.refreshList()
+    },
     // 列表请求函数
-	getList(p) {
-	  try {
-	    var pam = JSON.parse(JSON.stringify(p))
-		pam.params.push({ "param": "a.pay_type", "compare": "=", "value": 'LINE' })
-	    if (this.status && this.tabIndex==2) {
-	      pam.params.push({ "param": "a.status", "compare": "=", "value": this.status })
-	    }
-		if(this.workerId){
-			pam.params.push({ "param": "a.websit_id", "compare": "=", "value": this.websitId },{ "param": "a.worker_id", "compare": "=", "value": this.workerId })
-		}
-	    return this.tabIndex==1?listPageV1(pam):listPageV2(pam)
-	  } catch (error) {
-	    console.log(error)
-	  }
-	},
+    getList(p) {
+      try {
+        var pam = JSON.parse(JSON.stringify(p))
+        pam.params.push({ param: 'a.pay_type', compare: '=', value: 'LINE' })
+        if (this.status && this.tabIndex == 2) {
+          pam.params.push({ param: 'a.status', compare: '=', value: this.status })
+        }
+        if (this.workerId) {
+          pam.params.push(
+            { param: 'a.websit_id', compare: '=', value: this.websitId },
+            { param: 'a.worker_id', compare: '=', value: this.workerId }
+          )
+        }
+        return this.tabIndex == 1 ? listPageV1(pam) : listPageV2(pam)
+      } catch (error) {
+        console.log(error)
+      }
+    },
     // 列表导出函数
     exportList1: pageExport1,
     exportList2: pageExport2,
     // 表格列解析渲染数据更改
     columnParsing(item, defaultData) {
-		return defaultData
+      return defaultData
     },
     // 监听勾选变化
     selectionChange(data) {
       this.recordSelected = data
     },
-	openForm(type, id) {
-		this.$refs.tabPage.addTab({
-			// 对应显示的模块
-			activeKey: type,
-			// 唯一标识
-			key: type,
-			// 页签名称
-			label: ({ detail: "详情" })[type],
-			// 打开时事件
-			triggerEvent: () => {
-				this.formCancel()
-				this.$nextTick(()=>{
-					this.formType = type
-					this.formVisible = true
-					if (type == 'detail') {
-						this.formDialogType = 1
-						this.totalAmount = 0
-						this.workerAmount = 0
-						this.websitAmount = 0
-						getDetail({ id }).then(res => {
-						  Object.assign(this.formData, res.data)
-						  res.data.settlementOrderItemList.forEach(item=>{
-							  this.totalAmount += (item.totalAmount*100 +  this.totalAmount*100)/100
-							  this.workerAmount = (item.workerAmount*100 +  this.workerAmount*100)/100
-							  this.websitAmount += (item.websitAmount*100 +  this.websitAmount*100)/100
-						  })
-						})
-					}
-				})
-			},
-			// 关闭时事件
-			closeEvent: () => {
-			
-			}
-		})
-	},
-	formCancel() {
-		this.formVisible = false
-		this.$refs?.formRef?.resetFields()
-		this.$data.formData = this.$options.data().formData
-	},
-	// 表格操作列
-	operation() {
-		return this.operationBtn({
-			detail: {
-				btnType: 'text',
-				name: ({ row, index, column }) => {
-					return this.tabIndex==1?'查看明细':'详情'
-				},
-				click: ({ row, index, column }) => {
-					if(this.tabIndex==1){
-						this.workerId = row.workerId
-						this.websitId = row.websitId
-						this.tabIndex = 2
-						this.$refs.pageRef.refreshList()
-					}else{
-						this.openForm('detail',row.settlementOrderId)
-					}
-				}
-			},
-			refund: {
-				btnType: 'text',
-				prompt: '确认是否退款？',
-				conditions: ({ row, index, column }) => {
-					return row.totalAmount > 0 && row.refundStatus == 'NO' && this.tabIndex==2
-				},
-				click: ({ row, index, column }) => {
-					refund({ id: row.settlementOrderId }).then(res => {
-					  if (res.code == 200) {
-					  	this.$message({ type: 'success', message: '退款成功!' })
-					  	this.$refs.pageRef.refreshList()
-					  } else {
-					  	this.$message.error(res.msg);
-					  }
-					})
-				}
-			},
-			settlement: {
-				btnType: 'text',
-				conditions: ({ row, index, column }) => {
-					return row.status == 'WAIT' || this.tabIndex==1
-				},
-				click: ({ row, index, column }) => {
-					if(this.tabIndex==1){
-						this.status = 'WAIT'
-						this.workerId = row.workerId
-						this.websitId = row.websitId
-						this.tabIndex = 2
-						this.$refs.pageRef.refreshList()
-					}else{
-						this.settleAccounts(row.settlementOrderId)
-					}
-				}
-			}
-		})
-	},
-	batchSettleAccounts(){
-		if(this.recordSelected.length == 0){
-			return this.$message.warning('请至少勾选一条数据！');
-		}
-		this.settleAccounts(this.recordSelected.map(item=>{return item.settlementOrderId}).join(','))
-	},
-	settleAccounts(id,cancel,type){
-		this.$confirm(`请确认是否结算选中数据, 是否继续?`, '提示', {
-			confirmButtonText: '确定',
-			cancelButtonText: '取消',
-			type: 'warning'
-		}).then(() => {
-			settleAccounts({
-				id
-			}).then(res => {
-				if (res.code == 200) {
-					this.$message({ type: 'success', message: `结算成功!` })
-					if(type== 2){cancel('list')}
-					this.$refs.pageRef.refreshList()
-					this.formDialog = false
-				} else {
-					this.$message.error(res.msg);
-				}
-			})
-		});
-	}
+    openForm(type, id) {
+      this.$refs.tabPage.addTab({
+        // 对应显示的模块
+        activeKey: type,
+        // 唯一标识
+        key: type,
+        // 页签名称
+        label: { detail: '详情' }[type],
+        // 打开时事件
+        triggerEvent: () => {
+          this.formCancel()
+          this.$nextTick(() => {
+            this.formType = type
+            this.formVisible = true
+            if (type == 'detail') {
+              this.formDialogType = 1
+              this.totalAmount = 0
+              this.workerAmount = 0
+              this.websitAmount = 0
+              getDetail({ id }).then(res => {
+                Object.assign(this.formData, res.data)
+                res.data.settlementOrderItemList.forEach(item => {
+                  this.totalAmount += (item.totalAmount * 100 + this.totalAmount * 100) / 100
+                  this.workerAmount = (item.workerAmount * 100 + this.workerAmount * 100) / 100
+                  this.websitAmount += (item.websitAmount * 100 + this.websitAmount * 100) / 100
+                })
+              })
+            }
+          })
+        },
+        // 关闭时事件
+        closeEvent: () => {}
+      })
+    },
+    formCancel() {
+      this.formVisible = false
+      this.$refs?.formRef?.resetFields()
+      this.$data.formData = this.$options.data().formData
+    },
+    // 表格操作列
+    operation() {
+      return this.operationBtn({
+        detail: {
+          btnType: 'text',
+          name: ({ row, index, column }) => {
+            return this.tabIndex == 1 ? '查看明细' : '详情'
+          },
+          click: ({ row, index, column }) => {
+            if (this.tabIndex == 1) {
+              this.workerId = row.workerId
+              this.websitId = row.websitId
+              this.tabIndex = 2
+              this.$refs.pageRef.refreshList()
+            } else {
+              this.openForm('detail', row.settlementOrderId)
+            }
+          }
+        },
+        refund: {
+          btnType: 'text',
+          prompt: '确认是否退款？',
+          conditions: ({ row, index, column }) => {
+            return row.totalAmount > 0 && row.refundStatus == 'NO' && this.tabIndex == 2
+          },
+          click: ({ row, index, column }) => {
+            refund({ id: row.settlementOrderId }).then(res => {
+              if (res.code == 200) {
+                this.$message({ type: 'success', message: '退款成功!' })
+                this.$refs.pageRef.refreshList()
+              } else {
+                this.$message.error(res.msg)
+              }
+            })
+          }
+        },
+        settlement: {
+          btnType: 'text',
+          conditions: ({ row, index, column }) => {
+            return row.status == 'WAIT' || this.tabIndex == 1
+          },
+          click: ({ row, index, column }) => {
+            if (this.tabIndex == 1) {
+              this.status = 'WAIT'
+              this.workerId = row.workerId
+              this.websitId = row.websitId
+              this.tabIndex = 2
+              this.$refs.pageRef.refreshList()
+            } else {
+              this.settleAccounts(row.settlementOrderId)
+            }
+          }
+        }
+      })
+    },
+    batchSettleAccounts() {
+      if (this.recordSelected.length == 0) {
+        return this.$message.warning('请至少勾选一条数据！')
+      }
+      this.settleAccounts(
+        this.recordSelected
+          .map(item => {
+            return item.settlementOrderId
+          })
+          .join(',')
+      )
+    },
+    settleAccounts(id, cancel, type) {
+      this.$confirm(`请确认是否结算选中数据, 是否继续?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        settleAccounts({
+          id
+        }).then(res => {
+          if (res.code == 200) {
+            this.$message({ type: 'success', message: `结算成功!` })
+            if (type == 2) {
+              cancel('list')
+            }
+            this.$refs.pageRef.refreshList()
+            this.formDialog = false
+          } else {
+            this.$message.error(res.msg)
+          }
+        })
+      })
+    }
   }
 }
 </script>
 
 <style lang="scss" scoped>
-	.tab{
-		padding: 20px 20px 0 20px;
-	}
-	.bold{
-		width: 160px;
-		font-weight: bold;
-		background-color: #f0f0f0;
-	}
+.tab {
+  padding: 20px 20px 0 20px;
+}
+.bold {
+  width: 160px;
+  font-weight: bold;
+  background-color: #f0f0f0;
+}
 </style>

src/views/auxiliaryFittings/settleAccountManagement/settleAccountWeixinPay/index.vue

@@ -1,169 +1,219 @@
 <template>
-	<zj-tab-page ref="tabPage" :defaultActives="[{ key: 'list', label: $route.meta.title+'-列表', essential: true }]">
-		<template slot-scope="{activeKey, data}">
-			<template-page ref="pageRef" v-if="tabIndexShow && activeKey == 'list'" :get-list="getList" :table-attributes="tableAttributes"
-				:table-events="tableEvents" :operationColumnWidth="120" :options-evens-group="optionsEvensGroup"
-				:moreParameters="moreParameters" :column-parsing="columnParsing" :operation="operation()"
-				:exportList="tabIndex == 1 ? exportList1 : exportList2">
-			  <div slot="moreSearch" style="margin-bottom: 10px;">
-			  	<el-radio-group v-model="tabIndex" size="mini" @change="changeType">
-			  		<el-radio-button label="1">汇总</el-radio-button>
-			  		<el-radio-button label="2">明细</el-radio-button>
-			  	</el-radio-group>
-			  </div>
-			  <div slot="moreSearch" v-if="tabIndex == 2">
-			  	<el-radio-group v-model="status" size="mini" @change="changeType">
-			  		<el-radio-button label="">全部</el-radio-button>
-			  		<el-radio-button label="WAIT">待结算</el-radio-button>
-			  		<el-radio-button label="WAIT_ING">可提现</el-radio-button>
-			  		<el-radio-button label="ING">提现中</el-radio-button>
-			  		<el-radio-button label="OVER">已提现</el-radio-button>
-			  	</el-radio-group>
-			  	<br><br>
-			  </div>
-			</template-page>
-			<div v-if="~['detail'].indexOf(activeKey)">
-				<el-card class="box-card">
-					<div slot="header" class="clearfix">
-						<span>基础信息</span>
-					</div>
-					<table border="1" style="border-color: #fff;" width="100%" align="center" cellspacing="0" cellpadding="10">
-						<tr>
-							<td class="bold" align="center">所属商户</td>
-							<td>{{ formData.companyWechatName }}</td>
-							<td class="bold" align="center">关联工单号</td>
-							<td>{{ formData.workerOrderId }}</td>
-							<td class="bold" align="center">结算单号</td>
-							<td>{{ formData.settlementOrderId }}</td>
-							<td class="bold" align="center">工单品牌</td>
-							<td>{{ formData.brand }}</td>
-						</tr>
-						<tr>
-							<td class="bold" align="center">客户姓名</td>
-							<td>{{ formData.userName }}</td>
-							<td class="bold" align="center">客户电话</td>
-							<td>{{ formData.userMobile }}</td>
-							<td class="bold" align="center">师傅姓名</td>
-							<td>{{ formData.workerName }}</td>
-							<td class="bold" align="center">师傅身份证号</td>
-							<td>{{ formData.identity }}</td>
-						</tr>
-						<tr>
-							<td class="bold" align="center">师傅联系电话</td>
-							<td>{{ formData.workerMobile }}</td>
-							<td class="bold" align="center">订单金额</td>
-							<td>{{ formData.totalAmount }}</td>
-							<td class="bold" align="center">销售类型</td>
-							<td>{{ formData.settlementType == 'OWN' ? '自由' : formData.settlementType == 'OUT' ? '外购' : '' }}</td>
-							<td class="bold" align="center">创建人</td>
-							<td>{{ formData.createBy }}</td>
-						</tr>
-						<tr>
-							<td class="bold" align="center">创建时间</td>
-							<td>{{ formData.createTime }}</td>
-							<td class="bold" align="center">支付状态</td>
-							<td>{{ formData.payStatus == 'CANCEL' ? '取消' : formData.payStatus == 'PAID' ? '已支付' : formData.payStatus ==
-								'WAIT' ? '待支付' : '' }}</td>
-							<td class="bold" align="center">支付订单号</td>
-							<td>{{ formData.orderId }}</td>
-							<td class="bold" align="center">支付时间</td>
-							<td>{{ formData.payTime }}</td>
-						</tr>
-						<tr>
-							<td class="bold" align="center">分账单号</td>
-							<td>{{ formData.settlementOrderId }}</td>
-							<td class="bold" align="center">分账状态</td>
-							<td>{{ formData.status == 'WAIT' ? '待结算' : formData.status == 'WAIT_ING' ? '可提现' : formData.status ==
-								'ING' ? '提现中' : formData.status == 'OVER' ? '已提现' : '' }}</td>
-							<td class="bold" align="center">分账金额</td>
-							<td>{{ formData.amount }}</td>
-							<td class="bold" align="center">分账时间</td>
-							<td>{{ formData.settlementTime }}</td>
-						</tr>
-						<tr>
-							<td class="bold" align="center">师傅分账金额</td>
-							<td>{{ formData.workerAmount }}</td>
-							<td class="bold" align="center">师傅分账金额手续费</td>
-							<td>{{ formData.workerProceAmount }}</td>
-							<td class="bold" align="center">商户分账金额</td>
-							<td>{{ formData.websitAmount }}</td>
-							<td class="bold" align="center">商户分账金额手续费</td>
-							<td>{{ formData.websitProceAmount }}</td>
-						</tr>
-						<tr>
-							<td class="bold" align="center">操作人</td>
-							<td>{{ formData.updateBy }}</td>
-							<td class="bold" align="center">操作时间</td>
-							<td>{{ formData.updateTime }}</td>
-							<td></td>
-							<td></td>
-							<td></td>
-							<td></td>
-						</tr>
-					</table>
-				</el-card>
-				<el-card class="box-card">
-					<div slot="header" class="clearfix">
-						<span>订单信息</span>
-					</div>
-					<table border="1" style="border-color: #fff;" width="100%" align="center" cellspacing="0" cellpadding="10">
-						<thead>
-							<tr>
-								<th class="bold" align="center">名称</th>
-								<th class="bold" align="center">收费类型</th>
-								<th class="bold" align="center">工单类型</th>
-								<th class="bold" align="center">数量</th>
-								<th class="bold" align="center">单价</th>
-								<th class="bold" align="center">订单金额</th>
-								<th class="bold" align="center">销售类型</th>
-								<th class="bold" align="center">手续费</th>
-								<th class="bold" align="center">师傅分账金额</th>
-								<th class="bold" align="center">商户分账金额</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(item, index) in formData.settlementOrderItemList" :key="index">
-								<td align="center">{{ item.goodsName }}</td>
-								<td align="center">{{ item.chargeType == 'ACC' ? '配件物料': item.chargeType == 'SERV' ? '服务收费':'辅材物料' }}</td>
-								<td align="center">{{ formData.saleType | saleTypeFilter }}</td>
-								<td align="center">{{ item.num }}</td>
-								<td align="center">{{ item.goodsAmount }}</td>
-								<td align="center">{{ item.totalAmount }}</td>
-								<td align="center">{{ item.settlementType == 'OWN' ? '自有' : item.settlementType == 'OUT' ? '外购' : '' }}</td>
-								<td align="center">{{ (item.websitProceAmount * 100 + item.workerProceAmount * 100) / 100 }}</td>
-								<td align="center">{{ item.workerAmount }}</td>
-								<td align="center">{{ item.websitAmount }}</td>
-							</tr>
-							<!-- <tr>
+  <zj-tab-page ref="tabPage" :defaultActives="[{ key: 'list', label: $route.meta.title + '-列表', essential: true }]">
+    <template slot-scope="{ activeKey, data }">
+      <template-page
+        ref="pageRef"
+        v-if="tabIndexShow && activeKey == 'list'"
+        :get-list="getList"
+        :table-attributes="tableAttributes"
+        :table-events="tableEvents"
+        :operationColumnWidth="120"
+        :options-evens-group="optionsEvensGroup"
+        :moreParameters="moreParameters"
+        :column-parsing="columnParsing"
+        :operation="operation()"
+        :exportList="tabIndex == 1 ? exportList1 : exportList2"
+      >
+        <div slot="moreSearch" style="margin-bottom: 10px">
+          <el-radio-group v-model="tabIndex" size="mini" @change="changeType">
+            <el-radio-button label="1">汇总</el-radio-button>
+            <el-radio-button label="2">明细</el-radio-button>
+          </el-radio-group>
+        </div>
+        <div slot="moreSearch" v-if="tabIndex == 2">
+          <el-radio-group v-model="status" size="mini" @change="changeType">
+            <el-radio-button label="">全部</el-radio-button>
+            <el-radio-button label="WAIT">待结算</el-radio-button>
+            <el-radio-button label="WAIT_ING">可提现</el-radio-button>
+            <el-radio-button label="ING">提现中</el-radio-button>
+            <el-radio-button label="OVER">已提现</el-radio-button>
+          </el-radio-group>
+          <br /><br />
+        </div>
+      </template-page>
+      <div v-if="~['detail'].indexOf(activeKey)">
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>基础信息</span>
+          </div>
+          <table border="1" style="border-color: #fff" width="100%" align="center" cellspacing="0" cellpadding="10">
+            <tr>
+              <td class="bold" align="center">关联工单号</td>
+              <td>{{ formData.workerOrderId }}</td>
+              <td class="bold" align="center">结算单号</td>
+              <td>{{ formData.settlementOrderId }}</td>
+              <td class="bold" align="center">工单品牌</td>
+              <td>{{ formData.brand }}</td>
+              <td class="bold" align="center"></td>
+              <td></td>
+            </tr>
+            <tr>
+              <td class="bold" align="center">客户姓名</td>
+              <td>{{ formData.userName }}</td>
+              <td class="bold" align="center">客户电话</td>
+              <td>{{ formData.userMobile }}</td>
+              <td class="bold" align="center">师傅姓名</td>
+              <td>{{ formData.workerName }}</td>
+              <td class="bold" align="center">师傅身份证号</td>
+              <td>{{ formData.identity }}</td>
+            </tr>
+            <tr>
+              <td class="bold" align="center">师傅联系电话</td>
+              <td>{{ formData.workerMobile }}</td>
+              <td class="bold" align="center">订单金额</td>
+              <td>{{ formData.totalAmount }}</td>
+              <td class="bold" align="center">销售类型</td>
+              <td>{{ formData.settlementType == 'OWN' ? '自由' : formData.settlementType == 'OUT' ? '外购' : '' }}</td>
+              <td class="bold" align="center">创建人</td>
+              <td>{{ formData.createBy }}</td>
+            </tr>
+            <tr>
+              <td class="bold" align="center">创建时间</td>
+              <td>{{ formData.createTime }}</td>
+              <td class="bold" align="center">支付状态</td>
+              <td>
+                {{
+                  formData.payStatus == 'CANCEL'
+                    ? '取消'
+                    : formData.payStatus == 'PAID'
+                    ? '已支付'
+                    : formData.payStatus == 'WAIT'
+                    ? '待支付'
+                    : ''
+                }}
+              </td>
+              <td class="bold" align="center">支付订单号</td>
+              <td>{{ formData.orderId }}</td>
+              <td class="bold" align="center">支付时间</td>
+              <td>{{ formData.payTime }}</td>
+            </tr>
+            <tr>
+              <td class="bold" align="center">分账单号</td>
+              <td>{{ formData.settlementOrderId }}</td>
+              <td class="bold" align="center">分账状态</td>
+              <td>
+                {{
+                  formData.status == 'WAIT'
+                    ? '待结算'
+                    : formData.status == 'WAIT_ING'
+                    ? '可提现'
+                    : formData.status == 'ING'
+                    ? '提现中'
+                    : formData.status == 'OVER'
+                    ? '已提现'
+                    : ''
+                }}
+              </td>
+              <td class="bold" align="center">分账金额</td>
+              <td>{{ formData.amount }}</td>
+              <td class="bold" align="center">分账时间</td>
+              <td>{{ formData.settlementTime }}</td>
+            </tr>
+            <tr>
+              <td class="bold" align="center">师傅分账金额</td>
+              <td>{{ formData.workerAmount }}</td>
+              <td class="bold" align="center">师傅分账金额手续费</td>
+              <td>{{ formData.workerProceAmount }}</td>
+              <td class="bold" align="center">商户分账金额</td>
+              <td>{{ formData.websitAmount }}</td>
+              <td class="bold" align="center">商户分账金额手续费</td>
+              <td>{{ formData.websitProceAmount }}</td>
+            </tr>
+            <tr>
+              <td class="bold" align="center">操作人</td>
+              <td>{{ formData.updateBy }}</td>
+              <td class="bold" align="center">操作时间</td>
+              <td>{{ formData.updateTime }}</td>
+              <td></td>
+              <td></td>
+              <td></td>
+              <td></td>
+            </tr>
+          </table>
+        </el-card>
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span>订单信息</span>
+          </div>
+          <table border="1" style="border-color: #fff" width="100%" align="center" cellspacing="0" cellpadding="10">
+            <thead>
+              <tr>
+                <th class="bold" align="center">名称</th>
+                <th class="bold" align="center">收费类型</th>
+                <th class="bold" align="center">工单类型</th>
+                <th class="bold" align="center">数量</th>
+                <th class="bold" align="center">单价</th>
+                <th class="bold" align="center">订单金额</th>
+                <th class="bold" align="center">销售类型</th>
+                <th class="bold" align="center">手续费</th>
+                <th class="bold" align="center">师傅分账金额</th>
+                <th class="bold" align="center">商户分账金额</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-for="(item, index) in formData.settlementOrderItemList" :key="index">
+                <td align="center">{{ item.goodsName }}</td>
+                <td align="center">
+                  {{ item.chargeType == 'ACC' ? '配件物料' : item.chargeType == 'SERV' ? '服务收费' : '辅材物料' }}
+                </td>
+                <td align="center">{{ formData.saleType | saleTypeFilter }}</td>
+                <td align="center">{{ item.num }}</td>
+                <td align="center">{{ item.goodsAmount }}</td>
+                <td align="center">{{ item.totalAmount }}</td>
+                <td align="center">
+                  {{ item.settlementType == 'OWN' ? '自有' : item.settlementType == 'OUT' ? '外购' : '' }}
+                </td>
+                <td align="center">{{ (item.websitProceAmount * 100 + item.workerProceAmount * 100) / 100 }}</td>
+                <td align="center">{{ item.workerAmount }}</td>
+                <td align="center">{{ item.websitAmount }}</td>
+              </tr>
+              <!-- <tr>
 								<td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>
 							</tr> -->
-							<tr>
-								<td align="center">总计</td>
-								<td></td>
-								<td></td>
-								<td></td>
-								<td></td>
-								<td align="center">{{ totalAmount }}</td>
-								<td></td>
-								<td align="center">{{ commissionAmount }}</td>
-								<td align="center">{{ workerAmount }}</td>
-								<td align="center">{{ websitAmount }}</td>
-							</tr>
-						</tbody>
-					</table>
-				</el-card>
-				<div slot="footer" class="dialog-footer">
-					<el-button size="mini" @click="formDialog = false; formData = {};data.removeTab()">取 消</el-button>
-					<el-button size="mini" v-if="formData.status == 'WAIT'" type="primary"
-						@click="settleAccounts(formData.settlementOrderId,data.removeTab,2)">确认结算
-					</el-button>
-					<el-button size="mini" v-if="formData.status == 'WAIT_ING'" type="primary" @click="withdraw(formData.settlementOrderId,data.removeTab,2)">
-						确认提现
-					</el-button>
-				</div>
-			</div>
-		</template>
-	</zj-tab-page>
+              <tr>
+                <td align="center">总计</td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td></td>
+                <td align="center">{{ totalAmount }}</td>
+                <td></td>
+                <td align="center">{{ commissionAmount }}</td>
+                <td align="center">{{ workerAmount }}</td>
+                <td align="center">{{ websitAmount }}</td>
+              </tr>
+            </tbody>
+          </table>
+        </el-card>
+        <div slot="footer" class="dialog-footer">
+          <el-button
+            size="mini"
+            @click="
+              formDialog = false
+              formData = {}
+              data.removeTab()
+            "
+            >取 消</el-button
+          >
+          <el-button
+            size="mini"
+            v-if="formData.status == 'WAIT'"
+            type="primary"
+            @click="settleAccounts(formData.settlementOrderId, data.removeTab, 2)"
+            >确认结算
+          </el-button>
+          <el-button
+            size="mini"
+            v-if="formData.status == 'WAIT_ING'"
+            type="primary"
+            @click="withdraw(formData.settlementOrderId, data.removeTab, 2)"
+          >
+            确认提现
+          </el-button>
+        </div>
+      </div>
+    </template>
+  </zj-tab-page>
 </template>
 
 <script>
@@ -173,299 +223,327 @@ import operation_mixin from '@/components/template/operation_mixin.js'
 import ImageUpload from '@/components/file-upload'
 import { downloadFiles } from '@/utils/util'
 import { required, mobileRequired, mobile, httpUrl, email } from '@/components/template/rules_verify.js'
-import { listPageV1, listPageV2, pageExport1, pageExport2, getDetail, refund, settleAccounts, withdraw } from "@/api/auxiliaryFittings/settleAccountWeixinPay";
+import {
+  listPageV1,
+  listPageV2,
+  pageExport1,
+  pageExport2,
+  getDetail,
+  refund,
+  settleAccounts,
+  withdraw
+} from '@/api/auxiliaryFittings/settleAccountWeixinPay'
 export default {
-	components: { TemplatePage, ImageUpload },
-	mixins: [import_mixin, operation_mixin],
-	filters: {
-		saleTypeFilter(val) {
-			const MAP = {
-				1: '零售',
-				2: '工程',
-				3: '延保',
-				4: '工程维保',
-			}
-			return MAP[val];
-		}
-	},
-	data() {
-		return {
-			// 表格属性
-			tableAttributes: {
-				// 启用勾选列
-				selectColumn: true
-			},
-			// 表格事件
-			tableEvents: {
-				'selection-change': this.selectionChange
-			},
-			// 勾选选中行
-			recordSelected: [],
-			formDialogType: 0,
-			formDialogTitles: ["新增", "编辑", "详情"],
-			formDialog: false,
-			formData: {},
-			tabIndex: this?.$route?.params?.pageType || 1,
-			status: this?.$route?.params?.pageCode || '',
-			totalAmount: 0,
-			workerAmount: 0,
-			websitAmount: 0,
-			commissionAmount: 0,
-			workerId: '',
-			websitId: '',
-			tabIndexShow: true,
-			formType: 'add',
-			formVisible: false,
-		}
-	},
-	watch: {
-		tabIndex() {
-			this.tabIndexShow = false
-			this.$nextTick(() => {
-				if(this.tabIndex == 1){
-					this.status = ''
-					this.workerId = ''
-					this.websitId = ''
-				}
-				this.tabIndexShow = true
-			})
-		}
-	},
-	computed: {
-		// 事件组合
-		optionsEvensGroup() {
-			return [
-				[
-					[
-						this.optionsEvensAuth("bulkSettlement", {
-							isRole: this.tabIndex == 2,
-							click: () => {
-								this.batchSettleAccounts()
-							}
-						})
-					],
-				],
-				[
-					[
-						this.optionsEvensAuth("bulkWithdrawal", {
-							isRole: this.tabIndex == 2,
-							click: () => {
-								this.batchWithdraw()
-							}
-						})
-					],
-				]
-			]
-		},
-		// 更多参数
-		moreParameters() {
-			return []
-		}
-	},
-	methods: {
-		// 切换状态
-		changeType(val) {
-			this.workerId = ''
-			this.websitId = ''
-			this.$refs.pageRef.refreshList()
-		},
-		// 列表请求函数
-		getList(p) {
-			try {
-				var pam = JSON.parse(JSON.stringify(p))
-				pam.params.push({ "param": "a.pay_type", "compare": "=", "value": 'WECHAT' })
-				if (this.status && this.tabIndex == 2) {
-					pam.params.push({ "param": "a.status", "compare": "=", "value": this.status })
-				}
-				if (this.workerId) {
-					pam.params.push({ "param": "a.websit_id", "compare": "=", "value": this.websitId }, { "param": "a.worker_id", "compare": "=", "value": this.workerId })
-				}
-				return this.tabIndex == 1 ? listPageV1(pam) : listPageV2(pam)
-			} catch (error) {
-				console.log(error)
-			}
-		},
-		// 列表导出函数
-		exportList1: pageExport1,
-		exportList2: pageExport2,
-		// 表格列解析渲染数据更改
-		columnParsing(item, defaultData) {
-			return defaultData
-		},
-		// 监听勾选变化
-		selectionChange(data) {
-			this.recordSelected = data
-		},
-		openForm(type, id) {
-			this.$refs.tabPage.addTab({
-				// 对应显示的模块
-				activeKey: type,
-				// 唯一标识
-				key: type,
-				// 页签名称
-				label: ({ detail: "详情" })[type],
-				// 打开时事件
-				triggerEvent: () => {
-					this.formCancel()
-					this.$nextTick(()=>{
-						this.formType = type
-						this.formVisible = true
-						if (type == 'detail') {
-							this.formDialogType = 1
-							this.totalAmount = 0
-							this.workerAmount = 0
-							this.websitAmount = 0
-							this.commissionAmount = 0
-							getDetail({ id  }).then(res => {
-								Object.assign(this.formData, res.data)
-								res.data.settlementOrderItemList.forEach(item => {
-									this.totalAmount += (item.totalAmount * 100 + this.totalAmount * 100) / 100
-									this.workerAmount = (item.workerAmount * 100 + this.workerAmount * 100) / 100
-									this.websitAmount += (item.websitAmount * 100 + this.websitAmount * 100) / 100
-									this.commissionAmount += (item.websitProceAmount * 100 + item.workerProceAmount * 100 + this.commissionAmount * 100) / 100
-								})
-							})
-						}
-					})
-				},
-				// 关闭时事件
-				closeEvent: () => {
-				
-				}
-			})
-		},
-		formCancel() {
-			this.formVisible = false
-			this.$refs?.formRef?.resetFields()
-			this.$data.formData = this.$options.data().formData
-		},
-		// 表格操作列
-		operation() {
-			return this.operationBtn({
-				detail: {
-					btnType: 'text',
-					name: ({ row, index, column }) => {
-						return this.tabIndex == 1 ? '查看明细' : '详情'
-					},
-					click: ({ row, index, column }) => {
-						if (this.tabIndex == 1) {
-							this.workerId = row.workerId
-							this.websitId = row.websitId
-							this.tabIndex = 2
-							this.$refs.pageRef.refreshList()
-						} else {
-							this.openForm('detail',row.settlementOrderId)
-						}
-					}
-				},
-				refund: {
-					btnType: 'text',
-					prompt: '确认是否退款？',
-					conditions: ({ row, index, column }) => {
-						return row.totalAmount > 0 && row.refundStatus == 'NO' && this.tabIndex == 2
-					},
-					click: ({ row, index, column }) => {
-						refund({ id: row.settlementOrderId }).then(res => {
-							if (res.code == 200) {
-								this.$message({ type: 'success', message: '退款成功!' })
-								this.$refs.pageRef.refreshList()
-							} else {
-								this.$message.error(res.msg);
-							}
-						})
-					}
-				},
-				settlement: {
-					btnType: 'text',
-					conditions: ({ row, index, column }) => {
-						return row.status == 'WAIT' || this.tabIndex == 1
-					},
-					click: ({ row, index, column }) => {
-						if (this.tabIndex == 1) {
-							this.status = 'WAIT'
-							this.workerId = row.workerId
-							this.websitId = row.websitId
-							this.tabIndex = 2
-							this.$refs.pageRef.refreshList()
-						} else {
-							this.settleAccounts(row.settlementOrderId)
-						}
-					}
-				},
-				withdraw: {
-					btnType: 'text',
-					conditions: ({ row, index, column }) => {
-						return row.status == 'WAIT_ING' && this.tabIndex == 2
-					},
-					click: ({ row, index, column }) => {
-						this.withdraw(row.settlementOrderId)
-					}
-				},
-			})
-		},
-		batchSettleAccounts() {
-			if (this.recordSelected.length == 0) {
-				return this.$message.warning('请至少勾选一条数据！');
-			}
-			this.settleAccounts(this.recordSelected.map(item => { return item.settlementOrderId }).join(','))
-		},
-		settleAccounts(id,cancel,type) {
-			this.$confirm(`请确认是否结算选中数据, 是否继续?`, '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning'
-			}).then(() => {
-				settleAccounts({
-					id
-				}).then(res => {
-					if (res.code == 200) {
-						this.$message({ type: 'success', message: `结算成功!` })
-						if(type== 2){cancel('list')}
-						this.$refs.pageRef.refreshList()
-						this.formDialog = false
-					} else {
-						this.$message.error(res.msg);
-					}
-				})
-			});
-		},
-		batchWithdraw() {
-			if (this.recordSelected.length == 0) {
-				return this.$message.warning('请至少勾选一条数据！');
-			}
-			this.withdraw(this.recordSelected.map(item => { return item.settlementOrderId }).join(','))
-		},
-		withdraw(id,cancel,type) {
-			this.$confirm(`请确认是否提现选中数据, 是否继续?`, '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning'
-			}).then(() => {
-				withdraw({
-					id
-				}).then(res => {
-					if (res.code == 200) {
-						this.$message({ type: 'success', message: `提现成功!` })
-						if(type== 2){cancel('list')}
-						this.$refs.pageRef.refreshList()
-						this.formDialog = false
-					} else {
-						this.$message.error(res.msg);
-					}
-				})
-			});
-		},
-	}
+  components: { TemplatePage, ImageUpload },
+  mixins: [import_mixin, operation_mixin],
+  filters: {
+    saleTypeFilter(val) {
+      const MAP = {
+        1: '零售',
+        2: '工程',
+        3: '延保',
+        4: '工程维保'
+      }
+      return MAP[val]
+    }
+  },
+  data() {
+    return {
+      // 表格属性
+      tableAttributes: {
+        // 启用勾选列
+        selectColumn: true
+      },
+      // 表格事件
+      tableEvents: {
+        'selection-change': this.selectionChange
+      },
+      // 勾选选中行
+      recordSelected: [],
+      formDialogType: 0,
+      formDialogTitles: ['新增', '编辑', '详情'],
+      formDialog: false,
+      formData: {},
+      tabIndex: this?.$route?.params?.pageType || 1,
+      status: this?.$route?.params?.pageCode || '',
+      totalAmount: 0,
+      workerAmount: 0,
+      websitAmount: 0,
+      commissionAmount: 0,
+      workerId: '',
+      websitId: '',
+      tabIndexShow: true,
+      formType: 'add',
+      formVisible: false
+    }
+  },
+  watch: {
+    tabIndex() {
+      this.tabIndexShow = false
+      this.$nextTick(() => {
+        if (this.tabIndex == 1) {
+          this.status = ''
+          this.workerId = ''
+          this.websitId = ''
+        }
+        this.tabIndexShow = true
+      })
+    }
+  },
+  computed: {
+    // 事件组合
+    optionsEvensGroup() {
+      return [
+        [
+          [
+            this.optionsEvensAuth('bulkSettlement', {
+              isRole: this.tabIndex == 2,
+              click: () => {
+                this.batchSettleAccounts()
+              }
+            })
+          ]
+        ],
+        [
+          [
+            this.optionsEvensAuth('bulkWithdrawal', {
+              isRole: this.tabIndex == 2,
+              click: () => {
+                this.batchWithdraw()
+              }
+            })
+          ]
+        ]
+      ]
+    },
+    // 更多参数
+    moreParameters() {
+      return []
+    }
+  },
+  methods: {
+    // 切换状态
+    changeType(val) {
+      this.workerId = ''
+      this.websitId = ''
+      this.$refs.pageRef.refreshList()
+    },
+    // 列表请求函数
+    getList(p) {
+      try {
+        var pam = JSON.parse(JSON.stringify(p))
+        pam.params.push({ param: 'a.pay_type', compare: '=', value: 'WECHAT' })
+        if (this.status && this.tabIndex == 2) {
+          pam.params.push({ param: 'a.status', compare: '=', value: this.status })
+        }
+        if (this.workerId) {
+          pam.params.push(
+            { param: 'a.websit_id', compare: '=', value: this.websitId },
+            { param: 'a.worker_id', compare: '=', value: this.workerId }
+          )
+        }
+        return this.tabIndex == 1 ? listPageV1(pam) : listPageV2(pam)
+      } catch (error) {
+        console.log(error)
+      }
+    },
+    // 列表导出函数
+    exportList1: pageExport1,
+    exportList2: pageExport2,
+    // 表格列解析渲染数据更改
+    columnParsing(item, defaultData) {
+      return defaultData
+    },
+    // 监听勾选变化
+    selectionChange(data) {
+      this.recordSelected = data
+    },
+    openForm(type, id) {
+      this.$refs.tabPage.addTab({
+        // 对应显示的模块
+        activeKey: type,
+        // 唯一标识
+        key: type,
+        // 页签名称
+        label: { detail: '详情' }[type],
+        // 打开时事件
+        triggerEvent: () => {
+          this.formCancel()
+          this.$nextTick(() => {
+            this.formType = type
+            this.formVisible = true
+            if (type == 'detail') {
+              this.formDialogType = 1
+              this.totalAmount = 0
+              this.workerAmount = 0
+              this.websitAmount = 0
+              this.commissionAmount = 0
+              getDetail({ id }).then(res => {
+                Object.assign(this.formData, res.data)
+                res.data.settlementOrderItemList.forEach(item => {
+                  this.totalAmount += (item.totalAmount * 100 + this.totalAmount * 100) / 100
+                  this.workerAmount = (item.workerAmount * 100 + this.workerAmount * 100) / 100
+                  this.websitAmount += (item.websitAmount * 100 + this.websitAmount * 100) / 100
+                  this.commissionAmount +=
+                    (item.websitProceAmount * 100 + item.workerProceAmount * 100 + this.commissionAmount * 100) / 100
+                })
+              })
+            }
+          })
+        },
+        // 关闭时事件
+        closeEvent: () => {}
+      })
+    },
+    formCancel() {
+      this.formVisible = false
+      this.$refs?.formRef?.resetFields()
+      this.$data.formData = this.$options.data().formData
+    },
+    // 表格操作列
+    operation() {
+      return this.operationBtn({
+        detail: {
+          btnType: 'text',
+          name: ({ row, index, column }) => {
+            return this.tabIndex == 1 ? '查看明细' : '详情'
+          },
+          click: ({ row, index, column }) => {
+            if (this.tabIndex == 1) {
+              this.workerId = row.workerId
+              this.websitId = row.websitId
+              this.tabIndex = 2
+              this.$refs.pageRef.refreshList()
+            } else {
+              this.openForm('detail', row.settlementOrderId)
+            }
+          }
+        },
+        refund: {
+          btnType: 'text',
+          prompt: '确认是否退款？',
+          conditions: ({ row, index, column }) => {
+            return row.totalAmount > 0 && row.refundStatus == 'NO' && this.tabIndex == 2
+          },
+          click: ({ row, index, column }) => {
+            refund({ id: row.settlementOrderId }).then(res => {
+              if (res.code == 200) {
+                this.$message({ type: 'success', message: '退款成功!' })
+                this.$refs.pageRef.refreshList()
+              } else {
+                this.$message.error(res.msg)
+              }
+            })
+          }
+        },
+        settlement: {
+          btnType: 'text',
+          conditions: ({ row, index, column }) => {
+            return row.status == 'WAIT' || this.tabIndex == 1
+          },
+          click: ({ row, index, column }) => {
+            if (this.tabIndex == 1) {
+              this.status = 'WAIT'
+              this.workerId = row.workerId
+              this.websitId = row.websitId
+              this.tabIndex = 2
+              this.$refs.pageRef.refreshList()
+            } else {
+              this.settleAccounts(row.settlementOrderId)
+            }
+          }
+        },
+        withdraw: {
+          btnType: 'text',
+          conditions: ({ row, index, column }) => {
+            return row.status == 'WAIT_ING' && this.tabIndex == 2
+          },
+          click: ({ row, index, column }) => {
+            this.withdraw(row.settlementOrderId)
+          }
+        }
+      })
+    },
+    batchSettleAccounts() {
+      if (this.recordSelected.length == 0) {
+        return this.$message.warning('请至少勾选一条数据！')
+      }
+      this.settleAccounts(
+        this.recordSelected
+          .map(item => {
+            return item.settlementOrderId
+          })
+          .join(',')
+      )
+    },
+    settleAccounts(id, cancel, type) {
+      this.$confirm(`请确认是否结算选中数据, 是否继续?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        settleAccounts({
+          id
+        }).then(res => {
+          if (res.code == 200) {
+            this.$message({ type: 'success', message: `结算成功!` })
+            if (type == 2) {
+              cancel('list')
+            }
+            this.$refs.pageRef.refreshList()
+            this.formDialog = false
+          } else {
+            this.$message.error(res.msg)
+          }
+        })
+      })
+    },
+    batchWithdraw() {
+      if (this.recordSelected.length == 0) {
+        return this.$message.warning('请至少勾选一条数据！')
+      }
+      this.withdraw(
+        this.recordSelected
+          .map(item => {
+            return item.settlementOrderId
+          })
+          .join(',')
+      )
+    },
+    withdraw(id, cancel, type) {
+      this.$confirm(`请确认是否提现选中数据, 是否继续?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        withdraw({
+          id
+        }).then(res => {
+          if (res.code == 200) {
+            this.$message({ type: 'success', message: `提现成功!` })
+            if (type == 2) {
+              cancel('list')
+            }
+            this.$refs.pageRef.refreshList()
+            this.formDialog = false
+          } else {
+            this.$message.error(res.msg)
+          }
+        })
+      })
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 .tab {
-	padding: 20px 20px 0 20px;
+  padding: 20px 20px 0 20px;
 }
 
 .bold {
-	width: 160px;
-	font-weight: bold;
-	background-color: #f0f0f0;
-}</style>
+  width: 160px;
+  font-weight: bold;
+  background-color: #f0f0f0;
+}
+</style>

src/views/auxiliaryFittings/supplier/index.vue

@@ -120,17 +120,6 @@ export default {
         {
           md: 6,
           isShow: true,
-          name: 'el-input',
-          attributes: { placeholder: '请输入', disabled: true },
-          formItemAttributes: {
-            label: '所属商户',
-            prop: 'companyName',
-            rules: [...required]
-          }
-        },
-        {
-          md: 6,
-          isShow: true,
           name: 'slot-component',
           attributes: {},
           formItemAttributes: {

src/views/engineerFeeSettlement/costPerDimension/index.vue

@@ -276,18 +276,6 @@ export default {
           name: 'el-input',
           md: 12,
           attributes: {
-            disabled: true
-          },
-          formItemAttributes: {
-            label: '所属商户',
-            prop: 'companyWechatName',
-            rules: []
-          }
-        },
-        {
-          name: 'el-input',
-          md: 12,
-          attributes: {
             disabled: this.formEdit
           },
           formItemAttributes: {

src/views/engineerFeeSettlement/dailyMaintenanceBalance/bankAccount/index.vue

@@ -157,18 +157,6 @@ export default {
           name: 'el-input',
           md: 6,
           attributes: {
-            disabled: true
-          },
-          formItemAttributes: {
-            label: '所属商户',
-            prop: 'companyName',
-            rules: []
-          }
-        },
-        {
-          name: 'el-input',
-          md: 6,
-          attributes: {
             disabled: false
           },
           formItemAttributes: {

src/views/engineeringAuxiliaryParts/auxiliaryMaterialBasicInfo/index.vue

@@ -188,17 +188,6 @@ export default {
         {
           md: 6,
           isShow: true,
-          name: 'el-input',
-          attributes: { placeholder: '请输入', disabled: true },
-          formItemAttributes: {
-            label: '所属商户',
-            prop: 'companyWechatName',
-            rules: []
-          }
-        },
-        {
-          md: 6,
-          isShow: true,
           name: 'el-radio',
           options: [
             { label: '上架', value: 'ON' },

src/views/engineeringAuxiliaryParts/partsListInfo/index.vue

@@ -188,17 +188,6 @@ export default {
         {
           md: 6,
           isShow: true,
-          name: 'el-input',
-          attributes: { placeholder: '请输入', disabled: true },
-          formItemAttributes: {
-            label: '所属商户',
-            prop: 'companyWechatName',
-            rules: []
-          }
-        },
-        {
-          md: 6,
-          isShow: true,
           name: 'el-radio',
           options: [
             { label: '上架', value: 'ON' },

src/views/engineeringAuxiliaryParts/projectCollectionManagement/workOrderInfo/mixins/serviceInfo.js

@@ -14,16 +14,6 @@ export default {
     serviceInfo() {
       return [
         {
-          md: 6,
-          name: 'el-input',
-          attributes: { placeholder: '请输入', disabled: true },
-          formItemAttributes: {
-            label: '所属商户',
-            prop: 'companyWechatName',
-            rules: []
-          }
-        },
-        {
           name: 'el-select',
           options: this.websitList,
           md: 6,

src/views/engineeringMaintenance/basicData/detail.vue

@@ -1,1058 +1,1283 @@
 <template>
-	<div class="s-page">
-		<el-page-header @back="goBack" :content="title"></el-page-header>
-		<el-divider></el-divider>
-		<div slot="moreSearch" v-if="formType != 0">
-		  <el-radio-group v-model="tabIndex" size="small" @change="">
-		  	<el-radio-button :label="1">基础资料</el-radio-button>
-		  	<el-radio-button :label="2">修改记录</el-radio-button>
-		  </el-radio-group>
-		  <br><br>
-		</div>
-		<template v-if="tabIndex == 1">
-			<el-card class="box-card">
-				<div style="margin-bottom: 20px;font-weight: bold;">项目信息</div>
-				<div class="mymain-container">
-					<el-form ref="formData" :rules="rules" :model="formData" label-width="110px" size="small" label-position="left">
-						<el-row :gutter="20" justify="start">
-							<el-col :span="12">
-								<el-form-item label="所属商户" :required="true" >
-									<el-input type="text" :value="companyName" disabled></el-input>
-								</el-form-item>
-							</el-col>
-							<el-col :span="12">
-								<el-form-item label="项目名称" prop="projectName">
-									<el-input type="text" v-model="formData.projectName" :disabled="formType==2" placeholder="请输入"></el-input>
-								</el-form-item>
-							</el-col>
-							<el-col :span="12">
-								<el-form-item label="负责人" prop="manger">
-									<el-input type="text" v-model="formData.manger" :disabled="formType==2" placeholder="请输入"></el-input>
-								</el-form-item>
-							</el-col>
-							<el-col :span="12">
-								<el-form-item label="联系电话" prop="mobile">
-									<el-input type="number" v-model="formData.mobile" oninput="if(value.length > 11) value=value.slice(0, 11)" :disabled="formType==2" placeholder="请输入"></el-input>
-								</el-form-item>
-							</el-col>
-							<el-col :span="12">
-								<el-form-item label="维保时间" prop="dateList">
-									<el-date-picker
-									 :disabled="formType==2"
-									  v-model="formData.dateList"
-									  @change="selectDate"
-									  value-format="yyyy-MM-dd"
-									  type="daterange"
-									  range-separator="至"
-									  start-placeholder="开始日期"
-									  end-placeholder="结束日期">
-									</el-date-picker>
-								</el-form-item>
-							</el-col>
-							<el-col :span="12">
-								<el-form-item label="工单类型" prop="orderSmallTypeText">
-									<el-checkbox-group v-model="formData.checkTypeList">
-									    <el-checkbox v-for="(item,index) in orderTypeList" :disabled="formType==2" :key="index" :label="item.id">{{item.orderSmallTypeText}}</el-checkbox>
-									</el-checkbox-group>
-								</el-form-item>
-							</el-col>
-							<el-col :span="12">
-								<el-form-item label="包含全部费用" prop="isAllFee">
-									<el-radio-group v-model="formData.isAllFee" @change="(e)=>{
-										if(e == 'YES'){
-											formData.feePayMethod = ''
-										}
-									}">
-									    <el-radio :disabled="formType==2" label="YES">是</el-radio>
-									    <el-radio :disabled="formType==2" label="NO">否</el-radio>
-									</el-radio-group>
-								</el-form-item>
-							</el-col>
-							<el-col :span="12">
-								<el-form-item v-if="formData.isAllFee == 'NO'" label="费用支付方式" prop="feePayMethod">
-									<el-radio-group v-model="formData.feePayMethod">
-										<el-radio :disabled="formType==2" label="EXAMINE">审批后结算</el-radio>
-										<el-radio :disabled="formType==2" label="SITE">现场支付</el-radio>
-									</el-radio-group>
-								</el-form-item>
-							</el-col>
-							<el-col :span="24">
-								<el-form-item label="项目地址" prop="province" :required="true">
-									<el-row>
-										<el-col :span="5" style="margin-right: 12px;">
-											<el-input type="text" v-model="formData.province" disabled placeholder="请选择省"></el-input>
-										</el-col>
-										<el-col :span="5" style="margin-right: 12px;">
-											<el-input type="text" v-model="formData.city" disabled placeholder="请选择市"></el-input>
-										</el-col>
-										<el-col :span="5" style="margin-right: 12px;">
-											<el-input type="text" v-model="formData.area" disabled placeholder="请选择区"></el-input>
-										</el-col>
-										<el-col :span="8">
-											<el-input type="text" v-model="formData.street" disabled placeholder="请选择街道"></el-input>
-										</el-col>
-									</el-row>
-								</el-form-item>
-							</el-col>
-							<el-col :span="24">
-								<el-form-item label="" prop="address">
-									<el-row :gutter="20">
-										<el-col :span="22">
-											<el-input type="text" v-model="formData.address" :disabled="formType==2" placeholder="详细地址"></el-input>
-										</el-col>
-										<el-col :span="2">
-											<geographicalPosi :disabled="formType==2" :formData="this.formData" @selectPosi="selectAddress"/>
-										</el-col>
-									</el-row>
-								</el-form-item>
-							</el-col>
-							
-							<el-col :span="24">
-								<el-form-item label="项目说明">
-									<el-input type="textarea" :rows="4" :disabled="formType==2" v-model="formData.remark" placeholder="请输入"></el-input>
-								</el-form-item>
-							</el-col>
-						</el-row>
-					</el-form>
-				</div>
-			</el-card>
-			<br/>
-			<el-card class="box-card">
-				<el-tabs v-model="typeIndex" @change="changeType">
-				    <el-tab-pane label="项目设备" name="1"></el-tab-pane>
-				    <el-tab-pane label="项目人员" name="2"></el-tab-pane>
-				    <el-tab-pane label="服务网点" name="3"></el-tab-pane>
-					<el-tab-pane label="辅材配置" name="4"></el-tab-pane>
-					<el-tab-pane label="配件配置" name="5"></el-tab-pane>
-				</el-tabs>
-				<el-button size="small" v-if="formType!=2" type="primary" @click="add()">新增</el-button>
-				<div class="table">
-					<!-- 项目设备 -->
-					<el-form ref="formData1" :model="formData1">
-						<el-table v-show="typeIndex == 1" :data="formData1.productList" element-loading-text="Loading" border fit highlight-current-row stripe>
-							<el-table-column label="品牌" align="center">
-								<template slot-scope="scope">
-									<el-form-item :prop="'productList.' + scope.$index + '.brand'" :rules="[{ required: true, message: `请选择品牌`, trigger: 'blur' }]">
-										<el-select v-model="scope.row.brand" @change="(e)=>{
-											scope.row.brandId = e.id
-											scope.row.brandName = e.brandName
-										}" value-key="id" :disabled="isEdit1 != scope.$index || formType == 2" placeholder="请选择" style="width: 100%;">
-										    <el-option
-										      v-for="(item,ind) in brandList"
-										      :key="ind"
-										      :label="item.brandName"
-										      :value="item">
-										    </el-option>
-										</el-select>
-									</el-form-item>
-								</template>
-							</el-table-column>
-							<el-table-column label="产品大类" align="center">
-								<template slot-scope="scope">
-									<el-form-item :prop="'productList.' + scope.$index + '.main'" :rules="[{ required: true, message: `请选择产品大类`, trigger: 'blur' }]">
-										<el-select v-model="scope.row.main" value-key="categoryId" @change="(e)=>{
-											scope.row.mainId = e.categoryId
-											scope.row.mainName = e.name
-											//if(e.categoryId == 0){
-											//	scope.row.small = {categoryId: '0', name: '不限'}
-											//	scope.row.smallName = '不限'
-											//	scope.row.smallId = '0'
-											//}else{
-											//	scope.row.small = null
-											//	scope.row.smallName = ''
-											//	scope.row.smallId = ''
-											//}
-											//scope.row.smallList = e.children?[...[{categoryId: '0', name: '不限'}],...e.children]:[]
-											scope.row.small = null
-											scope.row.smallName = ''
-											scope.row.smallId = ''
-											
-											scope.row.smallList = e.children?e.children:[]
-										}" :disabled="isEdit1 != scope.$index || formType == 2" placeholder="请选择" style="width: 100%;">
-										    <el-option
-										      v-for="(item,ind) in mainList"
-										      :key="ind"
-										      :label="item.name"
-										      :value="item">
-										    </el-option>
-										  </el-select>
-									</el-form-item>
-								</template>
-							</el-table-column>
-							<el-table-column label="产品小类" align="center">
-								<template slot-scope="scope">
-									<el-form-item :prop="'productList.' + scope.$index + '.small'" :rules="[{ required: true, message: `请选择产品小类`, trigger: 'blur' }]">
-										<el-select v-model="scope.row.small" @focus="()=>{
-												if(!scope.row.main){return this.$message.warning('请先选择产品大类！');}
-											}" @change="(e)=>{
-												scope.row.smallName = e.name
-												scope.row.smallId = e.categoryId
-												scope.row.smallImg = e.imgUrl
-											}" :disabled="isEdit1 != scope.$index || formType == 2" value-key="categoryId" placeholder="请选择" style="width: 100%;">
-										    <el-option
-										      v-for="(item,ind) in scope.row.smallList"
-										      :key="ind"
-										      :label="item.name"
-										      :value="item">
-										    </el-option>
-										  </el-select>
-									</el-form-item>
-								</template>
-							</el-table-column>
-							<el-table-column prop="" align="center" label="系列名称">
-								<template slot-scope="scope">
-									<el-form-item>
-										<el-input type="text" v-model="scope.row.seriesName" :disabled="isEdit1 != scope.$index || formType == 2" placeholder="请输入"></el-input>
-									</el-form-item>
-								</template>
-							</el-table-column>
-							<el-table-column prop="" align="center" label="机型名称">
-								<template slot-scope="scope">
-									<el-form-item>
-										<el-input type="text" v-model="scope.row.productName" :disabled="isEdit1 != scope.$index || formType == 2" placeholder="请输入"></el-input>
-									</el-form-item>
-								</template>
-							</el-table-column>
-							<el-table-column align="center" label="设备套数">
-								<template slot-scope="scope">
-									<el-form-item :prop="'productList.' + scope.$index + '.num'" :rules="[{ required: true, message: `请输入设备套数`, trigger: 'blur' }]">
-										<el-input type="number" v-model="scope.row.num" :disabled="isEdit1 != scope.$index || formType == 2" placeholder="请输入"></el-input>
-									</el-form-item>
-								</template>
-							</el-table-column>
-							<el-table-column prop="" align="center" label="内机数量" >
-								<template slot-scope="scope">
-									<el-form-item>
-										<el-input type="number" v-model="scope.row.inNum" :disabled="isEdit1 != scope.$index || formType == 2" placeholder="请输入"></el-input>
-									</el-form-item>
-								</template>
-							</el-table-column>
-							<el-table-column prop="" align="center" label="外机数量">
-								<template slot-scope="scope">
-									<el-form-item>
-										<el-input type="number" v-model="scope.row.outNum" :disabled="isEdit1 != scope.$index || formType == 2" placeholder="请输入"></el-input>
-									</el-form-item>
-								</template>
-							</el-table-column>
-							<el-table-column label="操作" align="right" width="140">
-								<template slot-scope="scope" v-if="formType != 2">
-									<el-button size="mini" type="primary" v-if="scope.$index != isEdit1" @click="edit(1,scope.$index)">编辑</el-button>
-									<el-button size="mini" type="danger" @click="del(scope.$index)">删除</el-button>
-								</template>
-							</el-table-column>
-						</el-table>
-					</el-form>
-					<!-- 项目人员 -->
-					<el-form v-show="typeIndex == 2" ref="formData2" :rules="rules2" :model="formData2" label-width="0" size="small" label-position="left">
-						<el-table :data="formData2.byList" element-loading-text="Loading" border fit highlight-current-row stripe>
-							<el-table-column align="center" label="姓名">
-								<template slot-scope="scope">
-									<el-form-item :prop="'byList.' + scope.$index + '.name'" :rules="[{ required: true, message: `请输入姓名`, trigger: 'blur' }]">
-										<el-input type="text" v-model="scope.row.name" :disabled="isEdit2 != scope.$index || formType == 2" placeholder="请输入"></el-input>
-									</el-form-item>
-								</template>
-							</el-table-column>
-							<el-table-column align="center" label="联系电话" >
-								<template slot-scope="scope">
-									<el-form-item :prop="'byList.' + scope.$index + '.mobile'"
-										:rules="[{ required: true, message: `请输入联系电话`, trigger: 'blur' },{ pattern:/^((1[3456789]\d{9}))$/, message: '电话号码格式不正确', trigger: 'blur' }]">
-										<el-input type="number" oninput="if(value.length > 11) value=value.slice(0, 11)" v-model="scope.row.mobile" :disabled="isEdit2 != scope.$index || formType == 2" placeholder="请输入"></el-input>
-									</el-form-item>
-								</template>
-							</el-table-column>
-							<el-table-column label="费用审批">
-								<template slot-scope="scope">
-									<el-form-item :prop="'byList.' + scope.$index + '.feeExamine'" :rules="[{ required: true, message: `请选择费用审批`, trigger: 'blur' }]">
-										<el-select v-model="scope.row.feeExamine" :disabled="isEdit2 != scope.$index || formType == 2" placeholder="请选择" style="width: 100%;">
-										    <el-option
-										      v-for="item in [{id: 'YES',name: '是'},{id: 'NO',name: '否'}]"
-										      :key="item.id"
-										      :label="item.name"
-										      :value="item.id">
-										    </el-option>
-										  </el-select>
-									</el-form-item>
-								</template>
-							</el-table-column>
-							<el-table-column label="操作" align="right" width="140">
-								<template slot-scope="scope" v-if="formType != 2">
-									<el-button size="mini" type="primary" v-if="scope.$index != isEdit2" @click="edit(2,scope.$index)">编辑</el-button>
-									<el-button size="mini" type="danger" @click="del(scope.$index)">删除</el-button>
-								</template>
-							</el-table-column>
-						</el-table>
-					</el-form>
-					<!-- 服务网点 -->
-					<el-form v-show="typeIndex == 3" ref="formData3" :model="formData3" label-width="0" size="small" label-position="left">
-						<el-table :data="formData3.websitList" element-loading-text="Loading" border fit highlight-current-row stripe>
-							<el-table-column align="center" label="网点名称">
-								<template slot-scope="scope">
-									<el-form-item :prop="'websitList.' + scope.$index + '.websit'" :rules="[{ required: true, message: `请选择网点名称`, trigger: 'blur' }]">
-										<el-select v-model="scope.row.websit" @change="(e)=>{
-											scope.row.websitId = e.websitId
-											scope.row.websitName = e.name
-											scope.row.linkName = e.linkName
-											scope.row.mobile = e.websitPhone
-											scope.row.address = e.address
-										}" value-key="websitId" :disabled="isEdit3 != scope.$index || formType == 2" placeholder="请选择" style="width: 100%;">
-										    <el-option
-										      v-for="item in websitData"
-										      :key="item.websitId"
-										      :label="item.name"
-										      :value="item">
-										    </el-option>
-										  </el-select>
-									</el-form-item>
-								</template>
-							</el-table-column>
-							<el-table-column align="center" label="联系人">
-								<template slot-scope="scope">
-									<el-form-item>
-										<el-input type="text" v-model="scope.row.linkName" disabled placeholder="请输入"></el-input>
-									</el-form-item>
-								</template>
-							</el-table-column>
-							<el-table-column align="center" label="移动电话" >
-								<template slot-scope="scope">
-									<el-form-item>
-										<el-input type="text" v-model="scope.row.mobile" disabled placeholder="请输入"></el-input>
-									</el-form-item>
-								</template>
-							</el-table-column>
-							<el-table-column align="center" label="地址" >
-								<template slot-scope="scope">
-									<el-form-item>
-										<el-input type="text" v-model="scope.row.address" disabled placeholder="请输入"></el-input>
-									</el-form-item>
-								</template>
-							</el-table-column>
-							<el-table-column label="操作" align="right" width="140">
-								<template slot-scope="scope" v-if="formType != 2">
-									<el-button size="mini" type="primary" v-if="scope.$index != isEdit3" @click="edit(3,scope.$index)">编辑</el-button>
-									<el-button size="mini" type="danger" @click="del(scope.$index)">删除</el-button>
-								</template>
-							</el-table-column>
-						</el-table>
-					</el-form>
-					<!-- 辅材配置 -->
-					<el-form ref="formData4" :model="formData4">
-						<el-table v-show="typeIndex == 4" :data="formData4.itemList" element-loading-text="Loading" border fit highlight-current-row stripe>
-							<el-table-column label="大类" align="center">
-								<template slot-scope="scope">
-									<el-form-item>
-										{{scope.row.parentCategoryName}}
-									</el-form-item>
-								</template>
-							</el-table-column>
-							<el-table-column label="小类" align="center">
-								<template slot-scope="scope">
-									<el-form-item>
-										{{scope.row.goodsCategoryName}}
-									</el-form-item>
-								</template>
-							</el-table-column>
-							<el-table-column label="*辅材名称" align="center">
-								<template slot-scope="scope">
-									<el-form-item :prop="'itemList.' + scope.$index + '.auxiliary'" :rules="[{ required: true, message: `请选择辅材名称`, trigger: 'blur' }]">
-										<el-select v-model="scope.row.auxiliary" @change="(e)=>{
-												scope.row.goodsId = e.normId
-												scope.row.goodsName = e.normName
-												scope.row.goodsCategoryName = e.categoryName
-												scope.row.goodsCategoryId = e.categoryId
-												scope.row.parentCategoryName = e.parentCategoryName
-												scope.row.parentCategoryId = e.parentCategoryId
-												scope.row.goodsCode = e.normCode
-												scope.row.goodsSpecification = e.specification
-												scope.row.goodsStockUnit = e.unit
-												scope.row.normType = e.normType
-												scope.row.normAmount = e.normAmount
-											}" :disabled="isEdit4 != scope.$index || formType == 2" value-key="normId" placeholder="请选择" style="width: 100%;">
-										    <el-option
-										      v-for="(item,ind) in auxiliaryList"
-										      :key="ind"
-										      :label="item.normName"
-										      :value="item">
-										    </el-option>
-										  </el-select>
-									</el-form-item>
-								</template>
-							</el-table-column>
-							<el-table-column prop="" align="center" label="商品代码">
-								<template slot-scope="scope">
-									<el-form-item>
-										{{scope.row.goodsCode}}
-									</el-form-item>
-								</template>
-							</el-table-column>
-							<el-table-column prop="" align="center" label="规格型号">
-								<template slot-scope="scope">
-									<el-form-item>
-										{{scope.row.goodsSpecification}}
-									</el-form-item>
-								</template>
-							</el-table-column>
-							<el-table-column align="center" label="单位">
-								<template slot-scope="scope">
-									<el-form-item>
-										{{scope.row.goodsStockUnit}}
-									</el-form-item>
-								</template>
-							</el-table-column>
-							<el-table-column prop="" align="center" label="收费类型" >
-								<template slot-scope="scope">
-									<el-form-item>
-										{{scope.row.normType == 'M'?'配件物料':scope.row.normType == 'S'?'服务收费':''}}
-									</el-form-item>
-								</template>
-							</el-table-column>
-							<el-table-column prop="" align="center" label="*收费标准(元)">
-								<template slot-scope="scope">
-									<el-form-item :prop="'itemList.' + scope.$index + '.normAmount'"
-										:rules="[{ required: true, message: `请输入收费标准`, trigger: 'blur' }]">
-										<el-input type="number" oninput="if(value < 0) value=0" v-model="scope.row.normAmount" :disabled="isEdit4 != scope.$index || formType == 2" placeholder="请输入"></el-input>
-									</el-form-item>
-								</template>
-							</el-table-column>
-							<el-table-column label="操作" align="right" width="140">
-								<template slot-scope="scope" v-if="formType != 2">
-									<el-button size="mini" type="primary" v-if="scope.$index != isEdit4" @click="edit(4,scope.$index)">编辑</el-button>
-									<el-button size="mini" type="danger" @click="del(scope.$index)">删除</el-button>
-								</template>
-							</el-table-column>
-						</el-table>
-					</el-form>
-					<!-- 配件配置 -->
-					<el-form ref="formData5" :model="formData5">
-						<el-table v-show="typeIndex == 5" :data="formData5.itemList" element-loading-text="Loading" border fit highlight-current-row stripe>
-							<el-table-column label="*配件名称" align="center">
-								<template slot-scope="scope">
-									<el-form-item :prop="'itemList.' + scope.$index + '.attachment'" :rules="[{ required: true, message: `请选择辅材名称`, trigger: 'blur' }]">
-										<el-select v-model="scope.row.attachment" @change="(e)=>{
-												scope.row.goodsId = e.goodsId
-												scope.row.goodsName = e.goodsName
-												scope.row.goodsCode = e.goodsCode
-												scope.row.goodsStockUnit = e.goodsStockUnit
-												scope.row.normType = e.normType
-												scope.row.normAmount = e.normAmount
-												scope.row.brandRelaName = e.brandRelaName
-												scope.row.productRelaName = e.productRelaName
-											}" :disabled="isEdit5 != scope.$index || formType == 2" value-key="goodsId" placeholder="请选择" style="width: 100%;">
-										    <el-option
-										      v-for="(item,ind) in attachmentList"
-										      :key="ind"
-										      :label="item.goodsName"
-										      :value="item">
-										    </el-option>
-										  </el-select>
-									</el-form-item>
-								</template>
-							</el-table-column>
-							<el-table-column align="center" label="单位">
-								<template slot-scope="scope">
-									<el-form-item>
-										{{scope.row.goodsStockUnit}}
-									</el-form-item>
-								</template>
-							</el-table-column>
-							<el-table-column prop="" align="center" label="商品代码">
-								<template slot-scope="scope">
-									<el-form-item>
-										{{scope.row.goodsCode}}
-									</el-form-item>
-								</template>
-							</el-table-column>
-							<el-table-column prop="" align="center" label="收费类型" >
-								<template slot-scope="scope">
-									<el-form-item>
-										{{scope.row.normType == 'M'?'配件物料':scope.row.normType == 'S'?'服务收费':''}}
-									</el-form-item>
-								</template>
-							</el-table-column>
-							<el-table-column prop="" align="center" label="适用品牌">
-								<template slot-scope="scope">
-									<el-form-item>
-										{{scope.row.brandRelaName}}
-									</el-form-item>
-								</template>
-							</el-table-column>
-							<el-table-column prop="" align="center" label="适用产品大类">
-								<template slot-scope="scope">
-									<el-form-item>
-										{{scope.row.productRelaName}}
-									</el-form-item>
-								</template>
-							</el-table-column>
-							<el-table-column prop="" align="center" label="*收费标准(元)">
-								<template slot-scope="scope">
-									<el-form-item :prop="'itemList.' + scope.$index + '.normAmount'"
-										:rules="[{ required: true, message: `请输入收费标准`, trigger: 'blur' }]">
-										<el-input type="number" oninput="if(value < 0) value=0" v-model="scope.row.normAmount" :disabled="isEdit5 != scope.$index || formType == 2" placeholder="请输入"></el-input>
-									</el-form-item>
-								</template>
-							</el-table-column>
-							<el-table-column label="操作" align="right" width="140">
-								<template slot-scope="scope" v-if="formType != 2">
-									<el-button size="mini" type="primary" v-if="scope.$index != isEdit5" @click="edit(5,scope.$index)">编辑</el-button>
-									<el-button size="mini" type="danger" @click="del(scope.$index)">删除</el-button>
-								</template>
-							</el-table-column>
-						</el-table>
-					</el-form>
-				</div>
-			</el-card>
-			<div class="page-footer">
-				<div class="footer">
-					<el-button v-if="formType != 2" size="small" type="primary" @click="confirm()">保存</el-button>
-					<el-button size="small" type="info" @click="goBack">返回</el-button>
-				</div>
-			</div>
-		</template>
-		<template v-else>
-			<el-card class="box-card">
-				<div slot="header" class="clearfix">
-					<span>修改记录</span>
-				</div>
-				
-				<div class="table">
-					<el-table :data="historyList" element-loading-text="Loading" border fit highlight-current-row stripe>
-						<el-table-column prop="typeText" align="center" label="操作类型" ></el-table-column>
-						<el-table-column prop="content" align="left" label="操作内容"></el-table-column>
-						<el-table-column prop="createBy" align="center" label="操作人"></el-table-column>
-						<el-table-column prop="createTime" align="center" label="操作时间"></el-table-column>
-					</el-table>
-				</div>
-			</el-card>
-		</template>
-	</div>
+  <div class="s-page">
+    <el-page-header @back="goBack" :content="title"></el-page-header>
+    <el-divider></el-divider>
+    <div slot="moreSearch" v-if="formType != 0">
+      <el-radio-group v-model="tabIndex" size="small" @change="">
+        <el-radio-button :label="1">基础资料</el-radio-button>
+        <el-radio-button :label="2">修改记录</el-radio-button>
+      </el-radio-group>
+      <br /><br />
+    </div>
+    <template v-if="tabIndex == 1">
+      <el-card class="box-card">
+        <div style="margin-bottom: 20px; font-weight: bold">项目信息</div>
+        <div class="mymain-container">
+          <el-form
+            ref="formData"
+            :rules="rules"
+            :model="formData"
+            label-width="110px"
+            size="small"
+            label-position="left"
+          >
+            <el-row :gutter="20" justify="start">
+              <el-col :span="24">
+                <el-form-item label="项目名称" prop="projectName">
+                  <el-input
+                    type="text"
+                    v-model="formData.projectName"
+                    :disabled="formType == 2"
+                    placeholder="请输入"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="负责人" prop="manger">
+                  <el-input
+                    type="text"
+                    v-model="formData.manger"
+                    :disabled="formType == 2"
+                    placeholder="请输入"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="联系电话" prop="mobile">
+                  <el-input
+                    type="number"
+                    v-model="formData.mobile"
+                    oninput="if(value.length > 11) value=value.slice(0, 11)"
+                    :disabled="formType == 2"
+                    placeholder="请输入"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="维保时间" prop="dateList">
+                  <el-date-picker
+                    :disabled="formType == 2"
+                    v-model="formData.dateList"
+                    @change="selectDate"
+                    value-format="yyyy-MM-dd"
+                    type="daterange"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="工单类型" prop="orderSmallTypeText">
+                  <el-checkbox-group v-model="formData.checkTypeList">
+                    <el-checkbox
+                      v-for="(item, index) in orderTypeList"
+                      :disabled="formType == 2"
+                      :key="index"
+                      :label="item.id"
+                      >{{ item.orderSmallTypeText }}</el-checkbox
+                    >
+                  </el-checkbox-group>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="包含全部费用" prop="isAllFee">
+                  <el-radio-group
+                    v-model="formData.isAllFee"
+                    @change="
+                      e => {
+                        if (e == 'YES') {
+                          formData.feePayMethod = ''
+                        }
+                      }
+                    "
+                  >
+                    <el-radio :disabled="formType == 2" label="YES">是</el-radio>
+                    <el-radio :disabled="formType == 2" label="NO">否</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item v-if="formData.isAllFee == 'NO'" label="费用支付方式" prop="feePayMethod">
+                  <el-radio-group v-model="formData.feePayMethod">
+                    <el-radio :disabled="formType == 2" label="EXAMINE">审批后结算</el-radio>
+                    <el-radio :disabled="formType == 2" label="SITE">现场支付</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="项目地址" prop="province" :required="true">
+                  <el-row>
+                    <el-col :span="5" style="margin-right: 12px">
+                      <el-input type="text" v-model="formData.province" disabled placeholder="请选择省"></el-input>
+                    </el-col>
+                    <el-col :span="5" style="margin-right: 12px">
+                      <el-input type="text" v-model="formData.city" disabled placeholder="请选择市"></el-input>
+                    </el-col>
+                    <el-col :span="5" style="margin-right: 12px">
+                      <el-input type="text" v-model="formData.area" disabled placeholder="请选择区"></el-input>
+                    </el-col>
+                    <el-col :span="8">
+                      <el-input type="text" v-model="formData.street" disabled placeholder="请选择街道"></el-input>
+                    </el-col>
+                  </el-row>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="" prop="address">
+                  <el-row :gutter="20">
+                    <el-col :span="22">
+                      <el-input
+                        type="text"
+                        v-model="formData.address"
+                        :disabled="formType == 2"
+                        placeholder="详细地址"
+                      ></el-input>
+                    </el-col>
+                    <el-col :span="2">
+                      <geographicalPosi
+                        :disabled="formType == 2"
+                        :formData="this.formData"
+                        @selectPosi="selectAddress"
+                      />
+                    </el-col>
+                  </el-row>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="24">
+                <el-form-item label="项目说明">
+                  <el-input
+                    type="textarea"
+                    :rows="4"
+                    :disabled="formType == 2"
+                    v-model="formData.remark"
+                    placeholder="请输入"
+                  ></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+      </el-card>
+      <br />
+      <el-card class="box-card">
+        <el-tabs v-model="typeIndex" @change="changeType">
+          <el-tab-pane label="项目设备" name="1"></el-tab-pane>
+          <el-tab-pane label="项目人员" name="2"></el-tab-pane>
+          <el-tab-pane label="服务网点" name="3"></el-tab-pane>
+          <el-tab-pane label="辅材配置" name="4"></el-tab-pane>
+          <el-tab-pane label="配件配置" name="5"></el-tab-pane>
+        </el-tabs>
+        <el-button size="small" v-if="formType != 2" type="primary" @click="add()">新增</el-button>
+        <div class="table">
+          <!-- 项目设备 -->
+          <el-form ref="formData1" :model="formData1">
+            <el-table
+              v-show="typeIndex == 1"
+              :data="formData1.productList"
+              element-loading-text="Loading"
+              border
+              fit
+              highlight-current-row
+              stripe
+            >
+              <el-table-column label="品牌" align="center">
+                <template slot-scope="scope">
+                  <el-form-item
+                    :prop="'productList.' + scope.$index + '.brand'"
+                    :rules="[{ required: true, message: `请选择品牌`, trigger: 'blur' }]"
+                  >
+                    <el-select
+                      v-model="scope.row.brand"
+                      @change="
+                        e => {
+                          scope.row.brandId = e.id
+                          scope.row.brandName = e.brandName
+                        }
+                      "
+                      value-key="id"
+                      :disabled="isEdit1 != scope.$index || formType == 2"
+                      placeholder="请选择"
+                      style="width: 100%"
+                    >
+                      <el-option v-for="(item, ind) in brandList" :key="ind" :label="item.brandName" :value="item">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column label="产品大类" align="center">
+                <template slot-scope="scope">
+                  <el-form-item
+                    :prop="'productList.' + scope.$index + '.main'"
+                    :rules="[{ required: true, message: `请选择产品大类`, trigger: 'blur' }]"
+                  >
+                    <el-select
+                      v-model="scope.row.main"
+                      value-key="categoryId"
+                      @change="
+                        e => {
+                          scope.row.mainId = e.categoryId
+                          scope.row.mainName = e.name
+                          //if(e.categoryId == 0){
+                          //	scope.row.small = {categoryId: '0', name: '不限'}
+                          //	scope.row.smallName = '不限'
+                          //	scope.row.smallId = '0'
+                          //}else{
+                          //	scope.row.small = null
+                          //	scope.row.smallName = ''
+                          //	scope.row.smallId = ''
+                          //}
+                          //scope.row.smallList = e.children?[...[{categoryId: '0', name: '不限'}],...e.children]:[]
+                          scope.row.small = null
+                          scope.row.smallName = ''
+                          scope.row.smallId = ''
+
+                          scope.row.smallList = e.children ? e.children : []
+                        }
+                      "
+                      :disabled="isEdit1 != scope.$index || formType == 2"
+                      placeholder="请选择"
+                      style="width: 100%"
+                    >
+                      <el-option v-for="(item, ind) in mainList" :key="ind" :label="item.name" :value="item">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column label="产品小类" align="center">
+                <template slot-scope="scope">
+                  <el-form-item
+                    :prop="'productList.' + scope.$index + '.small'"
+                    :rules="[{ required: true, message: `请选择产品小类`, trigger: 'blur' }]"
+                  >
+                    <el-select
+                      v-model="scope.row.small"
+                      @focus="
+                        () => {
+                          if (!scope.row.main) {
+                            return this.$message.warning('请先选择产品大类！')
+                          }
+                        }
+                      "
+                      @change="
+                        e => {
+                          scope.row.smallName = e.name
+                          scope.row.smallId = e.categoryId
+                          scope.row.smallImg = e.imgUrl
+                        }
+                      "
+                      :disabled="isEdit1 != scope.$index || formType == 2"
+                      value-key="categoryId"
+                      placeholder="请选择"
+                      style="width: 100%"
+                    >
+                      <el-option v-for="(item, ind) in scope.row.smallList" :key="ind" :label="item.name" :value="item">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column prop="" align="center" label="系列名称">
+                <template slot-scope="scope">
+                  <el-form-item>
+                    <el-input
+                      type="text"
+                      v-model="scope.row.seriesName"
+                      :disabled="isEdit1 != scope.$index || formType == 2"
+                      placeholder="请输入"
+                    ></el-input>
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column prop="" align="center" label="机型名称">
+                <template slot-scope="scope">
+                  <el-form-item>
+                    <el-input
+                      type="text"
+                      v-model="scope.row.productName"
+                      :disabled="isEdit1 != scope.$index || formType == 2"
+                      placeholder="请输入"
+                    ></el-input>
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="设备套数">
+                <template slot-scope="scope">
+                  <el-form-item
+                    :prop="'productList.' + scope.$index + '.num'"
+                    :rules="[{ required: true, message: `请输入设备套数`, trigger: 'blur' }]"
+                  >
+                    <el-input
+                      type="number"
+                      v-model="scope.row.num"
+                      :disabled="isEdit1 != scope.$index || formType == 2"
+                      placeholder="请输入"
+                    ></el-input>
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column prop="" align="center" label="内机数量">
+                <template slot-scope="scope">
+                  <el-form-item>
+                    <el-input
+                      type="number"
+                      v-model="scope.row.inNum"
+                      :disabled="isEdit1 != scope.$index || formType == 2"
+                      placeholder="请输入"
+                    ></el-input>
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column prop="" align="center" label="外机数量">
+                <template slot-scope="scope">
+                  <el-form-item>
+                    <el-input
+                      type="number"
+                      v-model="scope.row.outNum"
+                      :disabled="isEdit1 != scope.$index || formType == 2"
+                      placeholder="请输入"
+                    ></el-input>
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" align="right" width="140">
+                <template slot-scope="scope" v-if="formType != 2">
+                  <el-button size="mini" type="primary" v-if="scope.$index != isEdit1" @click="edit(1, scope.$index)"
+                    >编辑</el-button
+                  >
+                  <el-button size="mini" type="danger" @click="del(scope.$index)">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-form>
+          <!-- 项目人员 -->
+          <el-form
+            v-show="typeIndex == 2"
+            ref="formData2"
+            :rules="rules2"
+            :model="formData2"
+            label-width="0"
+            size="small"
+            label-position="left"
+          >
+            <el-table :data="formData2.byList" element-loading-text="Loading" border fit highlight-current-row stripe>
+              <el-table-column align="center" label="姓名">
+                <template slot-scope="scope">
+                  <el-form-item
+                    :prop="'byList.' + scope.$index + '.name'"
+                    :rules="[{ required: true, message: `请输入姓名`, trigger: 'blur' }]"
+                  >
+                    <el-input
+                      type="text"
+                      v-model="scope.row.name"
+                      :disabled="isEdit2 != scope.$index || formType == 2"
+                      placeholder="请输入"
+                    ></el-input>
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="联系电话">
+                <template slot-scope="scope">
+                  <el-form-item
+                    :prop="'byList.' + scope.$index + '.mobile'"
+                    :rules="[
+                      { required: true, message: `请输入联系电话`, trigger: 'blur' },
+                      { pattern: /^((1[3456789]\d{9}))$/, message: '电话号码格式不正确', trigger: 'blur' }
+                    ]"
+                  >
+                    <el-input
+                      type="number"
+                      oninput="if(value.length > 11) value=value.slice(0, 11)"
+                      v-model="scope.row.mobile"
+                      :disabled="isEdit2 != scope.$index || formType == 2"
+                      placeholder="请输入"
+                    ></el-input>
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column label="费用审批">
+                <template slot-scope="scope">
+                  <el-form-item
+                    :prop="'byList.' + scope.$index + '.feeExamine'"
+                    :rules="[{ required: true, message: `请选择费用审批`, trigger: 'blur' }]"
+                  >
+                    <el-select
+                      v-model="scope.row.feeExamine"
+                      :disabled="isEdit2 != scope.$index || formType == 2"
+                      placeholder="请选择"
+                      style="width: 100%"
+                    >
+                      <el-option
+                        v-for="item in [
+                          { id: 'YES', name: '是' },
+                          { id: 'NO', name: '否' }
+                        ]"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id"
+                      >
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" align="right" width="140">
+                <template slot-scope="scope" v-if="formType != 2">
+                  <el-button size="mini" type="primary" v-if="scope.$index != isEdit2" @click="edit(2, scope.$index)"
+                    >编辑</el-button
+                  >
+                  <el-button size="mini" type="danger" @click="del(scope.$index)">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-form>
+          <!-- 服务网点 -->
+          <el-form
+            v-show="typeIndex == 3"
+            ref="formData3"
+            :model="formData3"
+            label-width="0"
+            size="small"
+            label-position="left"
+          >
+            <el-table
+              :data="formData3.websitList"
+              element-loading-text="Loading"
+              border
+              fit
+              highlight-current-row
+              stripe
+            >
+              <el-table-column align="center" label="网点名称">
+                <template slot-scope="scope">
+                  <el-form-item
+                    :prop="'websitList.' + scope.$index + '.websit'"
+                    :rules="[{ required: true, message: `请选择网点名称`, trigger: 'blur' }]"
+                  >
+                    <el-select
+                      v-model="scope.row.websit"
+                      @change="
+                        e => {
+                          scope.row.websitId = e.websitId
+                          scope.row.websitName = e.name
+                          scope.row.linkName = e.linkName
+                          scope.row.mobile = e.websitPhone
+                          scope.row.address = e.address
+                        }
+                      "
+                      value-key="websitId"
+                      :disabled="isEdit3 != scope.$index || formType == 2"
+                      placeholder="请选择"
+                      style="width: 100%"
+                    >
+                      <el-option v-for="item in websitData" :key="item.websitId" :label="item.name" :value="item">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="联系人">
+                <template slot-scope="scope">
+                  <el-form-item>
+                    <el-input type="text" v-model="scope.row.linkName" disabled placeholder="请输入"></el-input>
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="移动电话">
+                <template slot-scope="scope">
+                  <el-form-item>
+                    <el-input type="text" v-model="scope.row.mobile" disabled placeholder="请输入"></el-input>
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="地址">
+                <template slot-scope="scope">
+                  <el-form-item>
+                    <el-input type="text" v-model="scope.row.address" disabled placeholder="请输入"></el-input>
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" align="right" width="140">
+                <template slot-scope="scope" v-if="formType != 2">
+                  <el-button size="mini" type="primary" v-if="scope.$index != isEdit3" @click="edit(3, scope.$index)"
+                    >编辑</el-button
+                  >
+                  <el-button size="mini" type="danger" @click="del(scope.$index)">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-form>
+          <!-- 辅材配置 -->
+          <el-form ref="formData4" :model="formData4">
+            <el-table
+              v-show="typeIndex == 4"
+              :data="formData4.itemList"
+              element-loading-text="Loading"
+              border
+              fit
+              highlight-current-row
+              stripe
+            >
+              <el-table-column label="大类" align="center">
+                <template slot-scope="scope">
+                  <el-form-item>
+                    {{ scope.row.parentCategoryName }}
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column label="小类" align="center">
+                <template slot-scope="scope">
+                  <el-form-item>
+                    {{ scope.row.goodsCategoryName }}
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column label="*辅材名称" align="center">
+                <template slot-scope="scope">
+                  <el-form-item
+                    :prop="'itemList.' + scope.$index + '.auxiliary'"
+                    :rules="[{ required: true, message: `请选择辅材名称`, trigger: 'blur' }]"
+                  >
+                    <el-select
+                      v-model="scope.row.auxiliary"
+                      @change="
+                        e => {
+                          scope.row.goodsId = e.normId
+                          scope.row.goodsName = e.normName
+                          scope.row.goodsCategoryName = e.categoryName
+                          scope.row.goodsCategoryId = e.categoryId
+                          scope.row.parentCategoryName = e.parentCategoryName
+                          scope.row.parentCategoryId = e.parentCategoryId
+                          scope.row.goodsCode = e.normCode
+                          scope.row.goodsSpecification = e.specification
+                          scope.row.goodsStockUnit = e.unit
+                          scope.row.normType = e.normType
+                          scope.row.normAmount = e.normAmount
+                        }
+                      "
+                      :disabled="isEdit4 != scope.$index || formType == 2"
+                      value-key="normId"
+                      placeholder="请选择"
+                      style="width: 100%"
+                    >
+                      <el-option v-for="(item, ind) in auxiliaryList" :key="ind" :label="item.normName" :value="item">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column prop="" align="center" label="商品代码">
+                <template slot-scope="scope">
+                  <el-form-item>
+                    {{ scope.row.goodsCode }}
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column prop="" align="center" label="规格型号">
+                <template slot-scope="scope">
+                  <el-form-item>
+                    {{ scope.row.goodsSpecification }}
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="单位">
+                <template slot-scope="scope">
+                  <el-form-item>
+                    {{ scope.row.goodsStockUnit }}
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column prop="" align="center" label="收费类型">
+                <template slot-scope="scope">
+                  <el-form-item>
+                    {{ scope.row.normType == 'M' ? '配件物料' : scope.row.normType == 'S' ? '服务收费' : '' }}
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column prop="" align="center" label="*收费标准(元)">
+                <template slot-scope="scope">
+                  <el-form-item
+                    :prop="'itemList.' + scope.$index + '.normAmount'"
+                    :rules="[{ required: true, message: `请输入收费标准`, trigger: 'blur' }]"
+                  >
+                    <el-input
+                      type="number"
+                      oninput="if(value < 0) value=0"
+                      v-model="scope.row.normAmount"
+                      :disabled="isEdit4 != scope.$index || formType == 2"
+                      placeholder="请输入"
+                    ></el-input>
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" align="right" width="140">
+                <template slot-scope="scope" v-if="formType != 2">
+                  <el-button size="mini" type="primary" v-if="scope.$index != isEdit4" @click="edit(4, scope.$index)"
+                    >编辑</el-button
+                  >
+                  <el-button size="mini" type="danger" @click="del(scope.$index)">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-form>
+          <!-- 配件配置 -->
+          <el-form ref="formData5" :model="formData5">
+            <el-table
+              v-show="typeIndex == 5"
+              :data="formData5.itemList"
+              element-loading-text="Loading"
+              border
+              fit
+              highlight-current-row
+              stripe
+            >
+              <el-table-column label="*配件名称" align="center">
+                <template slot-scope="scope">
+                  <el-form-item
+                    :prop="'itemList.' + scope.$index + '.attachment'"
+                    :rules="[{ required: true, message: `请选择辅材名称`, trigger: 'blur' }]"
+                  >
+                    <el-select
+                      v-model="scope.row.attachment"
+                      @change="
+                        e => {
+                          scope.row.goodsId = e.goodsId
+                          scope.row.goodsName = e.goodsName
+                          scope.row.goodsCode = e.goodsCode
+                          scope.row.goodsStockUnit = e.goodsStockUnit
+                          scope.row.normType = e.normType
+                          scope.row.normAmount = e.normAmount
+                          scope.row.brandRelaName = e.brandRelaName
+                          scope.row.productRelaName = e.productRelaName
+                        }
+                      "
+                      :disabled="isEdit5 != scope.$index || formType == 2"
+                      value-key="goodsId"
+                      placeholder="请选择"
+                      style="width: 100%"
+                    >
+                      <el-option v-for="(item, ind) in attachmentList" :key="ind" :label="item.goodsName" :value="item">
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column align="center" label="单位">
+                <template slot-scope="scope">
+                  <el-form-item>
+                    {{ scope.row.goodsStockUnit }}
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column prop="" align="center" label="商品代码">
+                <template slot-scope="scope">
+                  <el-form-item>
+                    {{ scope.row.goodsCode }}
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column prop="" align="center" label="收费类型">
+                <template slot-scope="scope">
+                  <el-form-item>
+                    {{ scope.row.normType == 'M' ? '配件物料' : scope.row.normType == 'S' ? '服务收费' : '' }}
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column prop="" align="center" label="适用品牌">
+                <template slot-scope="scope">
+                  <el-form-item>
+                    {{ scope.row.brandRelaName }}
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column prop="" align="center" label="适用产品大类">
+                <template slot-scope="scope">
+                  <el-form-item>
+                    {{ scope.row.productRelaName }}
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column prop="" align="center" label="*收费标准(元)">
+                <template slot-scope="scope">
+                  <el-form-item
+                    :prop="'itemList.' + scope.$index + '.normAmount'"
+                    :rules="[{ required: true, message: `请输入收费标准`, trigger: 'blur' }]"
+                  >
+                    <el-input
+                      type="number"
+                      oninput="if(value < 0) value=0"
+                      v-model="scope.row.normAmount"
+                      :disabled="isEdit5 != scope.$index || formType == 2"
+                      placeholder="请输入"
+                    ></el-input>
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" align="right" width="140">
+                <template slot-scope="scope" v-if="formType != 2">
+                  <el-button size="mini" type="primary" v-if="scope.$index != isEdit5" @click="edit(5, scope.$index)"
+                    >编辑</el-button
+                  >
+                  <el-button size="mini" type="danger" @click="del(scope.$index)">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-form>
+        </div>
+      </el-card>
+      <div class="page-footer">
+        <div class="footer">
+          <el-button v-if="formType != 2" size="small" type="primary" @click="confirm()">保存</el-button>
+          <el-button size="small" type="info" @click="goBack">返回</el-button>
+        </div>
+      </div>
+    </template>
+    <template v-else>
+      <el-card class="box-card">
+        <div slot="header" class="clearfix">
+          <span>修改记录</span>
+        </div>
+
+        <div class="table">
+          <el-table :data="historyList" element-loading-text="Loading" border fit highlight-current-row stripe>
+            <el-table-column prop="typeText" align="center" label="操作类型"></el-table-column>
+            <el-table-column prop="content" align="left" label="操作内容"></el-table-column>
+            <el-table-column prop="createBy" align="center" label="操作人"></el-table-column>
+            <el-table-column prop="createTime" align="center" label="操作时间"></el-table-column>
+          </el-table>
+        </div>
+      </el-card>
+    </template>
+  </div>
 </template>
 
 <script>
-	import { getWebsit } from "@/api/customerManagement";
-	import { lbsAmapRegion } from '@/api/common.js'
-	import geographicalPosi from '@/components/geographicalPosi/index.vue'
-	import { getMainList } from "@/api/workOrder/settlementStandardInstall";
-	import { getBrand } from '@/api/goods'
-	import { getDetail, getAuxiliaryList, getAttachmentList, save } from "@/api/engineeringMaintenance/basicData";
-	import request from '@/utils/request'
-	export default {
-		components: {geographicalPosi},
-		props: ['id','title','formType'],
-		data() {
-			return {
-				tabIndex: 1,
-				typeIndex: '1',
-				auxiliaryList: [],
-				attachmentList: [],
-				orderTypeList: [],
-				websitData: [],
-				brandList: [],
-				historyList: [],
-				provinceList: [],
-				cityList: [],
-				areaList: [],
-				streetList: [],
-				mainList: [],
-				formData: {
-					dateList: [],
-					checkTypeList: [],
-					projectName: '',
-					manger: '',
-					mobile: '',
-					startTime: '',
-					endTime: '',
-					orderSmallTypeText: '安装',
-					isAllFee: 'YES',
-					feePayMethod: '',
-					province: '',
-					provinceId: '',
-					city: '',
-					cityId: '',
-					area: '',
-					areaId: '',
-					street: '',
-					streetId: '',
-					address: '',
-					lat: '',
-					lng: '',
-					remark: ''
-				},
-				formData1: {
-					productList: [],
-				},
-				formData2: {
-					byList: [],
-				},
-				formData3: {
-					websitList: [],
-				},
-				formData4: {
-					itemList: [],
-				},
-				formData5: {
-					itemList: [],
-				},
-				isEdit1: 0,
-				isEdit2: 0,
-				isEdit3: 0,
-				isEdit4: 0,
-				isEdit5: 0,
-				companyName: JSON.parse(localStorage.getItem('greemall_user')).companyName,
-				rules: {
-					projectName: [
-						{ required: true, message: '请输入项目名称', trigger: 'blur' },
-					],
-					manger: [
-						{ required: true, message: '请输入负责人名称', trigger: 'blur' },
-					],
-					mobile: [
-						{ required: true, message: `请输入联系电话`, trigger: 'blur' },
-						{ required: true, message: `请输入联系电话`, trigger: 'change' },
-						{ pattern:/^((0\d{2,3}-\d{7,8})|(1[3456789]\d{9}))$/, message: '电话号码格式不正确', trigger: 'blur' }
-					],
-					dateList: [
-						{ required: true, message: '请选择维保时间', trigger: 'change' }
-					],
-					checkTypeList: [
-						{ required: true, message: '请选择工单类型', trigger: 'change' }
-					],
-					address: [
-						{ required: true, message: '请选择详细地址', trigger: 'change' }
-					],
-					feePayMethod: [
-						{ required: true, message: '请选择费用支付方式', trigger: 'change' }
-					],
-					isAllFee: [
-						{ required: true, message: '', trigger: '' }
-					],
-					orderSmallTypeText: [
-						{ required: true, message: '', trigger: '' }
-					]
-				},
-				rules1: {},
-				rules2: {},
-				rules3: {},
-				rules4: {},
-				rules5: {},
-				isSave: true
-			};
-		},
-		computed: {
-			filterChildren(){
-				return function(id){
-					let data = []
-					this.mainList.forEach(item=>{
-						if(item.categoryId == id){
-							// data = item.children?[...[{categoryId: '0', name: '不限'}],...item.children]:[]
-							data = item.children?item.children:[]
-						}
-					})
-					return data
-				}
-			},
-		},
-		created() {
-			this.initData()
-			if(this.id){
-				this.getDetail()
-			}
-		},
-		methods: {
-			// 返回
-			goBack() {
-				this.$emit('back');
-			},
-			async getDetail(){
-				const that = this
-				this.formData.checkTypeList = []
-				getDetail({id: this.id}).then( async res => {
-					Object.assign(this.formData, res.data, {
+import { getWebsit } from '@/api/customerManagement'
+import { lbsAmapRegion } from '@/api/common.js'
+import geographicalPosi from '@/components/geographicalPosi/index.vue'
+import { getMainList } from '@/api/workOrder/settlementStandardInstall'
+import { getBrand } from '@/api/goods'
+import { getDetail, getAuxiliaryList, getAttachmentList, save } from '@/api/engineeringMaintenance/basicData'
+import request from '@/utils/request'
+export default {
+  components: { geographicalPosi },
+  props: ['id', 'title', 'formType'],
+  data() {
+    return {
+      tabIndex: 1,
+      typeIndex: '1',
+      auxiliaryList: [],
+      attachmentList: [],
+      orderTypeList: [],
+      websitData: [],
+      brandList: [],
+      historyList: [],
+      provinceList: [],
+      cityList: [],
+      areaList: [],
+      streetList: [],
+      mainList: [],
+      formData: {
+        dateList: [],
+        checkTypeList: [],
+        projectName: '',
+        manger: '',
+        mobile: '',
+        startTime: '',
+        endTime: '',
+        orderSmallTypeText: '安装',
+        isAllFee: 'YES',
+        feePayMethod: '',
+        province: '',
+        provinceId: '',
+        city: '',
+        cityId: '',
+        area: '',
+        areaId: '',
+        street: '',
+        streetId: '',
+        address: '',
+        lat: '',
+        lng: '',
+        remark: ''
+      },
+      formData1: {
+        productList: []
+      },
+      formData2: {
+        byList: []
+      },
+      formData3: {
+        websitList: []
+      },
+      formData4: {
+        itemList: []
+      },
+      formData5: {
+        itemList: []
+      },
+      isEdit1: 0,
+      isEdit2: 0,
+      isEdit3: 0,
+      isEdit4: 0,
+      isEdit5: 0,
+      companyName: JSON.parse(localStorage.getItem('greemall_user')).companyName,
+      rules: {
+        projectName: [{ required: true, message: '请输入项目名称', trigger: 'blur' }],
+        manger: [{ required: true, message: '请输入负责人名称', trigger: 'blur' }],
+        mobile: [
+          { required: true, message: `请输入联系电话`, trigger: 'blur' },
+          { required: true, message: `请输入联系电话`, trigger: 'change' },
+          { pattern: /^((0\d{2,3}-\d{7,8})|(1[3456789]\d{9}))$/, message: '电话号码格式不正确', trigger: 'blur' }
+        ],
+        dateList: [{ required: true, message: '请选择维保时间', trigger: 'change' }],
+        checkTypeList: [{ required: true, message: '请选择工单类型', trigger: 'change' }],
+        address: [{ required: true, message: '请选择详细地址', trigger: 'change' }],
+        feePayMethod: [{ required: true, message: '请选择费用支付方式', trigger: 'change' }],
+        isAllFee: [{ required: true, message: '', trigger: '' }],
+        orderSmallTypeText: [{ required: true, message: '', trigger: '' }]
+      },
+      rules1: {},
+      rules2: {},
+      rules3: {},
+      rules4: {},
+      rules5: {},
+      isSave: true
+    }
+  },
+  computed: {
+    filterChildren() {
+      return function (id) {
+        let data = []
+        this.mainList.forEach(item => {
+          if (item.categoryId == id) {
+            // data = item.children?[...[{categoryId: '0', name: '不限'}],...item.children]:[]
+            data = item.children ? item.children : []
+          }
+        })
+        return data
+      }
+    }
+  },
+  created() {
+    this.initData()
+    if (this.id) {
+      this.getDetail()
+    }
+  },
+  methods: {
+    // 返回
+    goBack() {
+      this.$emit('back')
+    },
+    async getDetail() {
+      const that = this
+      this.formData.checkTypeList = []
+      getDetail({ id: this.id }).then(async res => {
+        Object.assign(this.formData, res.data, {})
+        this.historyList = res.data.operatorLogList
+        this.formData.dateList = [res.data.startTime, res.data.endTime]
+        this.formData1.productList = res.data.productList.map(item => {
+          return Object.assign(item, {
+            smallList: this.filterChildren(item.mainId),
+            brand: { id: item.brandId, brandName: item.brandName },
+            main: { categoryId: item.mainId, name: item.mainName },
+            small: { categoryId: item.smallId, name: item.smallName }
+          })
+        })
+
+        res.data.websitList.map(item => {
+          item.websit = { websitId: item.websitId, name: item.websitName }
+        })
+        res.data.typeList.forEach(item => {
+          this.formData.checkTypeList.push(item.id)
+        })
+        this.formData2.byList = res.data.byList
+        this.formData3.websitList = res.data.websitList
+        res.data.itemList.map(item => {
+          if (item.goodsType == 'M') {
+            item.auxiliary = { normId: item.goodsId }
+            this.formData4.itemList.push(item)
+          } else {
+            item.attachment = { goodsId: item.goodsId }
+            this.formData5.itemList.push(item)
+          }
+        })
 
-					})
-					this.historyList = res.data.operatorLogList
-					this.formData.dateList = [res.data.startTime,res.data.endTime]
-					this.formData1.productList = res.data.productList.map(item=>{
-						return Object.assign(item, {
-							smallList: this.filterChildren(item.mainId),
-							brand: {id: item.brandId,brandName: item.brandName},
-							main: {categoryId: item.mainId,name: item.mainName},
-							small: {categoryId: item.smallId,name: item.smallName}
-						})
-					})
+        console.log(this.formData1.productList, '123123123')
+      })
+    },
+    initData() {
+      this.getOrderType()
+      this.getBrandList()
+      this.getWebsit()
+      this.getMainList()
+      this.getAuxiliaryList()
+      this.getAttachmentList()
+      this.getinitlbslist()
+    },
+    getOrderType() {
+      request({
+        url: `/order/smalltype/list`,
+        method: 'post',
+        data: {
+          pageNum: 1,
+          pageSize: -1,
+          params: [{ param: 'a.is_rp_project_repair', compare: '=', value: 'YES' }]
+        }
+      }).then(res => {
+        this.orderTypeList = res.data.records
+      })
+    },
+    getBrandList() {
+      getBrand().then(res => {
+        // this.brandList = [...[{id: '0',brandName: '不限'}],...res.data]
+        this.brandList = res.data
+      })
+    },
+    getMainList() {
+      getMainList({ type: 2 }).then(res => {
+        // this.mainList = [...[{categoryId: '0',name: '不限',children: [{categoryId: '0',name: '不限'}]}],...res.data]
+        this.mainList = res.data
+      })
+    },
+    getAuxiliaryList() {
+      getAuxiliaryList({
+        pageNum: 1,
+        pageSize: -1,
+        params: []
+      }).then(res => {
+        this.auxiliaryList = res.data.records
+      })
+    },
+    getAttachmentList() {
+      getAttachmentList({
+        pageNum: 1,
+        pageSize: -1,
+        params: [{ param: 'a.norm_type', compare: '=', value: 'M' }]
+      }).then(res => {
+        this.attachmentList = res.data.records
+      })
+    },
+    getinitlbslist() {
+      // 初始化请求省市区街道下拉选项数据
+      lbsAmapRegion({ pid: 0 }).then(res => {
+        this.provinceList = res.data
+        // 创建工单时获取ip地址定位赋值
+        if (!this.id && this.$IpAdd.province) {
+          var item = this.provinceList.find(item => item.name === this.$IpAdd.province)
+          if (item) {
+            this.formData.provinceId = item.id
+            this.formData.province = item.name
+          }
+        }
+        if (this.formData.provinceId) {
+          lbsAmapRegion({ pid: this.formData.provinceId }).then(res => {
+            this.cityList = res.data
+            // 创建工单时获取ip地址定位赋值
+            if (!this.id && this.$IpAdd.city) {
+              var item2 = this.cityList.find(item => item.name === this.$IpAdd.city)
+              if (item2) {
+                this.formData.cityId = item2.id
+                this.formData.city = item2.name
+              }
+            }
+            if (this.formData.cityId) {
+              lbsAmapRegion({ pid: this.formData.cityId }).then(res => {
+                this.areaList = res.data
+              })
+            }
+            if (this.formData.areaId) {
+              lbsAmapRegion({ pid: this.formData.areaId }).then(res => {
+                this.streetList = res.data
+              })
+            }
+          })
+        }
+      })
+    },
+    selectAddress(data) {
+      this.formData.lng = data.center[0]
+      this.formData.lat = data.center[1]
+      // 获取定位的省市区街道
+      var { province, city, district, township } = data.data.addressComponent
+      // 获取选中省名称id
+      var { id, name } = this.provinceList.find(item => item.name === province)
+      this.formData.provinceId = id
+      this.formData.province = name
+      // 请求市选项
+      lbsAmapRegion({ pid: this.formData.provinceId }).then(res => {
+        // 赋值市选项
+        this.cityList = res.data
+        // 获取选中市名称id
+        var { id, name } = res.data.find(item => item.name === city)
+        this.formData.cityId = id
+        this.formData.city = name
+        // 请求区选项
+        lbsAmapRegion({ pid: this.formData.cityId }).then(res => {
+          // 赋值区选项
+          this.areaList = res.data
+          // 获取选中区名称id
+          var { id, name } = res.data.find(item => item.name === district)
+          this.formData.areaId = id
+          this.formData.area = name
+          // 请求街道选项
+          lbsAmapRegion({ pid: this.formData.areaId }).then(res => {
+            // 赋值街道选项
+            this.streetList = res.data
+            // 获取选中街道名称id
+            var { id, name } = res.data.find(item => item.name === township)
+            this.formData.streetId = id
+            this.formData.street = name
+            // 赋值GPS详细地址
+            this.formData.address = data.name
+          })
+        })
+      })
+    },
+    selectDate(e) {
+      this.formData.startTime = e[0] + ' 00:00:00'
+      this.formData.endTime = e[1] + ' 23:59:59'
+    },
+    getWebsit() {
+      getWebsit({ type: 'C' }).then(res => {
+        this.websitData = res.data
+      })
+    },
+    getCategory(websitId) {
+      getCategory({ websitId }).then(res => {
+        this.mainList = res.data
+      })
+    },
+    changeType() {},
+    preserveRuleForm(name) {
+      let is_save = false
+      this.$refs[name].validate(valid => {
+        if (valid) {
+          is_save = true
+        } else {
+          is_save = false
+        }
+      })
+      return is_save
+    },
+    edit(typeIndex, index) {
+      if (this.preserveRuleForm('formData' + this.typeIndex)) {
+        this['isEdit' + typeIndex] = index
+      }
+    },
+    add() {
+      if (!this.preserveRuleForm('formData' + this.typeIndex)) {
+        return false
+      }
+      let name =
+        this.typeIndex == 1
+          ? 'productList'
+          : this.typeIndex == 2
+          ? 'byList'
+          : this.typeIndex == 3
+          ? 'websitList'
+          : 'itemList'
+      this['isEdit' + this.typeIndex] = 0
+      // if(this['formData' + this.typeIndex][name].length != 0){this['isEdit' + this.typeIndex] += 1}
+      if (this.typeIndex == 1) {
+        this['formData' + this.typeIndex][name].unshift({
+          brand: null,
+          brandId: '',
+          brandName: '',
+          inNum: '',
+          main: null,
+          mainId: '',
+          mainName: '',
+          num: '',
+          outNum: '',
+          productName: '',
+          seriesName: '',
+          small: null,
+          smallId: '',
+          smallName: '',
+          smallImg: ''
+        })
+      } else if (this.typeIndex == 2) {
+        this['formData' + this.typeIndex][name].unshift({
+          name: '',
+          mobile: '',
+          feeExamine: ''
+        })
+      } else if (this.typeIndex == 3) {
+        this['formData' + this.typeIndex][name].unshift({
+          websit: null,
+          websitId: '',
+          websitName: '',
+          linkName: '',
+          mobile: '',
+          address: ''
+        })
+      } else if (this.typeIndex == 4) {
+        this['formData' + this.typeIndex][name].unshift({
+          auxiliary: null,
+          goodsId: '',
+          goodsName: '',
+          parentCategoryId: '',
+          parentCategoryName: '',
+          goodsCategoryId: '',
+          goodsCategoryName: '',
+          goodsCode: '',
+          goodsSpecification: '',
+          goodsStockUnit: '',
+          normType: '',
+          normAmount: '',
+          goodsType: 'M'
+        })
+      } else if (this.typeIndex == 5) {
+        this['formData' + this.typeIndex][name].unshift({
+          attachment: null,
+          goodsId: '',
+          goodsName: '',
+          goodsCode: '',
+          goodsStockUnit: '',
+          normType: '',
+          normAmount: '',
+          brandRelaName: '',
+          productRelaName: '',
+          goodsType: 'P'
+        })
+      }
+    },
+    del(index) {
+      let name =
+        this.typeIndex == 1
+          ? 'productList'
+          : this.typeIndex == 2
+          ? 'byList'
+          : this.typeIndex == 3
+          ? 'websitList'
+          : 'itemList'
+      this['formData' + this.typeIndex][name].splice(index, 1)
+    },
+    confirm() {
+      const that = this
+      this.$refs.formData.validate((valid, invalidFields, errLabels) => {
+        if (valid) {
+          if (that.formData1.productList.length == 0) {
+            that.typeIndex = '1'
+            return that.$message.error('请添加项目设备信息')
+          }
+          if (that.formData2.byList.length == 0) {
+            that.typeIndex = '2'
+            return that.$message.error('请添加项目人员信息')
+          }
+          if (that.formData3.websitList.length == 0) {
+            that.typeIndex = '3'
+            return that.$message.error('请添加服务网点信息')
+          }
+          // if(that.formData4.itemList.length == 0){
+          // 	that.typeIndex = '4'
+          // 	return that.$message.error('请添加辅材配置信息');
+          // }
+          // if(that.formData5.itemList.length == 0){
+          // 	that.typeIndex = '5'
+          // 	return that.$message.error('请添加配件配置信息');
+          // }
+          if (!that.preserveRuleForm('formData1')) {
+            return (that.typeIndex = '1')
+          }
+          if (!that.preserveRuleForm('formData2')) {
+            return (that.typeIndex = '2')
+          }
+          if (!that.preserveRuleForm('formData3')) {
+            return (that.typeIndex = '3')
+          }
+          // if(!that.preserveRuleForm('formData4')){
+          // 	return that.typeIndex = '4'
+          // }
+          // if(!that.preserveRuleForm('formData5')){
+          // 	return that.typeIndex = '5'
+          // }
+          this.save()
+        }
+      })
+    },
+    save() {
+      if (!this.isSave) {
+        return false
+      }
+      this.isSave = false
+      setTimeout(() => {
+        this.isSave = true
+      }, 3000)
+      let data = this.orderTypeList.filter(it => {
+        const index = this.formData.checkTypeList.findIndex(item => item === it.id)
+        return index !== -1
+      })
 
-					res.data.websitList.map(item=>{
-						item.websit = {websitId: item.websitId,name: item.websitName}
-					})
-					res.data.typeList.forEach(item=>{
-						this.formData.checkTypeList.push(item.id)
-					})
-					this.formData2.byList = res.data.byList
-					this.formData3.websitList = res.data.websitList
-					res.data.itemList.map(item=>{
-						if(item.goodsType == 'M'){
-							item.auxiliary = {normId: item.goodsId}
-							this.formData4.itemList.push(item)
-						}else{
-							item.attachment = {goodsId: item.goodsId}
-							this.formData5.itemList.push(item)
-						}
-					})
-					
-					console.log(this.formData1.productList,'123123123')
-				})
-			},
-			initData(){
-				this.getOrderType()
-				this.getBrandList()
-				this.getWebsit()
-				this.getMainList()
-				this.getAuxiliaryList()
-				this.getAttachmentList()
-				this.getinitlbslist()
-			},
-			getOrderType(){
-				request({
-					url: `/order/smalltype/list`,
-					method: 'post',
-					data: {
-						pageNum: 1,
-						pageSize: -1,
-						params: [{param: 'a.is_rp_project_repair',compare: '=', value: 'YES'}]
-					}
-				}).then(res => {
-					this.orderTypeList = res.data.records
-				})
-			},
-			getBrandList(){
-				getBrand().then(res => {
-					// this.brandList = [...[{id: '0',brandName: '不限'}],...res.data]
-					this.brandList = res.data
-				})
-			},
-			getMainList(){
-				getMainList({type: 2}).then(res => {
-					// this.mainList = [...[{categoryId: '0',name: '不限',children: [{categoryId: '0',name: '不限'}]}],...res.data]
-					this.mainList = res.data
-				})
-			},
-			getAuxiliaryList(){
-				getAuxiliaryList({
-					pageNum: 1,
-					pageSize: -1,
-					params: []
-				}).then(res => {
-					this.auxiliaryList = res.data.records
-				})
-			},
-			getAttachmentList(){
-				getAttachmentList({
-					pageNum: 1,
-					pageSize: -1,
-					params: [{param: "a.norm_type", compare: "=", value: "M"}]
-				}).then(res => {
-					this.attachmentList = res.data.records
-				})
-			},
-			getinitlbslist() {
-			  // 初始化请求省市区街道下拉选项数据
-			  lbsAmapRegion({ pid: 0 }).then(res => {
-			    this.provinceList = res.data
-			    // 创建工单时获取ip地址定位赋值
-			    if (!this.id && this.$IpAdd.province) {
-			      var item = this.provinceList.find(item => item.name === this.$IpAdd.province)
-			      if (item) {
-			        this.formData.provinceId = item.id
-			        this.formData.province = item.name
-			      }
-			    }
-			    if (this.formData.provinceId) {
-			      lbsAmapRegion({ pid: this.formData.provinceId }).then(res => {
-			        this.cityList = res.data
-			        // 创建工单时获取ip地址定位赋值
-			        if (!this.id && this.$IpAdd.city) {
-			          var item2 = this.cityList.find(item => item.name === this.$IpAdd.city)
-			          if (item2) {
-			            this.formData.cityId = item2.id
-			            this.formData.city = item2.name
-			          }
-			        }
-			        if (this.formData.cityId) {
-			          lbsAmapRegion({ pid: this.formData.cityId }).then(res => {
-			            this.areaList = res.data
-			          })
-			        }
-			        if (this.formData.areaId) {
-			          lbsAmapRegion({ pid: this.formData.areaId }).then(res => {
-			            this.streetList = res.data
-			          })
-			        }
-			      })
-			    }
-			  })
-			},
-			selectAddress(data){
-				this.formData.lng = data.center[0]
-				this.formData.lat = data.center[1]
-				// 获取定位的省市区街道
-				var { province, city, district, township } = data.data.addressComponent
-				// 获取选中省名称id
-				var { id, name } = this.provinceList.find(item => item.name === province)
-				this.formData.provinceId = id
-				this.formData.province = name
-				// 请求市选项
-				lbsAmapRegion({ pid: this.formData.provinceId }).then(res => {
-				  // 赋值市选项
-				  this.cityList = res.data
-				  // 获取选中市名称id
-				  var { id, name } = res.data.find(item => item.name === city)
-				  this.formData.cityId = id
-				  this.formData.city = name
-				  // 请求区选项
-				  lbsAmapRegion({ pid: this.formData.cityId }).then(res => {
-				    // 赋值区选项
-				    this.areaList = res.data
-				    // 获取选中区名称id
-				    var { id, name } = res.data.find(item => item.name === district)
-				    this.formData.areaId = id
-				    this.formData.area = name
-				    // 请求街道选项
-				    lbsAmapRegion({ pid: this.formData.areaId }).then(res => {
-				      // 赋值街道选项
-				      this.streetList = res.data
-				      // 获取选中街道名称id
-				      var { id, name } = res.data.find(item => item.name === township)
-				      this.formData.streetId = id
-				      this.formData.street = name
-				      // 赋值GPS详细地址
-				      this.formData.address = data.name
-				    })
-				  })
-				})
-			},
-			selectDate(e){
-				this.formData.startTime = e[0] + ' 00:00:00'
-				this.formData.endTime = e[1] + ' 23:59:59'
-			},
-			getWebsit(){
-				getWebsit({type: 'C'}).then(res => {
-					this.websitData = res.data
-				})
-			},
-			getCategory(websitId){
-				getCategory({websitId}).then(res => {
-					this.mainList = res.data
-				})
-			},
-			changeType(){
-				
-			},
-			preserveRuleForm(name) {
-				let is_save = false
-				this.$refs[name].validate((valid) => {
-					if (valid) {
-						is_save = true
-					} else {
-						is_save = false;
-					}
-				});
-				return is_save
-			},
-			edit(typeIndex,index){
-				if(this.preserveRuleForm('formData' + this.typeIndex)){
-					this['isEdit' + typeIndex] = index
-				}
-			},
-			add(){
-				if(!this.preserveRuleForm('formData' + this.typeIndex)){return false}
-				let name = this.typeIndex == 1?'productList':this.typeIndex == 2?'byList':this.typeIndex == 3?'websitList':'itemList'
-				this['isEdit' + this.typeIndex] = 0
-				// if(this['formData' + this.typeIndex][name].length != 0){this['isEdit' + this.typeIndex] += 1}
-				if(this.typeIndex == 1){
-					this['formData' + this.typeIndex][name].unshift({
-						brand: null,
-						brandId: '',
-						brandName: '',
-						inNum: '',
-						main: null,
-						mainId: '',
-						mainName: '',
-						num: '',
-						outNum: '',
-						productName: '',
-						seriesName: '',
-						small: null,
-						smallId: '',
-						smallName: '',
-						smallImg: ''
-					})
-				}else if(this.typeIndex == 2){
-					this['formData' + this.typeIndex][name].unshift({
-						name: '',
-						mobile: '',
-						feeExamine: ''
-					})
-				}else if(this.typeIndex == 3){
-					this['formData' + this.typeIndex][name].unshift({
-						websit: null,
-						websitId: '',
-						websitName: '',
-						linkName: '',
-						mobile: '',
-						address: ''
-					})
-				}else if(this.typeIndex == 4){
-					this['formData' + this.typeIndex][name].unshift({
-						auxiliary: null,
-						goodsId: '',
-						goodsName: '',
-						parentCategoryId: '',
-						parentCategoryName: '',
-						goodsCategoryId: '',
-						goodsCategoryName: '',
-						goodsCode: '',
-						goodsSpecification: '',
-						goodsStockUnit: '',
-						normType: '',
-						normAmount: '',
-						goodsType: 'M'
-					})
-				}else if(this.typeIndex == 5){
-					this['formData' + this.typeIndex][name].unshift({
-						attachment: null,
-						goodsId: '',
-						goodsName: '',
-						goodsCode: '',
-						goodsStockUnit: '',
-						normType: '',
-						normAmount: '',
-						brandRelaName: '',
-						productRelaName: '',
-						goodsType: 'P'
-					})
-				}
-			},
-			del(index){
-				let name = this.typeIndex == 1?'productList':this.typeIndex == 2?'byList':this.typeIndex == 3?'websitList':'itemList'
-				this['formData' + this.typeIndex][name].splice(index,1)
-			},
-			confirm(){
-				const that = this
-				this.$refs.formData.validate((valid, invalidFields, errLabels) => {
-					if (valid) {
-						if(that.formData1.productList.length == 0){
-							that.typeIndex = '1'
-							return that.$message.error('请添加项目设备信息');
-						}
-						if(that.formData2.byList.length == 0){
-							that.typeIndex = '2'
-							return that.$message.error('请添加项目人员信息');
-						}
-						if(that.formData3.websitList.length == 0){
-							that.typeIndex = '3'
-							return that.$message.error('请添加服务网点信息');
-						}
-						// if(that.formData4.itemList.length == 0){
-						// 	that.typeIndex = '4'
-						// 	return that.$message.error('请添加辅材配置信息');
-						// }
-						// if(that.formData5.itemList.length == 0){
-						// 	that.typeIndex = '5'
-						// 	return that.$message.error('请添加配件配置信息');
-						// }
-						if(!that.preserveRuleForm('formData1')){
-							return that.typeIndex = '1'
-						}
-						if(!that.preserveRuleForm('formData2')){
-							return that.typeIndex = '2'
-						}
-						if(!that.preserveRuleForm('formData3')){
-							return that.typeIndex = '3'
-						}
-						// if(!that.preserveRuleForm('formData4')){
-						// 	return that.typeIndex = '4'
-						// }
-						// if(!that.preserveRuleForm('formData5')){
-						// 	return that.typeIndex = '5'
-						// }
-						this.save()
-					}
-				})
-			},
-			save(){
-				if(!this.isSave){
-					return false
-				}
-				this.isSave = false
-				setTimeout(()=>{
-					this.isSave = true
-				},3000)
-				let data = this.orderTypeList.filter((it) => {
-				   const index = this.formData.checkTypeList.findIndex((item) => item === it.id)
-				   return index !== -1
-				 })
-				
-				const that = this
-				let params = {
-					...this.formData,
-					byList: this.formData2.byList,
-					productList: this.formData1.productList,
-					websitList: this.formData3.websitList,
-					typeList: data,
-					itemList: [...this.formData4.itemList,...this.formData5.itemList]
-				}
-				save(params).then(res => {
-					that.$message.success('保存成功!')
-					setTimeout(()=>{
-						that.goBack()
-					},1500)
-				})
-			}
-		}
-	};
+      const that = this
+      let params = {
+        ...this.formData,
+        byList: this.formData2.byList,
+        productList: this.formData1.productList,
+        websitList: this.formData3.websitList,
+        typeList: data,
+        itemList: [...this.formData4.itemList, ...this.formData5.itemList]
+      }
+      save(params).then(res => {
+        that.$message.success('保存成功!')
+        setTimeout(() => {
+          that.goBack()
+        }, 1500)
+      })
+    }
+  }
+}
 </script>
 
 <style scoped="scoped" lang="scss">
-	.s-page {
-		padding: 20px;
-		background-color: #ffffff;
-	}
-	.page-footer {
-		height: 70px;
-	}
-	
-	.footer {
-		position: fixed;
-		bottom: 0;
-		left: 0;
-		z-index: 1;
-		width: 100%;
-		background: #fff;
-		padding: 15px 40px;
-		box-sizing: border-box;
-		transition: all 0.28s;
-		text-align: right;
-		box-shadow: 0 2px 5px 0 rgb(0 0 0 / 50%), 0 2px 5px 0 rgb(0 0 0 / 10%);
-	
-		&.hideSidebar {
-			margin-left: 54px;
-			width: calc(100vw - 54px);
-		}
-	
-		&.openSidebar {
-			margin-left: 210px;
-			width: calc(100vw - 210px);
-		}
-	
-		.tips {
-			font-size: 12px;
-			color: red;
-			margin-top: 10px;
-		}
-	}
-	::v-deep .numrule input::-webkit-outer-spin-button,
-	::v-deep .numrule input::-webkit-inner-spin-button {
-	    -webkit-appearance: none!important;
-	}
-	::v-deep .numrule input[type="number"]{
-	    -moz-appearance: textfield;
-	}
-</style>
+.s-page {
+  padding: 20px;
+  background-color: #ffffff;
+}
+.page-footer {
+  height: 70px;
+}
+
+.footer {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  z-index: 1;
+  width: 100%;
+  background: #fff;
+  padding: 15px 40px;
+  box-sizing: border-box;
+  transition: all 0.28s;
+  text-align: right;
+  box-shadow: 0 2px 5px 0 rgb(0 0 0 / 50%), 0 2px 5px 0 rgb(0 0 0 / 10%);
+
+  &.hideSidebar {
+    margin-left: 54px;
+    width: calc(100vw - 54px);
+  }
+
+  &.openSidebar {
+    margin-left: 210px;
+    width: calc(100vw - 210px);
+  }
+
+  .tips {
+    font-size: 12px;
+    color: red;
+    margin-top: 10px;
+  }
+}
+::v-deep .numrule input::-webkit-outer-spin-button,
+::v-deep .numrule input::-webkit-inner-spin-button {
+  -webkit-appearance: none !important;
+}
+::v-deep .numrule input[type='number'] {
+  -moz-appearance: textfield;
+}
+</style>

src/views/engineeringMaintenance/mixins/feel.js

@@ -1,271 +1,305 @@
-
 export default {
   computed: {
     formItems() {
-      return [{
-        md: 24,
-        name: 'slot-component',
-        formItemAttributes: {
-          label: '基本信息',
-        },
-        render: (h, { props, onInput }) => {
-          var { formData } = props
-          return (
-            <el-descriptions border title="" column={2} colon={false} labelStyle={{ width: '13%' }} contentStyle={{ width: '37%' }}>
-              <el-descriptions-item label="所属商户">
-                {formData.companyWechatName}
-              </el-descriptions-item>
-              <el-descriptions-item label="申请单号">
-                {formData.orderId}
-              </el-descriptions-item>
-              <el-descriptions-item label="项目名称">
-                {formData.rpProjectRepairName}
-              </el-descriptions-item>
-              <el-descriptions-item label="工单单号">
-                {formData.workerOrderId}
-              </el-descriptions-item>
-              <el-descriptions-item label="负责人">
-                {formData.userName}
-              </el-descriptions-item>
-              <el-descriptions-item label="联系电话">
-                {formData.userMobile}
-              </el-descriptions-item>
-              <el-descriptions-item label="项目地址">
-                {formData.pgOrderBase.address}
-              </el-descriptions-item>
-              <el-descriptions-item label="创单人">
-                {formData.pgOrderBase.createBy}
-              </el-descriptions-item>
-              <el-descriptions-item label="创单人电话">
-                {formData.pgOrderBase.createMobile}
-              </el-descriptions-item>
-              <el-descriptions-item label="创单时间">
-                {formData.pgOrderBase.createTime}
-              </el-descriptions-item>
-              <el-descriptions-item label="工单类型">
-                {formData.orderSmallTypeText}
-              </el-descriptions-item>
-              <el-descriptions-item label="网点名称">
-                {formData.websitName}
-              </el-descriptions-item>
-              <el-descriptions-item label="申请人">
-                {formData.workerName}
-              </el-descriptions-item>
-              <el-descriptions-item label="联系电话">
-                {formData.workerMobile}
-              </el-descriptions-item>
-              <el-descriptions-item label="申请时间">
-                {formData.createTime}
-              </el-descriptions-item>
-              <el-descriptions-item label="包含全部费用">
-                {({ YES: "是", NO: "否" })[formData.isAllFee]}
-              </el-descriptions-item>
+      return [
+        {
+          md: 24,
+          name: 'slot-component',
+          formItemAttributes: {
+            label: '基本信息'
+          },
+          render: (h, { props, onInput }) => {
+            var { formData } = props
+            return (
+              <el-descriptions
+                border
+                title=""
+                column={2}
+                colon={false}
+                labelStyle={{ width: '13%' }}
+                contentStyle={{ width: '37%' }}
+              >
+                <el-descriptions-item label="申请单号">{formData.orderId}</el-descriptions-item>
+                <el-descriptions-item label="项目名称">{formData.rpProjectRepairName}</el-descriptions-item>
+                <el-descriptions-item label="工单单号">{formData.workerOrderId}</el-descriptions-item>
+                <el-descriptions-item label="负责人">{formData.userName}</el-descriptions-item>
+                <el-descriptions-item label="联系电话">{formData.userMobile}</el-descriptions-item>
+                <el-descriptions-item label="项目地址">{formData.pgOrderBase.address}</el-descriptions-item>
+                <el-descriptions-item label="创单人">{formData.pgOrderBase.createBy}</el-descriptions-item>
+                <el-descriptions-item label="创单人电话">{formData.pgOrderBase.createMobile}</el-descriptions-item>
+                <el-descriptions-item label="创单时间">{formData.pgOrderBase.createTime}</el-descriptions-item>
+                <el-descriptions-item label="工单类型">{formData.orderSmallTypeText}</el-descriptions-item>
+                <el-descriptions-item label="网点名称">{formData.websitName}</el-descriptions-item>
+                <el-descriptions-item label="申请人">{formData.workerName}</el-descriptions-item>
+                <el-descriptions-item label="联系电话">{formData.workerMobile}</el-descriptions-item>
+                <el-descriptions-item label="申请时间">{formData.createTime}</el-descriptions-item>
+                <el-descriptions-item label="包含全部费用">
+                  {{ YES: '是', NO: '否' }[formData.isAllFee]}
+                </el-descriptions-item>
 
-              {!!~["applicationWithoutFee", "feeSettlementIncluded", "feeSettlementIncludedwx"].indexOf(this?.$route?.name) ? <el-descriptions-item label="费用支付方式">
-                {({ EXAMINE: "审批后结算", SITE: "现场支付" })[formData.feePayMethod]}
-              </el-descriptions-item> : null}
+                {!!~['applicationWithoutFee', 'feeSettlementIncluded', 'feeSettlementIncludedwx'].indexOf(
+                  this?.$route?.name
+                ) ? (
+                  <el-descriptions-item label="费用支付方式">
+                    {{ EXAMINE: '审批后结算', SITE: '现场支付' }[formData.feePayMethod]}
+                  </el-descriptions-item>
+                ) : null}
 
-              {!!~["applicationWithoutFee"].indexOf(this?.$route?.name) && formData.feePayMethod == "EXAMINE" ? [
-                <el-descriptions-item label="费用单状态">
-                  {({ WAIT: "待审", OK: "通过", FAIL: "驳回", PAID: "现场支付", NO: "取消", NO_PAID: "未支付" })[formData.examineStatus]}
-                </el-descriptions-item>,
-                <el-descriptions-item label="审批人">
-                  {formData.examineName}
-                </el-descriptions-item>,
-                <el-descriptions-item label="审批时间">
-                  {formData.examineTime}
-                </el-descriptions-item>,
-                <el-descriptions-item label="取消人">
-                  {formData.cancelName}
-                </el-descriptions-item>,
-                <el-descriptions-item label="取消时间">
-                  {formData.cancelTime}
-                </el-descriptions-item>
-              ] : null}
+                {!!~['applicationWithoutFee'].indexOf(this?.$route?.name) && formData.feePayMethod == 'EXAMINE'
+                  ? [
+                      <el-descriptions-item label="费用单状态">
+                        {
+                          { WAIT: '待审', OK: '通过', FAIL: '驳回', PAID: '现场支付', NO: '取消', NO_PAID: '未支付' }[
+                            formData.examineStatus
+                          ]
+                        }
+                      </el-descriptions-item>,
+                      <el-descriptions-item label="审批人">{formData.examineName}</el-descriptions-item>,
+                      <el-descriptions-item label="审批时间">{formData.examineTime}</el-descriptions-item>,
+                      <el-descriptions-item label="取消人">{formData.cancelName}</el-descriptions-item>,
+                      <el-descriptions-item label="取消时间">{formData.cancelTime}</el-descriptions-item>
+                    ]
+                  : null}
 
-              {!!~["feeSettlementIncluded"].indexOf(this?.$route?.name) && formData.feePayMethod == "EXAMINE" ? [
-                <el-descriptions-item label="结算状态">
-                  {({ WAIT: "待结算", OVER: "已结算" })[formData.status]}
-                </el-descriptions-item>,
-                <el-descriptions-item label="结算人">
-                  {formData.settleName}
-                </el-descriptions-item>,
-                <el-descriptions-item label="结算时间">
-                  {formData.settleTime}
-                </el-descriptions-item>
-              ] : null}
-            </el-descriptions>
-          )
-        }
-      }, {
-        md: 24,
-        name: 'slot-component',
-        formItemAttributes: {
-          label: '费用明细',
-        },
-        render: (h, { props, onInput }) => {
-          var { formData } = props
-          return (
-            <zj-table
-              columns={[{
-                columnAttributes: {
-                  label: '费用名称',
-                  prop: 'goodsName',
-                }
-              }, {
-                columnAttributes: {
-                  label: '费用类型',
-                  prop: 'chargeType',
-                },
-                render: (h, { row, column, index }) => {
-                  return (
-                    <div style="padding-left:10px">
-                      {({ MCC: "辅材物料", ACC: "配件物料", SERV: "服务收费" })[row.chargeType]}
-                    </div>
-                  )
-                }
-              }, {
-                columnAttributes: {
-                  label: '单价',
-                  prop: 'goodsAmount',
-                }
-              }, {
-                columnAttributes: {
-                  label: '数量',
-                  prop: 'num',
-                }
-              }, {
-                columnAttributes: {
-                  label: '费用金额',
-                  prop: 'totalAmount',
-                }
-              },
-              ]}
-              table-data={formData.rpMaterialOrderItems}
-            />
-          )
-        }
-      },
-      {
-        md: 8,
-        isShow: this.formData.rpMaterialOrderItems.filter(item => item.chargeType == "MCC").length,
-        name: 'slot-component',
-        formItemAttributes: {
-          label: '辅材费用合计',
-        },
-        render: (h, { props, onInput }) => {
-          var { formData } = props
-          return <span>{[0, 0, 0, ...formData.rpMaterialOrderItems.filter(item => item.chargeType == "MCC").map(item => item.totalAmount)].reduce(function (prev, curr, idx, arr) {
-            return prev + curr;
-          }).toFixed(2)}</span>
-        }
-      },
-      {
-        md: 8,
-        isShow: this.formData.rpMaterialOrderItems.filter(item => item.chargeType == "ACC").length,
-        name: 'slot-component',
-        formItemAttributes: {
-          label: '配件费用合计',
+                {!!~['feeSettlementIncluded'].indexOf(this?.$route?.name) && formData.feePayMethod == 'EXAMINE'
+                  ? [
+                      <el-descriptions-item label="结算状态">
+                        {{ WAIT: '待结算', OVER: '已结算' }[formData.status]}
+                      </el-descriptions-item>,
+                      <el-descriptions-item label="结算人">{formData.settleName}</el-descriptions-item>,
+                      <el-descriptions-item label="结算时间">{formData.settleTime}</el-descriptions-item>
+                    ]
+                  : null}
+              </el-descriptions>
+            )
+          }
         },
-        render: (h, { props, onInput }) => {
-          var { formData } = props
-          return <span>{[0, 0, 0, ...formData.rpMaterialOrderItems.filter(item => item.chargeType == "ACC").map(item => item.totalAmount)].reduce(function (prev, curr, idx, arr) {
-            return prev + curr;
-          }).toFixed(2)}</span>
-        }
-      },
-      {
-        md: 8,
-        name: 'slot-component',
-        formItemAttributes: {
-          label: '服务收费费用合计',
-        },
-        render: (h, { props, onInput }) => {
-          var { formData } = props
-          return <span>{[0, 0, 0, ...formData.rpMaterialOrderItems.filter(item => item.chargeType == "SERV").map(item => item.totalAmount)].reduce(function (prev, curr, idx, arr) {
-            return prev + curr;
-          }).toFixed(2)}</span>
-        }
-      },
-      {
-        md: 8,
-        name: 'slot-component',
-        formItemAttributes: {
-          label: '总金额',
-        },
-        render: (h, { props, onInput }) => {
-          var { formData } = props
-          return <span>{[0, 0, 0, ...formData.rpMaterialOrderItems.map(item => item.totalAmount)].reduce(function (prev, curr, idx, arr) {
-            return prev + curr;
-          }).toFixed(2)}</span>
-        }
-      }, {
-        name: 'el-input',
-        md: 24,
-        attributes: { disabled: true, type: "textarea", placeholder: '' },
-        formItemAttributes: { label: '申请备注', prop: 'remark' },
-      },
-      ...(() => {
-        if (this.formData.payType == 'WECHAT') {
-          return [{
-            md: 24,
-            name: 'slot-component',
-            formItemAttributes: {
-              label: '交易记录',
-            },
-            render: (h, { props, onInput }) => {
-              var { formData } = props
-              return (
-                <zj-table
-                  columns={[{
+        {
+          md: 24,
+          name: 'slot-component',
+          formItemAttributes: {
+            label: '费用明细'
+          },
+          render: (h, { props, onInput }) => {
+            var { formData } = props
+            return (
+              <zj-table
+                columns={[
+                  {
                     columnAttributes: {
-                      label: 'id',
-                      prop: 'orderId',
+                      label: '费用名称',
+                      prop: 'goodsName'
                     }
-                  }, {
+                  },
+                  {
                     columnAttributes: {
-                      label: '交易类型',
-                      prop: 'goodsType',
+                      label: '费用类型',
+                      prop: 'chargeType'
                     },
-                    render: (h, { row }) => {
-                      return <div>
-                        {({ M: "辅材", P: "配件" })[row.goodsType]}
-                      </div>
-                    }
-                  }, {
-                    columnAttributes: {
-                      label: '交易金额',
-                      prop: 'totalAmount',
+                    render: (h, { row, column, index }) => {
+                      return (
+                        <div style="padding-left:10px">
+                          {{ MCC: '辅材物料', ACC: '配件物料', SERV: '服务收费' }[row.chargeType]}
+                        </div>
+                      )
                     }
-                  }, {
+                  },
+                  {
                     columnAttributes: {
-                      label: '交易状态',
-                      prop: 'payStatus',
-                    },
-                    render: (h, { row }) => {
-                      return <div>
-                        {({ CANCEL: "取消", WAIT: "待支付", PAID: "已支付" })[row.payStatus]}
-                      </div>
+                      label: '单价',
+                      prop: 'goodsAmount'
                     }
-                  }, {
+                  },
+                  {
                     columnAttributes: {
-                      label: '交易时间',
-                      prop: 'payTime',
+                      label: '数量',
+                      prop: 'num'
                     }
-                  }, {
+                  },
+                  {
                     columnAttributes: {
-                      label: '创建时间',
-                      prop: 'createTime',
+                      label: '费用金额',
+                      prop: 'totalAmount'
                     }
-                  }]}
-                  table-data={[formData]}
-                />
-              )
-            }
-          }]
-        }
-        return []
-      })()]
+                  }
+                ]}
+                table-data={formData.rpMaterialOrderItems}
+              />
+            )
+          }
+        },
+        {
+          md: 8,
+          isShow: this.formData.rpMaterialOrderItems.filter(item => item.chargeType == 'MCC').length,
+          name: 'slot-component',
+          formItemAttributes: {
+            label: '辅材费用合计'
+          },
+          render: (h, { props, onInput }) => {
+            var { formData } = props
+            return (
+              <span>
+                {[
+                  0,
+                  0,
+                  0,
+                  ...formData.rpMaterialOrderItems
+                    .filter(item => item.chargeType == 'MCC')
+                    .map(item => item.totalAmount)
+                ]
+                  .reduce(function (prev, curr, idx, arr) {
+                    return prev + curr
+                  })
+                  .toFixed(2)}
+              </span>
+            )
+          }
+        },
+        {
+          md: 8,
+          isShow: this.formData.rpMaterialOrderItems.filter(item => item.chargeType == 'ACC').length,
+          name: 'slot-component',
+          formItemAttributes: {
+            label: '配件费用合计'
+          },
+          render: (h, { props, onInput }) => {
+            var { formData } = props
+            return (
+              <span>
+                {[
+                  0,
+                  0,
+                  0,
+                  ...formData.rpMaterialOrderItems
+                    .filter(item => item.chargeType == 'ACC')
+                    .map(item => item.totalAmount)
+                ]
+                  .reduce(function (prev, curr, idx, arr) {
+                    return prev + curr
+                  })
+                  .toFixed(2)}
+              </span>
+            )
+          }
+        },
+        {
+          md: 8,
+          name: 'slot-component',
+          formItemAttributes: {
+            label: '服务收费费用合计'
+          },
+          render: (h, { props, onInput }) => {
+            var { formData } = props
+            return (
+              <span>
+                {[
+                  0,
+                  0,
+                  0,
+                  ...formData.rpMaterialOrderItems
+                    .filter(item => item.chargeType == 'SERV')
+                    .map(item => item.totalAmount)
+                ]
+                  .reduce(function (prev, curr, idx, arr) {
+                    return prev + curr
+                  })
+                  .toFixed(2)}
+              </span>
+            )
+          }
+        },
+        {
+          md: 8,
+          name: 'slot-component',
+          formItemAttributes: {
+            label: '总金额'
+          },
+          render: (h, { props, onInput }) => {
+            var { formData } = props
+            return (
+              <span>
+                {[0, 0, 0, ...formData.rpMaterialOrderItems.map(item => item.totalAmount)]
+                  .reduce(function (prev, curr, idx, arr) {
+                    return prev + curr
+                  })
+                  .toFixed(2)}
+              </span>
+            )
+          }
+        },
+        {
+          name: 'el-input',
+          md: 24,
+          attributes: { disabled: true, type: 'textarea', placeholder: '' },
+          formItemAttributes: { label: '申请备注', prop: 'remark' }
+        },
+        ...(() => {
+          if (this.formData.payType == 'WECHAT') {
+            return [
+              {
+                md: 24,
+                name: 'slot-component',
+                formItemAttributes: {
+                  label: '交易记录'
+                },
+                render: (h, { props, onInput }) => {
+                  var { formData } = props
+                  return (
+                    <zj-table
+                      columns={[
+                        {
+                          columnAttributes: {
+                            label: 'id',
+                            prop: 'orderId'
+                          }
+                        },
+                        {
+                          columnAttributes: {
+                            label: '交易类型',
+                            prop: 'goodsType'
+                          },
+                          render: (h, { row }) => {
+                            return <div>{{ M: '辅材', P: '配件' }[row.goodsType]}</div>
+                          }
+                        },
+                        {
+                          columnAttributes: {
+                            label: '交易金额',
+                            prop: 'totalAmount'
+                          }
+                        },
+                        {
+                          columnAttributes: {
+                            label: '交易状态',
+                            prop: 'payStatus'
+                          },
+                          render: (h, { row }) => {
+                            return <div>{{ CANCEL: '取消', WAIT: '待支付', PAID: '已支付' }[row.payStatus]}</div>
+                          }
+                        },
+                        {
+                          columnAttributes: {
+                            label: '交易时间',
+                            prop: 'payTime'
+                          }
+                        },
+                        {
+                          columnAttributes: {
+                            label: '创建时间',
+                            prop: 'createTime'
+                          }
+                        }
+                      ]}
+                      table-data={[formData]}
+                    />
+                  )
+                }
+              }
+            ]
+          }
+          return []
+        })()
+      ]
     }
   }
-}
+}

src/views/mallManagement/activityOrder/detail.vue

@@ -9,16 +9,7 @@
       <div class="mymain-container">
         <el-form ref="formData" :rules="rules" :model="formData" label-width="110px" size="small" label-position="left">
           <el-row :gutter="20" justify="start">
-            <el-col :span="6">
-              <el-form-item label="所属商户" :required="true">
-                <el-input
-                  type="text"
-                  :value="formData.companyWechatName ? formData.companyWechatName : companyName"
-                  disabled
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6" style="height: 51px">
+            <el-col :span="12" style="height: 51px">
               <el-form-item label="活动名称" prop="promotionActivityId">
                 <el-select
                   v-model="formData.active"

src/views/mallManagement/invoice/index.vue

@@ -16,9 +16,6 @@
       </template-page>
       <div v-if="~['detail'].indexOf(activeKey)" style="box-sizing: border-box; padding: 16px">
         <el-descriptions border title="" :column="4" :colon="false" labelStyle="width: 8%" contentStyle="width: 17%">
-          <el-descriptions-item label="所属商户">
-            {{ detailData.companyWechatName }}
-          </el-descriptions-item>
           <el-descriptions-item label="状态">
             {{ detailData.status | statusFilter }}
           </el-descriptions-item>

src/views/mallManagement/old_machine/index.vue

@@ -28,19 +28,8 @@
         <el-form ref="formRef" :model="formData" :rules="formRules" label-position="left" label-width="80px">
           <div style="font-weight: 500">客户信息</div>
           <el-divider></el-divider>
-
           <el-row :gutter="20">
-            <el-col :span="6">
-              <el-form-item label="所属商户" prop="companyName">
-                <el-input
-                  v-model="formData.companyName"
-                  autocomplete="off"
-                  placeholder="请输入所属商户"
-                  disabled
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
+            <el-col :span="12">
               <el-form-item label="销售类型" prop="saleType">
                 <el-radio-group v-model="formData.saleType" disabled>
                   <el-radio :label="1">线上销售</el-radio>
@@ -346,9 +335,6 @@
         <el-divider></el-divider>
 
         <el-descriptions border title="" :column="4" :colon="false" labelStyle="width: 8%" contentStyle="width: 17%">
-          <el-descriptions-item label="所属商户">
-            {{ detailData.companyName }}
-          </el-descriptions-item>
           <el-descriptions-item label="销售类型">
             {{ { 1: '线上销售', 2: '线下销售' }[detailData.saleType] }}
           </el-descriptions-item>
@@ -358,6 +344,7 @@
           <el-descriptions-item label="工单类型">
             {{ detailData.orderSmallTypeText }}
           </el-descriptions-item>
+          <el-descriptions-item label=""> </el-descriptions-item>
         </el-descriptions>
         <el-descriptions
           border

src/views/mallManagement/order/offline_order_list/index.vue

@@ -488,16 +488,13 @@
         <div style="font-weight: 500">单据信息</div>
         <el-divider></el-divider>
 
-        <el-descriptions border title="" :column="4" :colon="false" labelStyle="width: 8%" contentStyle="width: 17%">
+        <el-descriptions border title="" :column="2" :colon="false" labelStyle="width: 8%" contentStyle="width: 17%">
           <el-descriptions-item label="审批状态">
             {{ detailData.examineStatus | examineStatusFilter }}
           </el-descriptions-item>
           <el-descriptions-item label="订单单号">
             {{ detailData.orderId }}
           </el-descriptions-item>
-          <el-descriptions-item label="所属商户" contentStyle="width: 42%">
-            {{ detailData.companyWechatName }}
-          </el-descriptions-item>
         </el-descriptions>
         <el-descriptions
           border

src/views/mallManagement/order/sales_return_order_list/index.vue

@@ -30,19 +30,8 @@
         <el-form ref="formRef" :model="formData" :rules="formRules" label-position="left" label-width="90px">
           <div style="font-weight: 500">单据信息</div>
           <el-divider></el-divider>
-
           <el-row :gutter="20">
-            <el-col :span="6">
-              <el-form-item label="所属商户" prop="companyWechatName">
-                <el-input
-                  v-model="formData.companyWechatName"
-                  autocomplete="off"
-                  placeholder="请输入所属商户"
-                  disabled
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
+            <el-col :span="12">
               <el-form-item label="发货单号" prop="deliveryId">
                 <div style="display: flex; align-items: center">
                   <el-input v-model="formData.deliveryId" autocomplete="off" placeholder="请选择" disabled></el-input>
@@ -338,15 +327,13 @@
         <el-divider></el-divider>
 
         <el-descriptions border title="" :column="3" :colon="false" labelStyle="width: 8%" contentStyle="width: 17%">
-          <el-descriptions-item label="所属商户">
-            {{ detailData.companyWechatName }}
-          </el-descriptions-item>
           <el-descriptions-item label="订单单号">
             {{ detailData.orderId }}
           </el-descriptions-item>
           <el-descriptions-item label="销售类型">
             {{ detailData.orderInfo.saleType | saleTypeFilter }}
           </el-descriptions-item>
+          <el-descriptions-item label=""> </el-descriptions-item>
         </el-descriptions>
         <el-descriptions
           border

src/views/mallManagement/secondHandMall/classifiedManagement/index.vue

@@ -34,7 +34,6 @@
             default-expand-all
             :tree-props="{ children: 'children' }"
           >
-            <el-table-column align="center" prop="companyName" label="所属商户" min-width="120"></el-table-column>
             <el-table-column prop="name" label="分类名称" min-width="150"></el-table-column>
             <el-table-column align="center" label="分类图片" prop="imgUrl" width="80">
               <template slot-scope="scope">

src/views/mallManagement/setActivity/index.vue

@@ -139,12 +139,6 @@ export default {
     formItems() {
       return [
         {
-          name: 'el-input',
-          md: 12,
-          attributes: { disabled: true, placeholder: '请选择' },
-          formItemAttributes: { label: '所属商户', prop: 'companyWechatName' }
-        },
-        {
           name: 'el-date-picker',
           md: 6,
           attributes: {

src/views/mallManagement/settleManagElecpay/index.vue

@@ -29,9 +29,6 @@
                 <span>基础信息</span>
               </div>
               <el-descriptions :column="4" border>
-                <el-descriptions-item labelStyle="width:110px" label="所属商户">{{
-                  formData.companyWechatName
-                }}</el-descriptions-item>
                 <el-descriptions-item labelStyle="width:110px" label="网点名称">{{
                   formData.websitName
                 }}</el-descriptions-item>

src/views/salesPurchasing/commercialMaterial/index.vue

@@ -1,21 +1,33 @@
 <template>
   <zj-tab-page ref="tabPage" :defaultActives="[{ key: 'list', label: $route.meta.title + '-列表', essential: true }]">
     <template slot-scope="{ activeKey, data }">
-      <div :style="{
-        width: '100%',
-        height: activeKey == 'list' ? '100%' : '0px',
-        overflow: 'hidden'
-      }">
-        <template-page ref="pageRef" :get-list="getList" :table-attributes="tableAttributes" :table-events="tableEvents"
-          :options-evens-group="optionsEvensGroup" :moreParameters="moreParameters" :column-parsing="columnParsing"
-          :exportList="exportList" :operation="operation()">
+      <div
+        :style="{
+          width: '100%',
+          height: activeKey == 'list' ? '100%' : '0px',
+          overflow: 'hidden'
+        }"
+      >
+        <template-page
+          ref="pageRef"
+          :get-list="getList"
+          :table-attributes="tableAttributes"
+          :table-events="tableEvents"
+          :options-evens-group="optionsEvensGroup"
+          :moreParameters="moreParameters"
+          :column-parsing="columnParsing"
+          :exportList="exportList"
+          :operation="operation()"
+        >
         </template-page>
       </div>
       <div v-if="~['add', 'edit'].indexOf(activeKey)" style="box-sizing: border-box; padding: 16px">
         <zj-form-container ref="formRef" :form-data="formData" :form-attributes="{ size: 'mini' }">
           <zj-form-module title="" label-width="100px" :form-data="formData" :form-items="formItems">
-            <div slot="internal-bottom"
-              style="text-align: right; margin-bottom: 20px; box-sizing: border-box; padding-right: 10px">
+            <div
+              slot="internal-bottom"
+              style="text-align: right; margin-bottom: 20px; box-sizing: border-box; padding-right: 10px"
+            >
               <el-button size="mini" @click="data.removeTab()">取消</el-button>
               <el-button size="mini" type="primary" @click="queding(data.removeTab)">确定</el-button>
             </div>
@@ -70,7 +82,7 @@ export default {
         unit: '',
         isVirtyual: '',
         remark: '',
-        factoryNo: "",
+        factoryNo: '',
         items: []
       },
       isEditIndex: -1,
@@ -121,16 +133,6 @@ export default {
     formItems() {
       return [
         {
-          name: 'slot-component',
-          md: 12,
-          formItemAttributes: {
-            label: '所属商户'
-          },
-          render: (h, { props }) => {
-            return <el-input disabled={true} value={JSON.parse(localStorage.getItem('greemall_user')).companyName} />
-          }
-        },
-        {
           name: 'el-select',
           md: 6,
           options: this.brandList,
@@ -640,15 +642,15 @@ export default {
         },
         qiyjiny: {
           name: ({ row, index, column }) => {
-            return row.state == "ON" ? "禁用" : "启用"
+            return row.state == 'ON' ? '禁用' : '启用'
           },
           prompt: ({ row, index, column }) => {
-            return `是否${row.state == "ON" ? "禁用" : "启用"}?`
+            return `是否${row.state == 'ON' ? '禁用' : '启用'}?`
           },
           click: ({ row, index, column }) => {
             goodsMaterialBatchUpdateStatus({
               ids: row.id,
-              stateEnum: row.state == "ON" ? "OFF" : "ON"
+              stateEnum: row.state == 'ON' ? 'OFF' : 'ON'
             }).then(res => {
               this.$message({
                 type: 'success',
@@ -657,7 +659,7 @@ export default {
               this.$refs.pageRef.refreshList()
             })
           }
-        },
+        }
       })
     },
     openForm() {

src/views/salesPurchasing/mixins/common_form.js

@@ -7,7 +7,7 @@ export default {
   data() {
     return {
       gysList: [],
-	  warehouseList: [],
+      warehouseList: [],
       cgrkOrder: []
     }
   },
@@ -30,7 +30,7 @@ export default {
                 <el-descriptions
                   border
                   title=""
-                  column={4}
+                  column={2}
                   colon={false}
                   labelStyle={{ width: '8%' }}
                   contentStyle={{ width: '17%' }}
@@ -39,9 +39,6 @@ export default {
                     {{ SAVE: '保存', WAIT: '待审核', OK: '通过', FAIL: '失败' }[this.formData.status] || ''}
                   </el-descriptions-item>
                   <el-descriptions-item label="单据编号">{this.formData.id || ''}</el-descriptions-item>
-                  <el-descriptions-item label="所属商户" contentStyle={{ width: '42%' }}>
-                    {JSON.parse(localStorage.getItem('greemall_user')).companyName}
-                  </el-descriptions-item>
                 </el-descriptions>
                 <el-descriptions
                   border
@@ -54,13 +51,20 @@ export default {
                 >
                   <el-descriptions-item label="*供应商名称">
                     <div class="redbordererr">
-                      <el-form-item label="" lebel-width="0px" prop={`venderId`} rules={[diyRequired.bind(this)((rule, value)=>{
-                        if(this.logs){
-                          this.logs.push({errMsg:`*供应商名称不能为空`})
-                        }
-                        this?.tishicuowu?.()
-                        return new Error('必须填写')
-                      })]}>
+                      <el-form-item
+                        label=""
+                        lebel-width="0px"
+                        prop={`venderId`}
+                        rules={[
+                          diyRequired.bind(this)((rule, value) => {
+                            if (this.logs) {
+                              this.logs.push({ errMsg: `*供应商名称不能为空` })
+                            }
+                            this?.tishicuowu?.()
+                            return new Error('必须填写')
+                          })
+                        ]}
+                      >
                         <el-select
                           style="width:100%"
                           value={this.formData.venderId}
@@ -90,42 +94,60 @@ export default {
                       </el-form-item>
                     </div>
                   </el-descriptions-item>
-					<el-descriptions-item label={(JSON.parse(localStorage.getItem('greemall_user')).joinCode === "NO"?'':'*') + (!!~['merchandisePurchaseReturn'].indexOf(this?.$route?.name) ?'出库仓库':'入库仓库')}>
-					<div class="redbordererr">
-						<el-form-item label="" lebel-width="0px" prop={`storageId`}>
-						<el-select
-							style="width:100%"
-							value={this.formData.storageId}
-							onInput={val => {
-							this.formData.storageId = val
-							}}
-							placeholder="请选择"
-							disabled={!!~['WAIT', 'OK', 'FAIL'].indexOf(this.formData.status) || !!~['merchandisePurchaseReturn'].indexOf(this?.$route?.name) || JSON.parse(localStorage.getItem('greemall_user')).joinCode === "NO"}
-							onChange={val => {
-								if (val) {
-									this.formData['storageName'] = this.warehouseList.find(item => item.storageId == val).storageName
-								} else {
-									this.formData['storageName'] = ''
-								}
-							}}
-						>
-							{this.warehouseList.map(item => (
-							<el-option key={item.storageId} label={item.storageName} value={item.storageId}></el-option>
-							))}
-						</el-select>
-						</el-form-item>
-					</div>
-					</el-descriptions-item>
+                  <el-descriptions-item
+                    label={
+                      (JSON.parse(localStorage.getItem('greemall_user')).joinCode === 'NO' ? '' : '*') +
+                      (!!~['merchandisePurchaseReturn'].indexOf(this?.$route?.name) ? '出库仓库' : '入库仓库')
+                    }
+                  >
+                    <div class="redbordererr">
+                      <el-form-item label="" lebel-width="0px" prop={`storageId`}>
+                        <el-select
+                          style="width:100%"
+                          value={this.formData.storageId}
+                          onInput={val => {
+                            this.formData.storageId = val
+                          }}
+                          placeholder="请选择"
+                          disabled={
+                            !!~['WAIT', 'OK', 'FAIL'].indexOf(this.formData.status) ||
+                            !!~['merchandisePurchaseReturn'].indexOf(this?.$route?.name) ||
+                            JSON.parse(localStorage.getItem('greemall_user')).joinCode === 'NO'
+                          }
+                          onChange={val => {
+                            if (val) {
+                              this.formData['storageName'] = this.warehouseList.find(
+                                item => item.storageId == val
+                              ).storageName
+                            } else {
+                              this.formData['storageName'] = ''
+                            }
+                          }}
+                        >
+                          {this.warehouseList.map(item => (
+                            <el-option key={item.storageId} label={item.storageName} value={item.storageId}></el-option>
+                          ))}
+                        </el-select>
+                      </el-form-item>
+                    </div>
+                  </el-descriptions-item>
                   {!!~['merchandisePurchaseReturn'].indexOf(this?.$route?.name) ? (
                     <el-descriptions-item label="*采购入库单">
                       <div class="redbordererr">
-                        <el-form-item label="" lebel-width="0px" prop={`goodsPurchaseId`} rules={[diyRequired.bind(this)((rule, value)=>{
-                          if(this.logs){
-                            this.logs.push({errMsg:`*采购入库单不能为空`})
-                          }
-                          this?.tishicuowu?.()
-                          return new Error('必须填写')
-                        })]}>
+                        <el-form-item
+                          label=""
+                          lebel-width="0px"
+                          prop={`goodsPurchaseId`}
+                          rules={[
+                            diyRequired.bind(this)((rule, value) => {
+                              if (this.logs) {
+                                this.logs.push({ errMsg: `*采购入库单不能为空` })
+                              }
+                              this?.tishicuowu?.()
+                              return new Error('必须填写')
+                            })
+                          ]}
+                        >
                           <el-select
                             style="width:100%"
                             value={this.formData.goodsPurchaseId}
@@ -140,10 +162,10 @@ export default {
                               this.formData.items = []
                               if (val) {
                                 goodsPurchaseDetail({ id: val, isQuery: true }).then(res => {
-                                  this.joinCode = res.data.joinCode === "CODE"
-								  this.formData.storageId = res.data.storageId
-								  this.formData.storageName = res.data.storageName
-								  this.getWarehouseList(1)
+                                  this.joinCode = res.data.joinCode === 'CODE'
+                                  this.formData.storageId = res.data.storageId
+                                  this.formData.storageName = res.data.storageName
+                                  this.getWarehouseList(1)
                                   this.formData.items = res.data.items.map(item => ({
                                     brandId: item.brandId,
                                     brandName: item.brandName,
@@ -180,8 +202,9 @@ export default {
                             {this.cgrkOrder.map(item => (
                               <el-option
                                 key={item.id}
-                                label={`${item.id} | 销售金额:${item.totalAmount || '-'} | 入库时间:${item.examineTime || '-'
-                                  }`}
+                                label={`${item.id} | 销售金额:${item.totalAmount || '-'} | 入库时间:${
+                                  item.examineTime || '-'
+                                }`}
                                 value={item.id}
                               ></el-option>
                             ))}
@@ -204,11 +227,11 @@ export default {
                 >
                   {!!~['merchandisePurchaseReturn'].indexOf(this?.$route?.name)
                     ? [
-                      <el-descriptions-item label="退货数量">{this.formData.totalQty}</el-descriptions-item>,
-                      <el-descriptions-item label="退款金额">{this.formData.totalAmount}</el-descriptions-item>,
-                      <el-descriptions-item label=""></el-descriptions-item>,
-                      <el-descriptions-item label=""></el-descriptions-item>
-                    ]
+                        <el-descriptions-item label="退货数量">{this.formData.totalQty}</el-descriptions-item>,
+                        <el-descriptions-item label="退款金额">{this.formData.totalAmount}</el-descriptions-item>,
+                        <el-descriptions-item label=""></el-descriptions-item>,
+                        <el-descriptions-item label=""></el-descriptions-item>
+                      ]
                     : null}
                   <el-descriptions-item label="制单人">{this.formData.createBy}</el-descriptions-item>
                   <el-descriptions-item label="制单时间">{this.formData.createTime}</el-descriptions-item>
@@ -286,30 +309,33 @@ export default {
           pageSize: -1,
           params: [
             { param: 'a.vender_id', compare: '=', value: this.formData.venderId },
-            { "param": "a.status", "compare": "=", "value": "OK" }
+            { param: 'a.status', compare: '=', value: 'OK' }
           ]
         }).then(res => {
           this.cgrkOrder = res.data.records
           if (this.formData.goodsPurchaseId) {
             goodsPurchaseDetail({ id: this.formData.goodsPurchaseId, isQuery: true }).then(res => {
-              this.joinCode = res.data.joinCode === "CODE"
+              this.joinCode = res.data.joinCode === 'CODE'
             })
           }
         })
       }
     },
-	getWarehouseList(type){
-		storageListPageV2({
-          pageNum: 1,
-          pageSize: -1,
-          params: [{param: "a.type", compare: "like", value: "商品"},{param: "a.status", compare: "=", value: "true"}]
-        }).then(res => {
-			if(JSON.parse(localStorage.getItem('greemall_user')).joinCode != "NO" && !this.formData.storageId && type){
-				this.formData.storageId = res.data.records[0].storageId
-				this.formData.storageName = res.data.records[0].storageName
-			}
-          this.warehouseList = res.data.records
-        })
-	}
+    getWarehouseList(type) {
+      storageListPageV2({
+        pageNum: 1,
+        pageSize: -1,
+        params: [
+          { param: 'a.type', compare: 'like', value: '商品' },
+          { param: 'a.status', compare: '=', value: 'true' }
+        ]
+      }).then(res => {
+        if (JSON.parse(localStorage.getItem('greemall_user')).joinCode != 'NO' && !this.formData.storageId && type) {
+          this.formData.storageId = res.data.records[0].storageId
+          this.formData.storageName = res.data.records[0].storageName
+        }
+        this.warehouseList = res.data.records
+      })
+    }
   }
 }

src/views/setting/dataDictionary/index.vue

@@ -153,17 +153,6 @@ export default {
           name: 'el-input',
           attributes: { placeholder: '请输入', disabled: true },
           formItemAttributes: {
-            label: '所属商户',
-            prop: 'companyName',
-            rules: [...required]
-          }
-        },
-        {
-          md: 24,
-          isShow: true,
-          name: 'el-input',
-          attributes: { placeholder: '请输入', disabled: true },
-          formItemAttributes: {
             label: '类型名称',
             prop: 'dictTypeName',
             rules: [...required]

src/views/setting/organizationManagement/paymentMerchantManagement/index.vue

@@ -112,19 +112,6 @@ export default {
           name: 'el-input',
           md: 6,
           attributes: {
-            disabled: true,
-            placeholder: '请输入'
-          },
-          formItemAttributes: {
-            label: '所属商户',
-            prop: 'companyName',
-            rules: []
-          }
-        },
-        {
-          name: 'el-input',
-          md: 6,
-          attributes: {
             disabled: !!this.formDialogType,
             placeholder: '请输入'
           },

src/views/userManagement/distributorManagement/index.vue

@@ -269,17 +269,6 @@ export default {
           }
         },
         {
-          md: 12,
-          isShow: true,
-          name: 'el-input',
-          attributes: { placeholder: '请输入', disabled: true },
-          formItemAttributes: {
-            label: '所属商户',
-            prop: 'companyName',
-            rules: []
-          }
-        },
-        {
           md: 24,
           isShow: true,
           name: 'el-input',

src/views/userManagement/masterManagement/index.vue

@@ -236,21 +236,7 @@ export default {
           render: (h, { props, onInput }) => {
             var { value } = props
             console.log(this.formData.idCardImg)
-            return (
-              <ImageUpload fileList={this.formData.idCardImg} limit={1} isEdit={true} />
-              // this.formData.idCardImg ? <el-image src={this.formData.idCardImg} style='width: 120px;height:120px' preview-src-list={[this.formData.idCardImg]} fit="cover"></el-image> : ''
-            )
-          }
-        },
-        {
-          md: 12,
-          isShow: true,
-          name: 'el-input',
-          attributes: { placeholder: '请输入', disabled: true },
-          formItemAttributes: {
-            label: '所属商户',
-            prop: 'companyName',
-            rules: []
+            return <ImageUpload fileList={this.formData.idCardImg} limit={1} isEdit={true} />
           }
         },
         {

src/views/valueAddedService/orderSettleManag/mixins/formItems.js

@@ -3,242 +3,218 @@ export default {
   components: { ImageUpload },
   computed: {
     formItems() {
-      return [{
-        md: 24,
-        isShow: true,
-        name: 'slot-component',
-        formItemAttributes: {
-          label: '',
-          prop: '',
-          'label-width': '0px'
-        },
-        render: (h, { props, onInput }) => {
-          var { formData } = props
-          return (
-            <div>
-              <el-descriptions border title="" column={4} colon={false} labelStyle={{ width: '8%' }} contentStyle={{ width: '17%' }}>
-                <el-descriptions-item label="所属商户">
-                  {formData.companyWechatName}
-                </el-descriptions-item>
-                <el-descriptions-item label="销售网点">
-                  {formData.websitName}
-                </el-descriptions-item>
-                <el-descriptions-item label="订单单号" >
-                  {formData.id}
-                </el-descriptions-item>
-                <el-descriptions-item label="师傅姓名" >
-                  {formData.workerName}
-                </el-descriptions-item>
-                <el-descriptions-item label="师傅联系电话">
-                  {formData.workerMobile}
-                </el-descriptions-item>
-                <el-descriptions-item label="师傅身份证号">
-                  {formData.workerIdcard}
-                </el-descriptions-item>
-                <el-descriptions-item label="客户姓名" >
-                  {formData.userName}
-                </el-descriptions-item>
-                <el-descriptions-item label="客户电话" >
-                  {formData.userMobile}
-                </el-descriptions-item>
-                <el-descriptions-item label="详细地址">
-                  {formData.userAddress}
-                </el-descriptions-item>
-                <el-descriptions-item label="内机条码">
-                  {formData.insideCode}
-                </el-descriptions-item>
-                <el-descriptions-item label="服务单号" >
-                  {formData.serviceNo}
-                </el-descriptions-item>
-                <el-descriptions-item label="发票价格" >
-                  {formData.invoiceAmount}
-                </el-descriptions-item>
-                <el-descriptions-item label="发票时间">
-                  {formData.invoiceTime}
-                </el-descriptions-item>
-                <el-descriptions-item label="服务截止时间">
-                  {formData.serviceEndTime}
-                </el-descriptions-item>
-                <el-descriptions-item label="创建人" >
-                  {formData.createBy}
-                </el-descriptions-item>
-                <el-descriptions-item label="创建时间" >
-                  {formData.createTime}
-                </el-descriptions-item>
-                <el-descriptions-item label="支付状态">
-                  {({ "EXPIRE": "过期", "CANCEL": "取消", "PAID": "已支付", "WAIT": "待支付", "REFUND": "已退款" })[formData.payStatus] || ""}
-                </el-descriptions-item>
-                <el-descriptions-item label="支付方式">
-                  {({ 1: "微信支付", 2: "代客支付", 3: "现金支付" })[formData.payType] || ""}
-                </el-descriptions-item>
-                <el-descriptions-item label="支付订单号" >
-                  {formData.payNo}
-                </el-descriptions-item>
-                <el-descriptions-item label="支付时间" >
-                  {formData.payTime}
-                </el-descriptions-item>
-                <el-descriptions-item label="微信流水号">
-                  {formData.transcationId}
-                </el-descriptions-item>
-                <el-descriptions-item label="师傅销售佣金">
-                  {formData.workerAmount}
-                </el-descriptions-item>
-                <el-descriptions-item label="结算人员" >
-                  {formData.updateBy}
-                </el-descriptions-item>
-                <el-descriptions-item label="操作时间" >
-                  {formData.updateTime}
-                </el-descriptions-item>
-                {this.addFormData ? [
-                  <el-descriptions-item label="审批人" >
-                    {formData.examineBy}
-                  </el-descriptions-item>,
-                  <el-descriptions-item label="审批状态" >
-                    {({ WAIT: "待审核", OK: "通过", FAIL: "失败" })[formData.flag]}
-                  </el-descriptions-item>,
-                  <el-descriptions-item label="审批时间" >
-                    {formData.examineTime}
-                  </el-descriptions-item>,
-                  <el-descriptions-item label="" >
-                  </el-descriptions-item>,
-                ] : null}
-              </el-descriptions>
-              <el-descriptions border title="" column={1} colon={false} labelStyle={{ width: '8%' }} contentStyle={{ width: '92%' }}>
-                <el-descriptions-item label="订单备注">
-                  {formData.remark}
-                </el-descriptions-item>
-                <el-descriptions-item label="审批备注">
-                  {formData.examineRemark}
-                </el-descriptions-item>
-              </el-descriptions>
-            </div>
-          )
+      return [
+        {
+          md: 24,
+          isShow: true,
+          name: 'slot-component',
+          formItemAttributes: {
+            label: '',
+            prop: '',
+            'label-width': '0px'
+          },
+          render: (h, { props, onInput }) => {
+            var { formData } = props
+            return (
+              <div>
+                <el-descriptions
+                  border
+                  title=""
+                  column={4}
+                  colon={false}
+                  labelStyle={{ width: '8%' }}
+                  contentStyle={{ width: '17%' }}
+                >
+                  <el-descriptions-item label="销售网点">{formData.websitName}</el-descriptions-item>
+                  <el-descriptions-item label="订单单号">{formData.id}</el-descriptions-item>
+                  <el-descriptions-item label="师傅姓名">{formData.workerName}</el-descriptions-item>
+                  <el-descriptions-item label="师傅联系电话">{formData.workerMobile}</el-descriptions-item>
+                  <el-descriptions-item label="师傅身份证号">{formData.workerIdcard}</el-descriptions-item>
+                  <el-descriptions-item label="客户姓名">{formData.userName}</el-descriptions-item>
+                  <el-descriptions-item label="客户电话">{formData.userMobile}</el-descriptions-item>
+                  <el-descriptions-item label="详细地址">{formData.userAddress}</el-descriptions-item>
+                  <el-descriptions-item label="内机条码">{formData.insideCode}</el-descriptions-item>
+                  <el-descriptions-item label="服务单号">{formData.serviceNo}</el-descriptions-item>
+                  <el-descriptions-item label="发票价格">{formData.invoiceAmount}</el-descriptions-item>
+                  <el-descriptions-item label="发票时间">{formData.invoiceTime}</el-descriptions-item>
+                  <el-descriptions-item label="服务截止时间">{formData.serviceEndTime}</el-descriptions-item>
+                  <el-descriptions-item label="创建人">{formData.createBy}</el-descriptions-item>
+                  <el-descriptions-item label="创建时间">{formData.createTime}</el-descriptions-item>
+                  <el-descriptions-item label="支付状态">
+                    {{ EXPIRE: '过期', CANCEL: '取消', PAID: '已支付', WAIT: '待支付', REFUND: '已退款' }[
+                      formData.payStatus
+                    ] || ''}
+                  </el-descriptions-item>
+                  <el-descriptions-item label="支付方式">
+                    {{ 1: '微信支付', 2: '代客支付', 3: '现金支付' }[formData.payType] || ''}
+                  </el-descriptions-item>
+                  <el-descriptions-item label="支付订单号">{formData.payNo}</el-descriptions-item>
+                  <el-descriptions-item label="支付时间">{formData.payTime}</el-descriptions-item>
+                  <el-descriptions-item label="微信流水号">{formData.transcationId}</el-descriptions-item>
+                  <el-descriptions-item label="师傅销售佣金">{formData.workerAmount}</el-descriptions-item>
+                  <el-descriptions-item label="结算人员">{formData.updateBy}</el-descriptions-item>
+                  <el-descriptions-item label="操作时间">{formData.updateTime}</el-descriptions-item>
+                  {this.addFormData
+                    ? [
+                        <el-descriptions-item label="审批人">{formData.examineBy}</el-descriptions-item>,
+                        <el-descriptions-item label="审批状态">
+                          {{ WAIT: '待审核', OK: '通过', FAIL: '失败' }[formData.flag]}
+                        </el-descriptions-item>,
+                        <el-descriptions-item label="审批时间">{formData.examineTime}</el-descriptions-item>,
+                        <el-descriptions-item label=""></el-descriptions-item>
+                      ]
+                    : null}
+                </el-descriptions>
+                <el-descriptions
+                  border
+                  title=""
+                  column={1}
+                  colon={false}
+                  labelStyle={{ width: '8%' }}
+                  contentStyle={{ width: '92%' }}
+                >
+                  <el-descriptions-item label="订单备注">{formData.remark}</el-descriptions-item>
+                  <el-descriptions-item label="审批备注">{formData.examineRemark}</el-descriptions-item>
+                </el-descriptions>
+              </div>
+            )
+          }
         }
-      }]
+      ]
     },
     formItemsList() {
-      return [{
-        md: 24,
-        isShow: true,
-        name: 'slot-component',
-        formItemAttributes: {
-          label: '',
-          prop: '',
-          'label-width': '0px'
-        },
-        render: (h, { props, onInput }) => {
-          var { formData } = props
-          return (
-            <zj-table
-              columns={[{
-                columnAttributes: {
-                  label: '服务类型',
-                  prop: 'type'
-                },
-                render: (h, { row, column, index }) => {
-                  return <div style="padding: 0 10px">
-                    {({ 1: "延保", 2: "清洗" })[row.type] || ""}
-                  </div>
-                }
-              },
-              {
-                columnAttributes: {
-                  label: '使用类型',
-                  prop: 'usedType'
-                },
-                render: (h, { row, column, index }) => {
-                  return <div style="padding: 0 10px">
-                    {({ COUNT: "使用次数", YEAR: "使用年限" })[row.usedType] || ""}
-                  </div>
-                }
-              }, {
-                columnAttributes: {
-                  label: '品牌',
-                  prop: 'brandName'
-                }
-              },
-              {
-                columnAttributes: {
-                  label: '产品大类',
-                  prop: 'mainName'
-                }
-              },
-              {
-                columnAttributes: {
-                  label: '服务内容',
-                  prop: 'content'
-                }
-              },
-              {
-                columnAttributes: {
-                  label: '服务金额（元）',
-                  prop: 'amount'
-                }
-              },
-              {
-                columnAttributes: {
-                  label: '使用限值',
-                  prop: 'limitNum'
-                }
-              },
-              {
-                columnAttributes: {
-                  label: '总手续费',
-                  prop: 'commissionAmount'
-                }
-              },
-              {
-                columnAttributes: {
-                  label: '师傅分成金额',
-                  prop: 'workerAmount'
-                }
-              },
-              {
-                columnAttributes: {
-                  label: '网点分成金额',
-                  prop: 'websitAmount'
-                }
-              }]}
-              tableData={[{
-                ...(formData.increItem || {}),
-                ...(formData.incre || {}),
-                workerAmount: formData.workerAmount,
-                websitAmount: formData.websitAmount,
-                commissionAmount: formData.commissionAmount
-              }]}
-              tableAttributes={{
-                size: 'mini',
-                border: true,
-              }} />
-          )
+      return [
+        {
+          md: 24,
+          isShow: true,
+          name: 'slot-component',
+          formItemAttributes: {
+            label: '',
+            prop: '',
+            'label-width': '0px'
+          },
+          render: (h, { props, onInput }) => {
+            var { formData } = props
+            return (
+              <zj-table
+                columns={[
+                  {
+                    columnAttributes: {
+                      label: '服务类型',
+                      prop: 'type'
+                    },
+                    render: (h, { row, column, index }) => {
+                      return <div style="padding: 0 10px">{{ 1: '延保', 2: '清洗' }[row.type] || ''}</div>
+                    }
+                  },
+                  {
+                    columnAttributes: {
+                      label: '使用类型',
+                      prop: 'usedType'
+                    },
+                    render: (h, { row, column, index }) => {
+                      return (
+                        <div style="padding: 0 10px">{{ COUNT: '使用次数', YEAR: '使用年限' }[row.usedType] || ''}</div>
+                      )
+                    }
+                  },
+                  {
+                    columnAttributes: {
+                      label: '品牌',
+                      prop: 'brandName'
+                    }
+                  },
+                  {
+                    columnAttributes: {
+                      label: '产品大类',
+                      prop: 'mainName'
+                    }
+                  },
+                  {
+                    columnAttributes: {
+                      label: '服务内容',
+                      prop: 'content'
+                    }
+                  },
+                  {
+                    columnAttributes: {
+                      label: '服务金额（元）',
+                      prop: 'amount'
+                    }
+                  },
+                  {
+                    columnAttributes: {
+                      label: '使用限值',
+                      prop: 'limitNum'
+                    }
+                  },
+                  {
+                    columnAttributes: {
+                      label: '总手续费',
+                      prop: 'commissionAmount'
+                    }
+                  },
+                  {
+                    columnAttributes: {
+                      label: '师傅分成金额',
+                      prop: 'workerAmount'
+                    }
+                  },
+                  {
+                    columnAttributes: {
+                      label: '网点分成金额',
+                      prop: 'websitAmount'
+                    }
+                  }
+                ]}
+                tableData={[
+                  {
+                    ...(formData.increItem || {}),
+                    ...(formData.incre || {}),
+                    workerAmount: formData.workerAmount,
+                    websitAmount: formData.websitAmount,
+                    commissionAmount: formData.commissionAmount
+                  }
+                ]}
+                tableAttributes={{
+                  size: 'mini',
+                  border: true
+                }}
+              />
+            )
+          }
         }
-      }]
+      ]
     },
     formItemsImgs() {
-      return [{
-        md: 24,
-        name: 'slot-component',
-        formItemAttributes: {
-          label: '',
-          prop: '',
-          'label-width': '0px'
-        },
-        render: (h, { props, onInput }) => {
-          var { formData } = props
-          return (
-            <ImageUpload
-              fileList={
-                [{ key: "insideCodeImg", name: "内机条码" }, { key: "machineImg", name: "机器铭牌图片" }, { key: "buyCertImg", name: "购机凭证图片" }].map((item) => ({ url: formData[item.key], name: item.name }))
-              }
-              limit={1000}
-              isEdit={false}
-              viewOnline={false}
-              download={false}
-              showName={true}
-            />
-          )
+      return [
+        {
+          md: 24,
+          name: 'slot-component',
+          formItemAttributes: {
+            label: '',
+            prop: '',
+            'label-width': '0px'
+          },
+          render: (h, { props, onInput }) => {
+            var { formData } = props
+            return (
+              <ImageUpload
+                fileList={[
+                  { key: 'insideCodeImg', name: '内机条码' },
+                  { key: 'machineImg', name: '机器铭牌图片' },
+                  { key: 'buyCertImg', name: '购机凭证图片' }
+                ].map(item => ({ url: formData[item.key], name: item.name }))}
+                limit={1000}
+                isEdit={false}
+                viewOnline={false}
+                download={false}
+                showName={true}
+              />
+            )
+          }
         }
-      }]
-    },
-  },
-}
+      ]
+    }
+  }
+}

src/views/valueAddedService/valueAddedConfig/index.vue

@@ -1,12 +1,26 @@
 <template>
-  <template-page ref="pageRef" :get-list="getList" :exportList="exportList" :table-attributes="tableAttributes"
-    :table-events="tableEvents" :options-evens-group="optionsEvensGroup" :moreParameters="moreParameters"
-    :column-parsing="columnParsing" :operation="operation()" :replaceOrNotMap="false">
+  <template-page
+    ref="pageRef"
+    :get-list="getList"
+    :exportList="exportList"
+    :table-attributes="tableAttributes"
+    :table-events="tableEvents"
+    :options-evens-group="optionsEvensGroup"
+    :moreParameters="moreParameters"
+    :column-parsing="columnParsing"
+    :operation="operation()"
+    :replaceOrNotMap="false"
+  >
     <div class="cartographer">
       <el-dialog title="增值服务配置" 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-container>
         <div slot="footer" class="dialog-footer">
@@ -21,17 +35,24 @@
 <script>
 import TemplatePage from '@/components/template/template-page-1.vue'
 import import_mixin from '@/components/template/import_mixin.js'
-import { increConfigList, increConfigListExport, increConfigDetail, increConfigAdd, increConfigUpdate, increConfigUpOrDown } from "@/api/valueAddedConfig.js"
+import {
+  increConfigList,
+  increConfigListExport,
+  increConfigDetail,
+  increConfigAdd,
+  increConfigUpdate,
+  increConfigUpOrDown
+} from '@/api/valueAddedConfig.js'
 import { required, mobileRequired, mobile, httpUrl, email } from '@/components/template/rules_verify.js'
 import { getClassifyList } from '@/api/goods'
 import { getDataDictionary } from '@/api/dataDictionary.js'
 import operation_mixin from '@/components/template/operation_mixin.js'
-import { getWebsit } from "@/api/customerManagement.js"
+import { getWebsit } from '@/api/customerManagement.js'
 export default {
   props: {
     storageType: {
       type: String,
-      default: ""
+      default: ''
     }
   },
   components: { TemplatePage },
@@ -50,14 +71,14 @@ export default {
       // 勾选选中数据
       recordSelected: [],
       formData: {
-        "companyWechatId": "",
-        "companyWechatName": "",
-        "intro": "",
-        "reason": "",
-        "remark": "",
-        "status": true,
-        "type": "",
-        "usedType": "",
+        companyWechatId: '',
+        companyWechatName: '',
+        intro: '',
+        reason: '',
+        remark: '',
+        status: true,
+        type: '',
+        usedType: '',
         pgIncreItems: [],
         pgIncreWebsits: []
       },
@@ -77,12 +98,12 @@ export default {
       return [
         [
           [
-            this.optionsEvensAuth("add", {
+            this.optionsEvensAuth('add', {
               click: () => {
                 this.openForm()
               }
             })
-          ],
+          ]
         ]
       ]
     },
@@ -98,24 +119,38 @@ export default {
             prop: 'brandId'
           },
           render: (h, { row, column, index }) => {
-            return this.isEditIndex == index ? <div class="redbordererr">
-              <el-form-item label="" label-width="0px" prop={`pgIncreItems.${index}.${column.columnAttributes.prop}`} rules={required}>
-                <el-select
-                  value={row[column.columnAttributes.prop]}
-                  onInput={(val) => { row[column.columnAttributes.prop] = val }}
-                  onChange={(val) => {
-                    if (val) {
-                      var data = this.orderBrands.find(item => item.value == val)
-                      row.brandName = data.label
-                    } else {
-                      row.brandName = ""
-                    }
-                  }}
-                  placeholder="请选择">
-                  {this.orderBrands.map((item, index_) => <el-option key={index_} label={item.label} value={item.value}></el-option>)}
-                </el-select>
-              </el-form-item>
-            </div> : <div style="padding-left:10px">{row.brandName}</div>
+            return this.isEditIndex == index ? (
+              <div class="redbordererr">
+                <el-form-item
+                  label=""
+                  label-width="0px"
+                  prop={`pgIncreItems.${index}.${column.columnAttributes.prop}`}
+                  rules={required}
+                >
+                  <el-select
+                    value={row[column.columnAttributes.prop]}
+                    onInput={val => {
+                      row[column.columnAttributes.prop] = val
+                    }}
+                    onChange={val => {
+                      if (val) {
+                        var data = this.orderBrands.find(item => item.value == val)
+                        row.brandName = data.label
+                      } else {
+                        row.brandName = ''
+                      }
+                    }}
+                    placeholder="请选择"
+                  >
+                    {this.orderBrands.map((item, index_) => (
+                      <el-option key={index_} label={item.label} value={item.value}></el-option>
+                    ))}
+                  </el-select>
+                </el-form-item>
+              </div>
+            ) : (
+              <div style="padding-left:10px">{row.brandName}</div>
+            )
           }
         },
         {
@@ -124,24 +159,38 @@ export default {
             prop: 'mainId'
           },
           render: (h, { row, column, index }) => {
-            return this.isEditIndex == index ? <div class="redbordererr">
-              <el-form-item label="" label-width="0px" prop={`pgIncreItems.${index}.${column.columnAttributes.prop}`} rules={required}>
-                <el-select
-                  value={row[column.columnAttributes.prop]}
-                  onInput={(val) => { row[column.columnAttributes.prop] = val }}
-                  onChange={(val) => {
-                    if (val) {
-                      var data = this.classifyList.find(item => item.categoryId == val)
-                      row.mainName = data.name
-                    } else {
-                      row.mainName = ""
-                    }
-                  }}
-                  placeholder="请选择">
-                  {this.classifyList.map((item, index_) => <el-option key={index_} label={item.name} value={item.categoryId}></el-option>)}
-                </el-select>
-              </el-form-item>
-            </div> : <div style="padding-left:10px">{row.mainName}</div>
+            return this.isEditIndex == index ? (
+              <div class="redbordererr">
+                <el-form-item
+                  label=""
+                  label-width="0px"
+                  prop={`pgIncreItems.${index}.${column.columnAttributes.prop}`}
+                  rules={required}
+                >
+                  <el-select
+                    value={row[column.columnAttributes.prop]}
+                    onInput={val => {
+                      row[column.columnAttributes.prop] = val
+                    }}
+                    onChange={val => {
+                      if (val) {
+                        var data = this.classifyList.find(item => item.categoryId == val)
+                        row.mainName = data.name
+                      } else {
+                        row.mainName = ''
+                      }
+                    }}
+                    placeholder="请选择"
+                  >
+                    {this.classifyList.map((item, index_) => (
+                      <el-option key={index_} label={item.name} value={item.categoryId}></el-option>
+                    ))}
+                  </el-select>
+                </el-form-item>
+              </div>
+            ) : (
+              <div style="padding-left:10px">{row.mainName}</div>
+            )
           }
         },
         {
@@ -150,16 +199,26 @@ export default {
             prop: 'content'
           },
           render: (h, { row, column, index }) => {
-            return this.isEditIndex == index ? <div class="redbordererr">
-              <el-form-item label="" label-width="0px" prop={`pgIncreItems.${index}.${column.columnAttributes.prop}`} rules={required}>
-                <el-input
-                  value={row[column.columnAttributes.prop]}
-                  onInput={(val) => { row[column.columnAttributes.prop] = val }}
-                  placeholder="请输入内容"
+            return this.isEditIndex == index ? (
+              <div class="redbordererr">
+                <el-form-item
+                  label=""
+                  label-width="0px"
+                  prop={`pgIncreItems.${index}.${column.columnAttributes.prop}`}
+                  rules={required}
                 >
-                </el-input>
-              </el-form-item>
-            </div> : <div style="padding-left:10px">{row[column.columnAttributes.prop]}</div>
+                  <el-input
+                    value={row[column.columnAttributes.prop]}
+                    onInput={val => {
+                      row[column.columnAttributes.prop] = val
+                    }}
+                    placeholder="请输入内容"
+                  ></el-input>
+                </el-form-item>
+              </div>
+            ) : (
+              <div style="padding-left:10px">{row[column.columnAttributes.prop]}</div>
+            )
           }
         },
         {
@@ -168,16 +227,26 @@ export default {
             prop: 'limitNum'
           },
           render: (h, { row, column, index }) => {
-            return this.isEditIndex == index ? <div class="redbordererr">
-              <el-form-item label="" label-width="0px" prop={`pgIncreItems.${index}.${column.columnAttributes.prop}`} rules={required} >
-                <el-input
-                  value={row[column.columnAttributes.prop]}
-                  onInput={(val) => { row[column.columnAttributes.prop] = val }}
-                  placeholder="请输入内容"
+            return this.isEditIndex == index ? (
+              <div class="redbordererr">
+                <el-form-item
+                  label=""
+                  label-width="0px"
+                  prop={`pgIncreItems.${index}.${column.columnAttributes.prop}`}
+                  rules={required}
                 >
-                </el-input>
-              </el-form-item>
-            </div> : <div style="padding-left:10px">{row[column.columnAttributes.prop]}</div>
+                  <el-input
+                    value={row[column.columnAttributes.prop]}
+                    onInput={val => {
+                      row[column.columnAttributes.prop] = val
+                    }}
+                    placeholder="请输入内容"
+                  ></el-input>
+                </el-form-item>
+              </div>
+            ) : (
+              <div style="padding-left:10px">{row[column.columnAttributes.prop]}</div>
+            )
           }
         },
         {
@@ -186,22 +255,30 @@ export default {
             prop: 'amount'
           },
           render: (h, { row, column, index }) => {
-            return this.isEditIndex == index ? <div class="redbordererr">
-              <el-form-item label="" label-width="0px" prop={`pgIncreItems.${index}.${column.columnAttributes.prop}`} rules={required}>
-                <el-input
-                  type="number"
-                  value={row[column.columnAttributes.prop]}
-                  onInput={(val) => {
-                    row[column.columnAttributes.prop] = val
-                    if (val && row.workerAmount && Number(row.workerAmount) > Number(val)) {
-                      row.workerAmount = val
-                    }
-                  }}
-                  placeholder="请输入内容"
+            return this.isEditIndex == index ? (
+              <div class="redbordererr">
+                <el-form-item
+                  label=""
+                  label-width="0px"
+                  prop={`pgIncreItems.${index}.${column.columnAttributes.prop}`}
+                  rules={required}
                 >
-                </el-input>
-              </el-form-item>
-            </div> : <div style="padding-left:10px">{row[column.columnAttributes.prop]}</div>
+                  <el-input
+                    type="number"
+                    value={row[column.columnAttributes.prop]}
+                    onInput={val => {
+                      row[column.columnAttributes.prop] = val
+                      if (val && row.workerAmount && Number(row.workerAmount) > Number(val)) {
+                        row.workerAmount = val
+                      }
+                    }}
+                    placeholder="请输入内容"
+                  ></el-input>
+                </el-form-item>
+              </div>
+            ) : (
+              <div style="padding-left:10px">{row[column.columnAttributes.prop]}</div>
+            )
           }
         },
         {
@@ -210,19 +287,28 @@ export default {
             prop: 'workerAmount'
           },
           render: (h, { row, column, index }) => {
-            return this.isEditIndex == index ? <div class="redbordererr">
-              <el-form-item label="" label-width="0px" prop={`pgIncreItems.${index}.${column.columnAttributes.prop}`} rules={required}>
-                <el-input
-                  type="number"
-                  value={row[column.columnAttributes.prop]}
-                  onInput={(val) => {
-                    row[column.columnAttributes.prop] = val && row.amount && Number(val) > Number(row.amount) ? row.amount : val
-                  }}
-                  placeholder="请输入内容"
+            return this.isEditIndex == index ? (
+              <div class="redbordererr">
+                <el-form-item
+                  label=""
+                  label-width="0px"
+                  prop={`pgIncreItems.${index}.${column.columnAttributes.prop}`}
+                  rules={required}
                 >
-                </el-input>
-              </el-form-item>
-            </div> : <div style="padding-left:10px">{row[column.columnAttributes.prop]}</div>
+                  <el-input
+                    type="number"
+                    value={row[column.columnAttributes.prop]}
+                    onInput={val => {
+                      row[column.columnAttributes.prop] =
+                        val && row.amount && Number(val) > Number(row.amount) ? row.amount : val
+                    }}
+                    placeholder="请输入内容"
+                  ></el-input>
+                </el-form-item>
+              </div>
+            ) : (
+              <div style="padding-left:10px">{row[column.columnAttributes.prop]}</div>
+            )
           }
         },
         {
@@ -231,7 +317,7 @@ export default {
             prop: 'websitAmount'
           },
           render: (h, { row, column, index }) => {
-            row[column.columnAttributes.prop] = (Number(row["amount"]) - Number(row["workerAmount"])).toFixed(2)
+            row[column.columnAttributes.prop] = (Number(row['amount']) - Number(row['workerAmount'])).toFixed(2)
             return <div style="padding-left:10px">{row[column.columnAttributes.prop]}</div>
           }
         },
@@ -261,29 +347,50 @@ export default {
         },
         {
           columnAttributes: {
-            label: '操作',
+            label: '操作'
           },
           render: (h, { row, column, index }) => {
-            return <div style="padding-left:10px">
-              <el-button type="text" onClick={() => {
-                if (this.isEditIndex === index) {
-                  this.isEditIndex = -1
-                }
-                this.formData.pgIncreItems.splice(index, 1)
-              }}>删除</el-button>
-              {this.isEditIndex == index && <el-button type="text" onClick={() => {
-                if (this.panduancp()) {
-                  this.$refs.formRef.validateField(this.getVfyKey(index), (valid, invalidFields, errLabels) => {
-                    if (valid) {
+            return (
+              <div style="padding-left:10px">
+                <el-button
+                  type="text"
+                  onClick={() => {
+                    if (this.isEditIndex === index) {
                       this.isEditIndex = -1
                     }
-                  })
-                }
-              }}>确定</el-button>}
-              {this.isEditIndex == -1 && <el-button type="text" onClick={() => {
-                this.isEditIndex = index
-              }}>编辑</el-button>}
-            </div>
+                    this.formData.pgIncreItems.splice(index, 1)
+                  }}
+                >
+                  删除
+                </el-button>
+                {this.isEditIndex == index && (
+                  <el-button
+                    type="text"
+                    onClick={() => {
+                      if (this.panduancp()) {
+                        this.$refs.formRef.validateField(this.getVfyKey(index), (valid, invalidFields, errLabels) => {
+                          if (valid) {
+                            this.isEditIndex = -1
+                          }
+                        })
+                      }
+                    }}
+                  >
+                    确定
+                  </el-button>
+                )}
+                {this.isEditIndex == -1 && (
+                  <el-button
+                    type="text"
+                    onClick={() => {
+                      this.isEditIndex = index
+                    }}
+                  >
+                    编辑
+                  </el-button>
+                )}
+              </div>
+            )
           }
         }
       ]
@@ -291,24 +398,20 @@ export default {
     formItems() {
       return [
         {
-          name: 'el-input',
-          md: 8,
-          attributes: { disabled: true, placeholder: '请输入' },
-          formItemAttributes: {
-            label: '所属商户',
-            prop: 'companyWechatName',
-          }
-        },
-        {
           name: 'slot-component',
           md: 16,
           formItemAttributes: { label: '', prop: '' },
-          render: (h, { props }) => { return null }
+          render: (h, { props }) => {
+            return null
+          }
         },
         {
           name: 'el-select',
           md: 8,
-          options: [{ label: "延保", value: 1 }, { label: "清洗", value: 2 }],
+          options: [
+            { label: '延保', value: 1 },
+            { label: '清洗', value: 2 }
+          ],
           attributes: {
             placeholder: '请选择',
             clearable: true,
@@ -320,9 +423,9 @@ export default {
             rules: [...required]
           },
           events: {
-            change: (val) => {
+            change: val => {
               if (val == 1) {
-                this.formData.usedType = "YEAR"
+                this.formData.usedType = 'YEAR'
               }
             }
           }
@@ -331,12 +434,17 @@ export default {
           name: 'slot-component',
           md: 16,
           formItemAttributes: { label: '', prop: '' },
-          render: (h, { props }) => { return null }
+          render: (h, { props }) => {
+            return null
+          }
         },
         {
           name: 'el-select',
           md: 8,
-          options: [{ label: "使用次数", value: "COUNT" }, { label: "使用年限", value: "YEAR" }],
+          options: [
+            { label: '使用次数', value: 'COUNT' },
+            { label: '使用年限', value: 'YEAR' }
+          ],
           attributes: {
             placeholder: '请选择',
             clearable: true,
@@ -353,13 +461,18 @@ export default {
           name: 'slot-component',
           md: 16,
           formItemAttributes: { label: '', prop: '' },
-          render: (h, { props }) => { return null }
+          render: (h, { props }) => {
+            return null
+          }
         },
         {
           name: 'el-input',
           md: 8,
           name: 'el-radio',
-          options: [{ label: "上架", value: true }, { label: "下架", value: false }],
+          options: [
+            { label: '上架', value: true },
+            { label: '下架', value: false }
+          ],
           formItemAttributes: {
             label: '状态',
             prop: 'status',
@@ -380,49 +493,57 @@ export default {
             return (
               <div>
                 <div style="margin-bottom:8px">
-                  <el-button onClick={() => {
-                    if (this.panduancp()) {
-                      if (this.formData.pgIncreItems.length == 0) {
-                        this.formData.pgIncreItems.push({
-                          "amount": "",
-                          "brandId": "",
-                          "brandName": "",
-                          "content": "",
-                          "limitNum": "",
-                          "mainId": "",
-                          "mainName": "",
-                          "websitAmount": "",
-                          "workerAmount": "",
-                        })
-                        this.isEditIndex = this.formData.pgIncreItems.length - 1
-                      } else {
-                        this.$refs.formRef.validateField(this.getVfyKey(this.isEditIndex), (valid, invalidFields, errLabels) => {
-                          if (valid) {
-                            this.formData.pgIncreItems.push({
-                              "amount": "",
-                              "brandId": "",
-                              "brandName": "",
-                              "content": "",
-                              "limitNum": "",
-                              "mainId": "",
-                              "mainName": "",
-                              "websitAmount": "",
-                              "workerAmount": "",
-                            })
-                            this.isEditIndex = this.formData.pgIncreItems.length - 1
-                          }
-                        })
+                  <el-button
+                    onClick={() => {
+                      if (this.panduancp()) {
+                        if (this.formData.pgIncreItems.length == 0) {
+                          this.formData.pgIncreItems.push({
+                            amount: '',
+                            brandId: '',
+                            brandName: '',
+                            content: '',
+                            limitNum: '',
+                            mainId: '',
+                            mainName: '',
+                            websitAmount: '',
+                            workerAmount: ''
+                          })
+                          this.isEditIndex = this.formData.pgIncreItems.length - 1
+                        } else {
+                          this.$refs.formRef.validateField(
+                            this.getVfyKey(this.isEditIndex),
+                            (valid, invalidFields, errLabels) => {
+                              if (valid) {
+                                this.formData.pgIncreItems.push({
+                                  amount: '',
+                                  brandId: '',
+                                  brandName: '',
+                                  content: '',
+                                  limitNum: '',
+                                  mainId: '',
+                                  mainName: '',
+                                  websitAmount: '',
+                                  workerAmount: ''
+                                })
+                                this.isEditIndex = this.formData.pgIncreItems.length - 1
+                              }
+                            }
+                          )
+                        }
                       }
-                    }
-                  }}>添加</el-button>
+                    }}
+                  >
+                    添加
+                  </el-button>
                 </div>
                 <zj-table
                   columns={this.columns}
                   tableData={this.formData.pgIncreItems}
                   tableAttributes={{
                     size: 'mini',
-                    border: true,
-                  }} />
+                    border: true
+                  }}
+                />
               </div>
             )
           }
@@ -433,7 +554,7 @@ export default {
           attributes: {
             disabled: false,
             placeholder: '请输入',
-            type: "textarea",
+            type: 'textarea',
             autosize: { minRows: 2, maxRows: 4 },
             maxlength: 50,
             'show-word-limit': true
@@ -454,9 +575,7 @@ export default {
           },
           render: (h, { props, onInput }) => {
             var { value } = props
-            return (
-              <v-quill-editor value={value} onInput={onInput} />
-            )
+            return <v-quill-editor value={value} onInput={onInput} />
           }
         },
         {
@@ -472,92 +591,138 @@ export default {
             return (
               <div>
                 <div style="margin-bottom:8px">
-                  <el-button onClick={() => {
-                    this.formData.pgIncreWebsits.push({
-                      websitId: "",
-                      linkName: "",
-                      websitPhone: "",
-                      address: "",
-                    });
-                    this.websitIndex = this.formData.pgIncreWebsits.length - 1
-                  }}>添加</el-button>
+                  <el-button
+                    onClick={() => {
+                      this.formData.pgIncreWebsits.push({
+                        websitId: '',
+                        linkName: '',
+                        websitPhone: '',
+                        address: ''
+                      })
+                      this.websitIndex = this.formData.pgIncreWebsits.length - 1
+                    }}
+                  >
+                    添加
+                  </el-button>
                 </div>
                 <zj-table
-                  columns={[{
-                    columnAttributes: {
-                      label: '网点名称',
-                      prop: 'websitId'
+                  columns={[
+                    {
+                      columnAttributes: {
+                        label: '网点名称',
+                        prop: 'websitId'
+                      },
+                      render: (h, { row, column, index }) => {
+                        return (
+                          <div>
+                            <el-form-item
+                              label=""
+                              label-width="0px"
+                              prop={`pgIncreWebsits.${index}.${column.columnAttributes.prop}`}
+                              rules={required}
+                            >
+                              <el-select
+                                value={row[column.columnAttributes.prop]}
+                                onInput={val => {
+                                  row[column.columnAttributes.prop] = val
+                                }}
+                                disabled={!(this.websitIndex == index)}
+                                onChange={val => {
+                                  if (val) {
+                                    var data = this.websitList.find(item => item.value == val)
+                                    row.linkName = data.data.linkName
+                                    row.websitPhone = data.data.websitPhone
+                                    row.address = data.data.address
+                                  } else {
+                                    row.linkName = ''
+                                    row.websitPhone = ''
+                                    row.address = ''
+                                  }
+                                }}
+                                placeholder="请选择"
+                              >
+                                {this.websitList
+                                  .filter(
+                                    item =>
+                                      row.websitId == item.value ||
+                                      !this.formData.pgIncreWebsits.find(val => val.websitId == item.value)
+                                  )
+                                  .map((item, index_) => (
+                                    <el-option key={index_} label={item.label} value={item.value}></el-option>
+                                  ))}
+                              </el-select>
+                            </el-form-item>
+                          </div>
+                        )
+                      }
                     },
-                    render: (h, { row, column, index }) => {
-                      return <div>
-                        <el-form-item label="" label-width="0px" prop={`pgIncreWebsits.${index}.${column.columnAttributes.prop}`} rules={required}>
-                          <el-select
-                            value={row[column.columnAttributes.prop]}
-                            onInput={(val) => { row[column.columnAttributes.prop] = val }}
-                            disabled={!(this.websitIndex == index)}
-                            onChange={(val) => {
-                              if (val) {
-                                var data = this.websitList.find(item => item.value == val)
-                                row.linkName = data.data.linkName
-                                row.websitPhone = data.data.websitPhone
-                                row.address = data.data.address
-                              } else {
-                                row.linkName = ""
-                                row.websitPhone = ""
-                                row.address = ""
-                              }
-                            }}
-                            placeholder="请选择">
-                            {this.websitList.filter(item => (row.websitId == item.value || !this.formData.pgIncreWebsits.find(val => (val.websitId == item.value)))).map((item, index_) => <el-option key={index_} label={item.label} value={item.value}></el-option>)}
-                          </el-select>
-                        </el-form-item>
-                      </div>
-                    }
-                  },
-                  {
-                    columnAttributes: {
-                      label: '联系人',
-                      prop: 'linkName'
-                    }
-                  },
-                  {
-                    columnAttributes: {
-                      label: '联系电话',
-                      prop: 'websitPhone'
-                    }
-                  },
-                  {
-                    columnAttributes: {
-                      label: '地址',
-                      prop: 'address'
-                    }
-                  },
-                  {
-                    columnAttributes: {
-                      label: '操作',
+                    {
+                      columnAttributes: {
+                        label: '联系人',
+                        prop: 'linkName'
+                      }
                     },
-                    render: (h, { row, column, index }) => {
-                      return <div style="padding-left:10px">
-                        {this.websitIndex == index ? <el-button type="text" onClick={() => {
-                          this.websitIndex = -1
-                        }}>确定</el-button> : null}
-                        {this.websitIndex != index ? <el-button type="text" onClick={() => {
-                          this.websitIndex = index
-                        }}>编辑</el-button> : null}
-                        <el-button type="text" onClick={() => {
-                          if (this.websitIndex == index) {
-                            this.websitIndex = -1
-                          }
-                          this.formData.pgIncreWebsits.splice(index, 1)
-                        }}>删除</el-button>
-                      </div>
+                    {
+                      columnAttributes: {
+                        label: '联系电话',
+                        prop: 'websitPhone'
+                      }
+                    },
+                    {
+                      columnAttributes: {
+                        label: '地址',
+                        prop: 'address'
+                      }
+                    },
+                    {
+                      columnAttributes: {
+                        label: '操作'
+                      },
+                      render: (h, { row, column, index }) => {
+                        return (
+                          <div style="padding-left:10px">
+                            {this.websitIndex == index ? (
+                              <el-button
+                                type="text"
+                                onClick={() => {
+                                  this.websitIndex = -1
+                                }}
+                              >
+                                确定
+                              </el-button>
+                            ) : null}
+                            {this.websitIndex != index ? (
+                              <el-button
+                                type="text"
+                                onClick={() => {
+                                  this.websitIndex = index
+                                }}
+                              >
+                                编辑
+                              </el-button>
+                            ) : null}
+                            <el-button
+                              type="text"
+                              onClick={() => {
+                                if (this.websitIndex == index) {
+                                  this.websitIndex = -1
+                                }
+                                this.formData.pgIncreWebsits.splice(index, 1)
+                              }}
+                            >
+                              删除
+                            </el-button>
+                          </div>
+                        )
+                      }
                     }
-                  }]}
+                  ]}
                   tableData={this.formData.pgIncreWebsits}
                   tableAttributes={{
                     size: 'mini',
-                    border: true,
-                  }} />
+                    border: true
+                  }}
+                />
               </div>
             )
           }
@@ -565,13 +730,13 @@ export default {
         {
           name: 'el-input',
           md: 24,
-          attributes: { disabled: false, placeholder: '请输入', type: "textarea" },
+          attributes: { disabled: false, placeholder: '请输入', type: 'textarea' },
           formItemAttributes: {
             label: '备注',
             prop: 'remark',
             rules: []
           }
-        },
+        }
       ]
     }
   },
@@ -607,7 +772,7 @@ export default {
               `${row.brandId}_${row.mainId}_${row.content}` == `${item.brandId}_${item.mainId}_${item.content}` &&
               index_ != index
             ) {
-              throw new Error('');
+              throw new Error('')
             }
           })
         })
@@ -629,9 +794,7 @@ export default {
       return [
         ...(() => {
           if (bool) {
-            return [
-              `pgIncreItems`,
-            ]
+            return [`pgIncreItems`]
           }
           return []
         })(),
@@ -644,7 +807,7 @@ export default {
               `pgIncreItems.${index}.limitNum`,
               `pgIncreItems.${index}.amount`,
               `pgIncreItems.${index}.websitAmount`,
-              `pgIncreItems.${index}.workerAmount`,
+              `pgIncreItems.${index}.workerAmount`
             ]
           }
           return []
@@ -653,9 +816,16 @@ export default {
     },
     openForm() {
       Promise.all([
-        getDataDictionary({ "pageNum": 1, "pageSize": -1, "params": [{ "param": "a.status", "compare": "=", "value": "ON" }, { "param": "a.dict_type", "compare": "=", "value": "BRAND" }] }),
+        getDataDictionary({
+          pageNum: 1,
+          pageSize: -1,
+          params: [
+            { param: 'a.status', compare: '=', value: 'ON' },
+            { param: 'a.dict_type', compare: '=', value: 'BRAND' }
+          ]
+        }),
         getClassifyList({ type: 2, status: true }),
-        getWebsit({ isIncre: true, status:true })
+        getWebsit({ isIncre: true, status: true })
       ]).then(([res1, res2, res3]) => {
         // 获取品牌
         this.orderBrands = res1.data.records.map(item => ({
@@ -670,7 +840,7 @@ export default {
           return {
             ...data
           }
-        });
+        })
         this.classifyListLv2 = classifyListLv2
 
         this.websitList = res3.data.map(item => ({
@@ -697,23 +867,26 @@ export default {
       if (this.clickLook && this.panduancp()) {
         this.$refs.formRef.validate((valid, invalidFields, errLabels) => {
           if (valid) {
-            this.clickLook = false;
-            ([increConfigAdd, increConfigUpdate][this.formData.id ? 1 : 0])({
-              ...this.formData
-            }).then(res => {
-              this.$message({ type: 'success', message: `成功!` })
-              this.formCancel()
-              this.$refs.pageRef.refreshList()
-              this.clickLook = true
-            }).catch(() => {
-              this.clickLook = true
-            })
+            this.clickLook = false
+            ;[increConfigAdd, increConfigUpdate]
+              [this.formData.id ? 1 : 0]({
+                ...this.formData
+              })
+              .then(res => {
+                this.$message({ type: 'success', message: `成功!` })
+                this.formCancel()
+                this.$refs.pageRef.refreshList()
+                this.clickLook = true
+              })
+              .catch(() => {
+                this.clickLook = true
+              })
           }
         })
       } else {
         this.$message.warning('服务内容没有确认')
       }
-    },
+    }
   }
 }
 </script>

src/views/workOrder/basicConfiguration/assessmentItemAllocation/index.vue

@@ -1,23 +1,41 @@
 <template>
-	<zj-tab-page ref="tabPage" :defaultActives="[{ key: 'list', label: $route.meta.title+'-列表', essential: true }]">
-		<template slot-scope="{activeKey, data}">
-			<template-page v-if="activeKey == 'list'" ref="pageRef" :get-list="getList" :table-attributes="tableAttributes" :table-events="tableEvents"
-			  :options-evens-group="optionsEvensGroup" :moreParameters="moreParameters" :column-parsing="columnParsing"
-			  :operation="operation()" :exportList="exportList" :operationColumnWidth="80">
-			</template-page>
-			<div v-if="~['add', 'edit', 'detail'].indexOf(activeKey)">
-				<zj-form-container ref="formRef" :form-data="formData" :styleSwitch="false">
-				  <zj-form-module title="" label-width="100px" :showPackUp="false"
-				    :form-data="formData" :form-items="formItems" :disabled="formDialogType == 2">
-				  </zj-form-module>
-				</zj-form-container>
-				<div slot="footer" class="dialog-footer">
-				  <el-button size="mini" @click="data.removeTab()">取 消</el-button>
-				  <el-button v-if="formDialogType !== 2" size="mini" @click="formConfirm(data.removeTab)" type="primary">确 定</el-button>
-				</div>
-			</div>
-		</template>
-	</zj-tab-page>
+  <zj-tab-page ref="tabPage" :defaultActives="[{ key: 'list', label: $route.meta.title + '-列表', essential: true }]">
+    <template slot-scope="{ activeKey, data }">
+      <template-page
+        v-if="activeKey == 'list'"
+        ref="pageRef"
+        :get-list="getList"
+        :table-attributes="tableAttributes"
+        :table-events="tableEvents"
+        :options-evens-group="optionsEvensGroup"
+        :moreParameters="moreParameters"
+        :column-parsing="columnParsing"
+        :operation="operation()"
+        :exportList="exportList"
+        :operationColumnWidth="80"
+      >
+      </template-page>
+      <div v-if="~['add', 'edit', 'detail'].indexOf(activeKey)">
+        <zj-form-container ref="formRef" :form-data="formData" :styleSwitch="false">
+          <zj-form-module
+            title=""
+            label-width="100px"
+            :showPackUp="false"
+            :form-data="formData"
+            :form-items="formItems"
+            :disabled="formDialogType == 2"
+          >
+          </zj-form-module>
+        </zj-form-container>
+        <div slot="footer" class="dialog-footer">
+          <el-button size="mini" @click="data.removeTab()">取 消</el-button>
+          <el-button v-if="formDialogType !== 2" size="mini" @click="formConfirm(data.removeTab)" type="primary"
+            >确 定</el-button
+          >
+        </div>
+      </div>
+    </template>
+  </zj-tab-page>
 </template>
 
 <script>
@@ -25,7 +43,7 @@ import TemplatePage from '@/components/template/template-page-1.vue'
 import import_mixin from '@/components/template/import_mixin.js'
 import ImageUpload from '@/components/file-upload'
 import { required, mobileRequired, mobile, httpUrl, email } from '@/components/template/rules_verify.js'
-import { listPageV2, pageExport, getDetail, add, edit, del } from "@/api/workOrder/assessmentItemAllocation";
+import { listPageV2, pageExport, getDetail, add, edit, del } from '@/api/workOrder/assessmentItemAllocation'
 import operation_mixin from '@/components/template/operation_mixin.js'
 export default {
   components: { TemplatePage, ImageUpload },
@@ -45,16 +63,16 @@ export default {
       recordSelected: [],
       /** 表单变量 */
       formDialogType: 0,
-      formDialogTitles: ["新增", "编辑", "详情"],
+      formDialogTitles: ['新增', '编辑', '详情'],
       formDialog: false,
       formData: {
         companyName: JSON.parse(localStorage.getItem('greemall_user')).companyName,
         type: 'REWARD',
         name: '',
-        amount: '',
+        amount: ''
       },
-			formType: 'add',
-			formVisible: false,
+      formType: 'add',
+      formVisible: false
     }
   },
   computed: {
@@ -63,10 +81,10 @@ export default {
       return [
         [
           [
-            this.optionsEvensAuth("add", {
-								click: () => {
-									this.openForm('add')
-								}
+            this.optionsEvensAuth('add', {
+              click: () => {
+                this.openForm('add')
+              }
             })
           ]
         ]
@@ -77,64 +95,63 @@ export default {
       return []
     },
     formItems() {
-      return [{
-        md: 6,
-        isShow: true,
-        name: 'el-input',
-        attributes: { placeholder: '请输入', disabled: true },
-        formItemAttributes: {
-          label: '所属商户',
-          prop: 'companyName',
-          rules: [...required]
-        },
-      }, {
-        md: 6,
-        isShow: true,
-        name: 'el-input',
-        attributes: { placeholder: '请输入考核项目名称', },
-        formItemAttributes: {
-          label: '考核项目',
-          prop: 'name',
-          rules: [...required]
-        }
-      }, {
-        md: 6,
-        isShow: true,
-        name: 'slot-component',
-        attributes: {},
-        formItemAttributes: {
-          label: '考核类型',
-          prop: 'type',
-          rules: [...required]
+      return [
+        {
+          md: 6,
+          isShow: true,
+          name: 'el-input',
+          attributes: { placeholder: '请输入考核项目名称' },
+          formItemAttributes: {
+            label: '考核项目',
+            prop: 'name',
+            rules: [...required]
+          }
         },
-        render: (h, { props, onInput }) => {
-          var { value } = props
-          return (
-            <el-radio-group v-model={this.formData.type}>
-              <el-radio disabled={this.formDialogType == 2} label="REWARD">奖励</el-radio>
-              <el-radio disabled={this.formDialogType == 2} label="PUNISH">惩罚</el-radio>
-            </el-radio-group>
-          )
-        }
-      }, {
-        md: 6,
-        isShow: true,
-        name: 'slot-component',
-        attributes: { placeholder: '请输入', type: 'number' },
-        formItemAttributes: {
-          label: '考核金额',
-          prop: 'amount',
-          rules: [...required]
+        {
+          md: 6,
+          isShow: true,
+          name: 'slot-component',
+          attributes: {},
+          formItemAttributes: {
+            label: '考核类型',
+            prop: 'type',
+            rules: [...required]
+          },
+          render: (h, { props, onInput }) => {
+            var { value } = props
+            return (
+              <el-radio-group v-model={this.formData.type}>
+                <el-radio disabled={this.formDialogType == 2} label="REWARD">
+                  奖励
+                </el-radio>
+                <el-radio disabled={this.formDialogType == 2} label="PUNISH">
+                  惩罚
+                </el-radio>
+              </el-radio-group>
+            )
+          }
         },
-        render: (h, { props, onInput }) => {
-          var { value } = props
-          return (
-            <div style="display: flex;justify-content: space-around;align-items: center;position: relative;">
-              <el-input v-model={this.formData.amount} type="number" placeholder="请输入"></el-input><span style="margin-left: 10px;">元</span>
-            </div>
-          )
+        {
+          md: 6,
+          isShow: true,
+          name: 'slot-component',
+          attributes: { placeholder: '请输入', type: 'number' },
+          formItemAttributes: {
+            label: '考核金额',
+            prop: 'amount',
+            rules: [...required]
+          },
+          render: (h, { props, onInput }) => {
+            var { value } = props
+            return (
+              <div style="display: flex;justify-content: space-around;align-items: center;position: relative;">
+                <el-input v-model={this.formData.amount} type="number" placeholder="请输入"></el-input>
+                <span style="margin-left: 10px;">元</span>
+              </div>
+            )
+          }
         }
-      }]
+      ]
     }
   },
   methods: {
@@ -155,11 +172,11 @@ export default {
       return this.operationBtn({
         edit: {
           click: ({ row, index, column }) => {
-            this.openForm('edit',row.id)
+            this.openForm('edit', row.id)
           }
         },
         del: {
-          prompt: "请确认是否删除该数据, 是否继续?",
+          prompt: '请确认是否删除该数据, 是否继续?',
           click: ({ row, index, column }) => {
             del({
               id: row.id
@@ -168,7 +185,7 @@ export default {
                 this.$message({ type: 'success', message: '删除成功!' })
                 this.$refs.pageRef.refreshList()
               } else {
-                this.$message.error(res.msg);
+                this.$message.error(res.msg)
               }
             })
           }
@@ -183,39 +200,37 @@ export default {
     },
     // 打开 新增编辑 网点表单
     openForm(type, id) {
-    	this.$refs.tabPage.addTab({
-    		// 对应显示的模块
-    		activeKey: type,
-    		// 唯一标识
-    		key: type,
-    		// 页签名称
-    		label: ({ edit: "编辑", add: "新增", detail: "查看" })[type],
-    		// 打开时事件
-    		triggerEvent: () => {
-    			this.formCancel()
-    			this.$nextTick(()=>{
-    				this.formType = type
-    				this.formVisible = true
-    				if (type == 'add') {
-    					this.formDialogType = 0
-    				} else if(type == 'edit'){
-    					this.formDialogType = 1
-    					getDetail({ id }).then(res => {
-    					  Object.assign(this.formData, res.data)
-    					})
-    				}
-    			})
-    		},
-    		// 关闭时事件
-    		closeEvent: () => {
-    		
-    		}
-    	})
+      this.$refs.tabPage.addTab({
+        // 对应显示的模块
+        activeKey: type,
+        // 唯一标识
+        key: type,
+        // 页签名称
+        label: { edit: '编辑', add: '新增', detail: '查看' }[type],
+        // 打开时事件
+        triggerEvent: () => {
+          this.formCancel()
+          this.$nextTick(() => {
+            this.formType = type
+            this.formVisible = true
+            if (type == 'add') {
+              this.formDialogType = 0
+            } else if (type == 'edit') {
+              this.formDialogType = 1
+              getDetail({ id }).then(res => {
+                Object.assign(this.formData, res.data)
+              })
+            }
+          })
+        },
+        // 关闭时事件
+        closeEvent: () => {}
+      })
     },
     formConfirm(canael) {
       this.$refs.formRef.validate((valid, invalidFields, errLabels) => {
         if (valid) {
-          ([add, edit][this.formDialogType])(this.formData).then(res => {
+          ;[add, edit][this.formDialogType](this.formData).then(res => {
             this.$message({ type: 'success', message: `${this.formDialogTitles[this.formDialogType]}成功!` })
             canael('list')
             this.$refs.pageRef.refreshList()

src/views/workOrder/basicConfiguration/orderType/index.vue

@@ -102,17 +102,6 @@ export default {
         {
           md: 6,
           isShow: true,
-          name: 'el-input',
-          attributes: { placeholder: '请输入', disabled: true },
-          formItemAttributes: {
-            label: '所属商户',
-            prop: 'companyName',
-            rules: [...required]
-          }
-        },
-        {
-          md: 6,
-          isShow: true,
           name: 'el-select',
           options: [
             { label: '安装', value: 'INSTALL' },

src/views/workOrder/penaltyWorkOrder/mixins/common_form.js

@@ -1,4 +1,3 @@
-
 export default {
   computed: {
     formItems() {
@@ -24,7 +23,6 @@ export default {
                   labelStyle={{ width: '8%' }}
                   contentStyle={{ width: '17%' }}
                 >
-                  <el-descriptions-item label="所属商户">{JSON.parse(localStorage.getItem('greemall_user')).companyName}</el-descriptions-item>
                   <el-descriptions-item label="处罚单号">{this.formData.id || ''}</el-descriptions-item>
                   <el-descriptions-item label="状态">
                     {{ SAVE: '保存', WAIT: '待审核', OK: '通过', FAIL: '失败' }[this.formData.status] || ''}
@@ -41,5 +39,5 @@ export default {
         }
       ]
     }
-  },
+  }
 }

src/views/workOrder/settleAccountsManagement/rewardsPunishmentsOrder/index.vue

@@ -117,17 +117,6 @@ export default {
       return [
         {
           md: 6,
-          isShow: true,
-          name: 'el-input',
-          attributes: { placeholder: '请输入', disabled: true },
-          formItemAttributes: {
-            label: '所属商户',
-            prop: 'companyName',
-            rules: [...required]
-          }
-        },
-        {
-          md: 6,
           // isShow: this.type == 1,
           name: 'slot-component',
           attributes: { placeholder: '请输入网点名称' },

src/views/workOrder/settleAccountsManagement/settleAccountsOrder/index.vue

@@ -1,28 +1,53 @@
 <template>
-	<template-page ref="pageRef" :get-list="getList" :table-attributes="tableAttributes" :table-events="tableEvents"
-		:operationColumnWidth="80" :options-evens-group="optionsEvensGroup" :moreParameters="moreParameters"
-		:column-parsing="columnParsing" :operation="operation()" :exportList="exportList">
-		<div slot="moreSearch">
-			<el-radio-group v-model="poolStatus" size="mini" @change="changeType">
-				<el-radio-button label="">全部</el-radio-button>
-				<el-radio-button label="NO">未汇总</el-radio-button>
-				<el-radio-button label="YES">已汇总</el-radio-button>
-			</el-radio-group>
-			<br><br>
-		</div>
-		<el-dialog title="" width="600px" custom-class="diy-dialog" append-to-body :modal="true" :visible.sync="formDialog"
-			:show-close="true" :close-on-click-modal="false" :modal-append-to-body="false" :before-close="formCancel">
-			<zj-form-container ref="formRef" :form-data="formData" :styleSwitch="false">
-				<zj-form-module :title="formDialogTitles[formDialogType]" label-width="120px" :showPackUp="false"
-					:form-data="formData" :form-items="formItems" :disabled="formDialogType == 2">
-				</zj-form-module>
-			</zj-form-container>
-			<div slot="footer" class="dialog-footer">
-				<el-button size="mini" @click="formCancel">取 消</el-button>
-				<el-button size="mini" v-if="formDialogType !== 2" type="primary" @click="formConfirm()">提交</el-button>
-			</div>
-		</el-dialog>
-	</template-page>
+  <template-page
+    ref="pageRef"
+    :get-list="getList"
+    :table-attributes="tableAttributes"
+    :table-events="tableEvents"
+    :operationColumnWidth="80"
+    :options-evens-group="optionsEvensGroup"
+    :moreParameters="moreParameters"
+    :column-parsing="columnParsing"
+    :operation="operation()"
+    :exportList="exportList"
+  >
+    <div slot="moreSearch">
+      <el-radio-group v-model="poolStatus" size="mini" @change="changeType">
+        <el-radio-button label="">全部</el-radio-button>
+        <el-radio-button label="NO">未汇总</el-radio-button>
+        <el-radio-button label="YES">已汇总</el-radio-button>
+      </el-radio-group>
+      <br /><br />
+    </div>
+    <el-dialog
+      title=""
+      width="600px"
+      custom-class="diy-dialog"
+      append-to-body
+      :modal="true"
+      :visible.sync="formDialog"
+      :show-close="true"
+      :close-on-click-modal="false"
+      :modal-append-to-body="false"
+      :before-close="formCancel"
+    >
+      <zj-form-container ref="formRef" :form-data="formData" :styleSwitch="false">
+        <zj-form-module
+          :title="formDialogTitles[formDialogType]"
+          label-width="120px"
+          :showPackUp="false"
+          :form-data="formData"
+          :form-items="formItems"
+          :disabled="formDialogType == 2"
+        >
+        </zj-form-module>
+      </zj-form-container>
+      <div slot="footer" class="dialog-footer">
+        <el-button size="mini" @click="formCancel">取 消</el-button>
+        <el-button size="mini" v-if="formDialogType !== 2" type="primary" @click="formConfirm()">提交</el-button>
+      </div>
+    </el-dialog>
+  </template-page>
 </template>
 
 <script>
@@ -30,279 +55,286 @@ import TemplatePage from '@/components/template/template-page-1.vue'
 import import_mixin from '@/components/template/import_mixin.js'
 import ImageUpload from '@/components/file-upload'
 import { required, mobileRequired, mobile, httpUrl, email } from '@/components/template/rules_verify.js'
-import { listPageV2, pageExport, pool, poolMore } from "@/api/workOrder/settleAccountsOrder";
+import { listPageV2, pageExport, pool, poolMore } from '@/api/workOrder/settleAccountsOrder'
 import operation_mixin from '@/components/template/operation_mixin.js'
 export default {
-	components: { TemplatePage, ImageUpload },
-	mixins: [import_mixin, operation_mixin],
-	data() {
-		return {
-			// 表格属性
-			tableAttributes: {
-				// 启用勾选列
-				selectColumn: true,
-				selectable: this.selectable
-			},
-			// 表格事件
-			tableEvents: {
-				'selection-change': this.selectionChange
-			},
-			// 勾选选中行
-			recordSelected: [],
-			/** 表单变量 */
-			formDialogType: 0,
-			formDialogTitles: ["汇总"],
-			formDialog: false,
-			type: JSON.parse(localStorage.getItem('greemall_user')).type, //type=1商户, type=0网点
-			formData: {
-				companyName: JSON.parse(localStorage.getItem('greemall_user')).companyName,
-				month: (new Date().getFullYear()) + '-' + ((new Date().getMonth() + 1) > 9 ? (new Date().getMonth() + 1) : ('0' + (new Date().getMonth() + 1))),
-				createdTime: [],
-				starDate: '',
-				endDate: '',
-			},
-			poolStatus: ''
-		}
-	},
-	computed: {
-		// 事件组合
-		optionsEvensGroup() {
-			return [
-				[
-					[
-						this.optionsEvensAuth("collectMonth", {
-							click: this.poolData1
-						})
-					]
-				],
-				[
-					[
-						this.optionsEvensAuth("collectMore", {
-							click: this.poolData2
-						})
-					]
-				]
-			]
-		},
-		// 更多参数
-		moreParameters() {
-			return []
-		},
-		formItems() {
-			return [{
-				md: 24,
-				isShow: true,
-				name: 'el-input',
-				attributes: { placeholder: '请输入', disabled: true },
-				formItemAttributes: {
-					label: '所属商户',
-					prop: 'companyName',
-					rules: [...required]
-				},
-			}, {
-				md: 24,
-				isShow: true,
-				name: 'el-input',
-				attributes: { placeholder: '请输入', disabled: true },
-				formItemAttributes: {
-					label: '月份',
-					prop: 'month',
-					rules: [...required]
-				}
-			}, {
-				md: 24,
-				isShow: true,
-				name: 'slot-component',
-				attributes: { placeholder: '请选择', },
-				formItemAttributes: {
-					label: '创建结算单时间',
-					prop: 'createdTime',
-					rules: [...required]
-				},
-				render: (h, { props, onInput }) => {
-					var { value } = props
-					return (
-						<el-date-picker
-							v-model={this.formData.createdTime}
-							type="daterange"
-							range-separator="至"
-							value-format="yyyy-MM-dd"
-							start-placeholder="开始日期"
-							end-placeholder="结束日期"
-							onChange={e => {
-								this.formData.starDate = e[0]
-								this.formData.endDate = e[1]
-							}}>
-						</el-date-picker>
-					)
-				}
-			}]
-		}
-	},
-	methods: {
-		// 切换状态
-		changeType(val) {
-			this.$refs.pageRef.refreshList()
-		},
-		// 列表请求函数
-		getList(p, cb) {
-			try {
-				var pam = JSON.parse(JSON.stringify(p))
-				pam.params.push({ 'param': 'a.pool_status', "compare": "=", "value": this.poolStatus })
-				cb && cb(pam)
-				return listPageV2(pam)
-			} catch (error) {
-				console.log(error)
-			}
-		},
-		// 列表导出函数
-		exportList: pageExport,
-		// 表格列解析渲染数据更改
-		columnParsing(item, defaultData) {
-			if (item.jname === 'orderBaseId') {
-				defaultData.render = (h, { row, index, column }) => {
-					return (
-						<div style="padding:0 6px;cursor: pointer;" class={{ 'text-view': true, 'text-view-copy': column.isCopy }}>
-							<span style="color:#008dd4;" onClick={() => {
-								if (row.settleOrderType == 'EXAMINE') {
-									this.$router.push({
-										name: "rewardsPunishmentsOrder",
-										query: {
-											id: row.examineProjectId
-										}
-									})
-								} else if(row.settleOrderType == 'PUNISH'){
-									this.$router.push({
-										name: 'penaltyWorkOrder',
-										params: {
-											pageName: row.punishOrderId,
-											pageType: 'detail',
-											pageCode: row.punishOrderId,
-										},
-									})
-								}else{
-									this.$router.push({
-										name: 'workOrderPool',
-										params: {
-											pageName: row.orderBaseId,
-											pageType: 'detail',
-											pageCode: row.orderBaseId,
-											pagePam: 'SettleAccounts'
-										},
-									})
-								}
-							}}>{row.orderBaseId}</span>
-							{(column.isCopy && row.orderBaseId) ? (
-								<i
-									style="color:#008dd4;"
-									class={['el-icon-document-copy', column.columnCopyClass]}
-									data-clipboard-text={row[column.columnAttributes.prop]}
-								></i>
-							) : null}
-						</div>
-					)
-				}
-				defaultData.columnAttributes.width = 200
-			}
-			return defaultData
-		},
-		selectable(row, index) {
-			return ["NO"].includes(Object.entries(row.selectMapData.poolStatus).find(([key, val]) => val == row.poolStatus)?.[0])
-		},
-		// 监听勾选变化
-		selectionChange(data) {
-			this.recordSelected = data
-		},
+  components: { TemplatePage, ImageUpload },
+  mixins: [import_mixin, operation_mixin],
+  data() {
+    return {
+      // 表格属性
+      tableAttributes: {
+        // 启用勾选列
+        selectColumn: true,
+        selectable: this.selectable
+      },
+      // 表格事件
+      tableEvents: {
+        'selection-change': this.selectionChange
+      },
+      // 勾选选中行
+      recordSelected: [],
+      /** 表单变量 */
+      formDialogType: 0,
+      formDialogTitles: ['汇总'],
+      formDialog: false,
+      type: JSON.parse(localStorage.getItem('greemall_user')).type, //type=1商户, type=0网点
+      formData: {
+        companyName: JSON.parse(localStorage.getItem('greemall_user')).companyName,
+        month:
+          new Date().getFullYear() +
+          '-' +
+          (new Date().getMonth() + 1 > 9 ? new Date().getMonth() + 1 : '0' + (new Date().getMonth() + 1)),
+        createdTime: [],
+        starDate: '',
+        endDate: ''
+      },
+      poolStatus: ''
+    }
+  },
+  computed: {
+    // 事件组合
+    optionsEvensGroup() {
+      return [
+        [
+          [
+            this.optionsEvensAuth('collectMonth', {
+              click: this.poolData1
+            })
+          ]
+        ],
+        [
+          [
+            this.optionsEvensAuth('collectMore', {
+              click: this.poolData2
+            })
+          ]
+        ]
+      ]
+    },
+    // 更多参数
+    moreParameters() {
+      return []
+    },
+    formItems() {
+      return [
+        {
+          md: 24,
+          isShow: true,
+          name: 'el-input',
+          attributes: { placeholder: '请输入', disabled: true },
+          formItemAttributes: {
+            label: '月份',
+            prop: 'month',
+            rules: [...required]
+          }
+        },
+        {
+          md: 24,
+          isShow: true,
+          name: 'slot-component',
+          attributes: { placeholder: '请选择' },
+          formItemAttributes: {
+            label: '创建结算单时间',
+            prop: 'createdTime',
+            rules: [...required]
+          },
+          render: (h, { props, onInput }) => {
+            var { value } = props
+            return (
+              <el-date-picker
+                v-model={this.formData.createdTime}
+                type="daterange"
+                range-separator="至"
+                value-format="yyyy-MM-dd"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                onChange={e => {
+                  this.formData.starDate = e[0]
+                  this.formData.endDate = e[1]
+                }}
+              ></el-date-picker>
+            )
+          }
+        }
+      ]
+    }
+  },
+  methods: {
+    // 切换状态
+    changeType(val) {
+      this.$refs.pageRef.refreshList()
+    },
+    // 列表请求函数
+    getList(p, cb) {
+      try {
+        var pam = JSON.parse(JSON.stringify(p))
+        pam.params.push({ param: 'a.pool_status', compare: '=', value: this.poolStatus })
+        cb && cb(pam)
+        return listPageV2(pam)
+      } catch (error) {
+        console.log(error)
+      }
+    },
+    // 列表导出函数
+    exportList: pageExport,
+    // 表格列解析渲染数据更改
+    columnParsing(item, defaultData) {
+      if (item.jname === 'orderBaseId') {
+        defaultData.render = (h, { row, index, column }) => {
+          return (
+            <div style="padding:0 6px;cursor: pointer;" class={{ 'text-view': true, 'text-view-copy': column.isCopy }}>
+              <span
+                style="color:#008dd4;"
+                onClick={() => {
+                  if (row.settleOrderType == 'EXAMINE') {
+                    this.$router.push({
+                      name: 'rewardsPunishmentsOrder',
+                      query: {
+                        id: row.examineProjectId
+                      }
+                    })
+                  } else if (row.settleOrderType == 'PUNISH') {
+                    this.$router.push({
+                      name: 'penaltyWorkOrder',
+                      params: {
+                        pageName: row.punishOrderId,
+                        pageType: 'detail',
+                        pageCode: row.punishOrderId
+                      }
+                    })
+                  } else {
+                    this.$router.push({
+                      name: 'workOrderPool',
+                      params: {
+                        pageName: row.orderBaseId,
+                        pageType: 'detail',
+                        pageCode: row.orderBaseId,
+                        pagePam: 'SettleAccounts'
+                      }
+                    })
+                  }
+                }}
+              >
+                {row.orderBaseId}
+              </span>
+              {column.isCopy && row.orderBaseId ? (
+                <i
+                  style="color:#008dd4;"
+                  class={['el-icon-document-copy', column.columnCopyClass]}
+                  data-clipboard-text={row[column.columnAttributes.prop]}
+                ></i>
+              ) : null}
+            </div>
+          )
+        }
+        defaultData.columnAttributes.width = 200
+      }
+      return defaultData
+    },
+    selectable(row, index) {
+      return ['NO'].includes(
+        Object.entries(row.selectMapData.poolStatus).find(([key, val]) => val == row.poolStatus)?.[0]
+      )
+    },
+    // 监听勾选变化
+    selectionChange(data) {
+      this.recordSelected = data
+    },
 
-		operation() {
-			return this.operationBtn({
-				detail: {
-					click: ({ row, index, column }) => {
-						if (row.settleOrderType == 'EXAMINE') {
-							this.$router.push({
-								name: "rewardsPunishmentsOrder",
-								query: {
-									id: row.examineProjectId
-								}
-							})
-						} else if(row.settleOrderType == 'PUNISH'){
-							this.$router.push({
-								name: 'penaltyWorkOrder',
-								params: {
-									pageName: row.punishOrderId,
-									pageType: 'detail',
-									pageCode: row.punishOrderId,
-								},
-							})
-						}else{
-							this.$router.push({
-								name: 'workOrderPool',
-								params: {
-									pageName: row.orderBaseId,
-									pageType: 'detail',
-									pageCode: row.orderBaseId,
-									pagePam: 'SettleAccounts'
-								},
-							})
-						}
-					}
-				}
-			})
-		},
+    operation() {
+      return this.operationBtn({
+        detail: {
+          click: ({ row, index, column }) => {
+            if (row.settleOrderType == 'EXAMINE') {
+              this.$router.push({
+                name: 'rewardsPunishmentsOrder',
+                query: {
+                  id: row.examineProjectId
+                }
+              })
+            } else if (row.settleOrderType == 'PUNISH') {
+              this.$router.push({
+                name: 'penaltyWorkOrder',
+                params: {
+                  pageName: row.punishOrderId,
+                  pageType: 'detail',
+                  pageCode: row.punishOrderId
+                }
+              })
+            } else {
+              this.$router.push({
+                name: 'workOrderPool',
+                params: {
+                  pageName: row.orderBaseId,
+                  pageType: 'detail',
+                  pageCode: row.orderBaseId,
+                  pagePam: 'SettleAccounts'
+                }
+              })
+            }
+          }
+        }
+      })
+    },
 
-		poolData1() {
-			this.formDialogType = 0
-			this.openForm()
-		},
-		poolData2() {
-			if (this.recordSelected.length == 0) {
-				return this.$message.warning('请至少勾选一条数据！');
-			}
-			this.poolMore(this.recordSelected.map(item => { return item.id }))
-		},
-		openForm() {
-			this.formDialog = true;
-		},
-		formCancel() {
-			this.$refs.formRef.$refs.inlineForm.clearValidate()
-			this.$data.formData = this.$options.data().formData
-			this.formDialog = false
-		},
-		poolMore(ids){
-			this.$confirm('请确认是否批量汇总选中的数据, 是否继续?', '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning'
-			}).then(() => {
-				poolMore({
-					ids
-				}).then(res => {
-					this.$message({ type: 'success', message: `${this.formDialogTitles[this.formDialogType]}成功!` })
-					this.$refs.pageRef.refreshList()
-				})
-			});
-		},
-		formConfirm() {
-			this.$refs.formRef.validate((valid, invalidFields, errLabels) => {
-				if (valid) {
-					pool({
-						starDate: this.formData.starDate + ' 00:00:00',
-						endDate: this.formData.endDate + ' 23:59:59',
-						month: this.formData.month
-					}).then(res => {
-						this.$message({ type: 'success', message: `${this.formDialogTitles[this.formDialogType]}成功!` })
-						this.formCancel()
-						this.$refs.pageRef.refreshList()
-					})
-				}
-			})
-		}
-	}
+    poolData1() {
+      this.formDialogType = 0
+      this.openForm()
+    },
+    poolData2() {
+      if (this.recordSelected.length == 0) {
+        return this.$message.warning('请至少勾选一条数据！')
+      }
+      this.poolMore(
+        this.recordSelected.map(item => {
+          return item.id
+        })
+      )
+    },
+    openForm() {
+      this.formDialog = true
+    },
+    formCancel() {
+      this.$refs.formRef.$refs.inlineForm.clearValidate()
+      this.$data.formData = this.$options.data().formData
+      this.formDialog = false
+    },
+    poolMore(ids) {
+      this.$confirm('请确认是否批量汇总选中的数据, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        poolMore({
+          ids
+        }).then(res => {
+          this.$message({ type: 'success', message: `${this.formDialogTitles[this.formDialogType]}成功!` })
+          this.$refs.pageRef.refreshList()
+        })
+      })
+    },
+    formConfirm() {
+      this.$refs.formRef.validate((valid, invalidFields, errLabels) => {
+        if (valid) {
+          pool({
+            starDate: this.formData.starDate + ' 00:00:00',
+            endDate: this.formData.endDate + ' 23:59:59',
+            month: this.formData.month
+          }).then(res => {
+            this.$message({ type: 'success', message: `${this.formDialogTitles[this.formDialogType]}成功!` })
+            this.formCancel()
+            this.$refs.pageRef.refreshList()
+          })
+        }
+      })
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 .tab {
-	padding: 20px 20px 0 20px;
+  padding: 20px 20px 0 20px;
 }
 </style>

src/views/workOrder/settleAccountsManagement/summaryBill/detailList.vue

@@ -1,316 +1,379 @@
 <template>
-	<div class="s-page">
-		<el-page-header @back="goBack" :content="title"></el-page-header>
-		<el-divider></el-divider>
-		<!-- 筛选条件 -->
-		<div class="screen-container">
-			<!-- <div class="top clearfix"><div class="title fl">条件筛选</div></div> -->
-			<el-form ref="screenForm" :model="screenForm" label-width="110px" size="small" label-position="left">
-				<el-row :gutter="20">
-					<el-col :span="6">
-						<el-form-item label="工单号" prop="orderBaseId">
-							<el-input v-model="screenForm.orderBaseId" placeholder="请输入工单号"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="工单类型" prop="orderSmallType">
-							<el-select v-model="screenForm.orderSmallType" filterable placeholder="请选择工单类型">
-							   <el-option
-							     v-for="item in orderTypeList"
-							     :key="item.id"
-							     :label="item.orderSmallTypeText"
-							     :value="item.id">
-							   </el-option>
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="结算单类型" prop="settleOrderType">
-							<el-select v-model="screenForm.settleOrderType" filterable placeholder="请选择结算单类型">
-							   <el-option
-							     v-for="item in [{id: 'INSTALL',name:'安装'},{id: 'REPAIR',name:'维修'},{id: 'OTHER',name:'其他'},{id: 'EXAMINE',name:'奖罚单'}]"
-							     :key="item.id"
-							     :label="item.name"
-							     :value="item.id">
-							   </el-option>
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="工程师姓名" prop="workerName">
-							<el-input v-model="screenForm.workerName" placeholder="请输入工程师姓名"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="工程师身份证" prop="idcard">
-							<el-input v-model="screenForm.idcard" placeholder="请输入工程师身份证"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="工程师联系电话" prop="mobile">
-							<el-input v-model="screenForm.mobile" placeholder="请输入工程师联系电话"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="客户姓名" prop="customerName">
-							<el-input v-model="screenForm.customerName" placeholder="请输入客户姓名"></el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
-						<el-form-item label="客户电话" prop="customerMobile">
-							<el-input v-model="screenForm.customerMobile" placeholder="请输入客户电话"></el-input>
-						</el-form-item>
-					</el-col>
-				</el-row>
-				<el-row style="margin-bottom: 20px;" type="flex" justify="space-between">
-					<el-col :span="21">
-						<el-button size="small" type="primary" @click="getList()">刷新</el-button>
-						<el-button size="small" type="primary" @click="derive()">导出</el-button>
-					</el-col>
-					<el-col :span="3" style="display: flex;justify-content: flex-end;">
-						<el-button size="small" @click="resetScreenForm()">清空</el-button>
-						<el-button size="small" type="primary" @click="getList()">搜索</el-button>
-					</el-col>
-				</el-row>
-			</el-form>
-		</div>
-		<el-table :span-method="objectSpanMethod" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
-			<el-table-column prop="poolId" label="账单编号" align="center" width="180"></el-table-column>
-			<el-table-column prop="month" align="center" label="月份"></el-table-column>
-			<el-table-column prop="companyWechatName" align="center" label="所属商户" width="180"></el-table-column>
-			<el-table-column prop="websitName" align="center" label="网点名称" width="180"></el-table-column>
-			<el-table-column prop="workerName" align="center" label="工程师信息" width="110"></el-table-column>
-			<el-table-column prop="workerMobile" align="center" label="联系电话" width="140"></el-table-column>
-			<el-table-column prop="workerIdcard" align="center" label="身份证" width="180"></el-table-column>
-			<el-table-column prop="totalAmount" align="center" label="结算金额 (元)" width="110"></el-table-column>
-			<el-table-column prop="status" align="center" label="发放状态">
-				<template slot-scope="scope">
-					{{scope.row.status == 'NO'?'未发放':scope.row.status == 'YES'?'已发放':''}}
-				</template>
-			</el-table-column>
-			<el-table-column prop="poolCreateBy" align="center" label="汇总人" width="180"></el-table-column>
-			<el-table-column prop="poolCreateTime" align="center" label="汇总时间" width="160"></el-table-column>
-			<el-table-column prop="poolUpdateBy" align="center" label="发放人" width="180"></el-table-column>
-			<el-table-column prop="poolUpdateTime" align="center" label="发放时间" width="160"></el-table-column>
-			<el-table-column prop="orderBaseId" align="center" label="工单单号" width="220">
-				<template slot-scope="scope">
-					<div style="display: flex;text-align: left;" @click="copy(scope.row.orderBaseId)">
-						<el-button type="text">{{scope.row.orderBaseId}}</el-button>
-						<el-button type="text" style="margin-left: 10px;">复制</el-button>
-					</div>
-				</template>
-			</el-table-column>
-			<el-table-column prop="customerName" align="center" label="客户名字"></el-table-column>
-			<el-table-column prop="customerMobile" align="center" label="客户电话" width="110"></el-table-column>
-			<el-table-column prop="customerAddress" align="center" label="详细地址" width="350" show-overflow-tooltip></el-table-column>
-			<el-table-column prop="orderStatus" align="center" label="工单状态" width="120">
-				<template slot-scope="scope">
-					{{scope.row.orderStatus == 'DYY'?'待预约':scope.row.orderStatus == 'DSHPG'?'待商户派工':scope.row.orderStatus == 'DWDPG'?'待网点派工':scope.row.orderStatus == 'DJD'?'待接单':scope.row.orderStatus == 'FWZ'?'服务中':scope.row.orderStatus == 'YCD'?'异常单':scope.row.orderStatus == 'YWG'?'已完工待结算':scope.row.orderStatus == 'YJS'?'已结算':scope.row.orderStatus == 'YQX'?'已取消':''}}
-				</template>
-			</el-table-column>
-			<el-table-column prop="orderCreateTime" align="center" label="创建时间" width="160"></el-table-column>
-			<el-table-column prop="workerEndTime" align="center" label="完工时间" width="160"></el-table-column>
-			<el-table-column prop="orderTypeText" align="center" label="工单类型"></el-table-column>
-			<el-table-column prop="brand" align="center" label="产品品牌"></el-table-column>
-			<el-table-column prop="orderSource" align="center" label="工单来源"></el-table-column>
-			<el-table-column prop="parentCategoryName" align="center" label="产品大类"></el-table-column>
-			<el-table-column prop="categoryName" align="center" label="产品小类"></el-table-column>
-			<el-table-column prop="goodsName" align="center" label="机型名称"></el-table-column>
-			<el-table-column prop="orderNum" align="center" label="数量"></el-table-column>
-			<el-table-column prop="settleOrderType" align="center" label="结算单类型" width="110">
-				<template slot-scope="scope">
-					{{scope.row.settleOrderType == 'INSTALL'?'安装':scope.row.settleOrderType == 'REPAIR'?'维修':scope.row.settleOrderType == 'OTHER'?'其他':scope.row.settleOrderType == 'EXAMINE'?'奖罚单':''}}
-				</template>
-			</el-table-column>
-			<el-table-column prop="installLabel" align="center" label="安装功率"></el-table-column>
-			<el-table-column prop="installNormAmount" align="center" label="安装结算标准" width="110"></el-table-column>
-			<el-table-column prop="repairLabel" align="center" label="质保类型">
-				<template slot-scope="scope">
-					{{scope.row.repairLabel == 'INSIDE'?'保内':scope.row.repairLabel == 'OUT'?'保外':''}}
-				</template>
-			</el-table-column>
-			<el-table-column prop="repairAmount" align="center" label="维修上门费" width="110"></el-table-column>
-			<el-table-column prop="repairRate" align="center" label="维修费用结算比例" width="140"></el-table-column>
-			<el-table-column prop="repairSettleAmount" align="center" label="维修费用"></el-table-column>
-			<el-table-column prop="otherType" align="center" label="其他费用类型" width="110"></el-table-column>
-			<el-table-column prop="otherLabel" align="center" label="其他费用规格" width="110"></el-table-column>
-			<el-table-column prop="otherPrice" align="center" label="其他费用单价" width="110"></el-table-column>
-			<!-- <el-table-column prop="" align="center" label="其他费用结算数量" width="140"></el-table-column> -->
-			<el-table-column prop="examineProject" align="center" label="奖罚单考核项目" width="120"></el-table-column>
-			<el-table-column prop="examineType" align="center" label="奖罚单考核类型" width="120">
-				<template slot-scope="scope">
-					{{scope.row.examineType == 'PUNISH'?'惩罚':scope.row.examineType == 'REWARD'?'奖励':''}}
-				</template>
-			</el-table-column>
-			<el-table-column prop="settleNum" align="center" label="结算数量"></el-table-column>
-			<el-table-column prop="settleAmount" align="center" label="结算金额"></el-table-column>
-			<el-table-column prop="remark" align="center" label="备注"></el-table-column>
-			<el-table-column label="操作" align="center" width="80" fixed="right">
-				<template slot-scope="scope" v-if="scope.row.status == 'NO'">
-					<el-button type="text" style="color: #FF0000" @click="cancel(scope.row.orderId,scope.row.poolId)">驳回</el-button>
-				</template>
-			</el-table-column>
-		</el-table>
-	</div>
+  <div class="s-page">
+    <el-page-header @back="goBack" :content="title"></el-page-header>
+    <el-divider></el-divider>
+    <!-- 筛选条件 -->
+    <div class="screen-container">
+      <!-- <div class="top clearfix"><div class="title fl">条件筛选</div></div> -->
+      <el-form ref="screenForm" :model="screenForm" label-width="110px" size="small" label-position="left">
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="工单号" prop="orderBaseId">
+              <el-input v-model="screenForm.orderBaseId" placeholder="请输入工单号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="工单类型" prop="orderSmallType">
+              <el-select v-model="screenForm.orderSmallType" filterable placeholder="请选择工单类型">
+                <el-option
+                  v-for="item in orderTypeList"
+                  :key="item.id"
+                  :label="item.orderSmallTypeText"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="结算单类型" prop="settleOrderType">
+              <el-select v-model="screenForm.settleOrderType" filterable placeholder="请选择结算单类型">
+                <el-option
+                  v-for="item in [
+                    { id: 'INSTALL', name: '安装' },
+                    { id: 'REPAIR', name: '维修' },
+                    { id: 'OTHER', name: '其他' },
+                    { id: 'EXAMINE', name: '奖罚单' }
+                  ]"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="工程师姓名" prop="workerName">
+              <el-input v-model="screenForm.workerName" placeholder="请输入工程师姓名"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="工程师身份证" prop="idcard">
+              <el-input v-model="screenForm.idcard" placeholder="请输入工程师身份证"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="工程师联系电话" prop="mobile">
+              <el-input v-model="screenForm.mobile" placeholder="请输入工程师联系电话"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="客户姓名" prop="customerName">
+              <el-input v-model="screenForm.customerName" placeholder="请输入客户姓名"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="客户电话" prop="customerMobile">
+              <el-input v-model="screenForm.customerMobile" placeholder="请输入客户电话"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row style="margin-bottom: 20px" type="flex" justify="space-between">
+          <el-col :span="21">
+            <el-button size="small" type="primary" @click="getList()">刷新</el-button>
+            <el-button size="small" type="primary" @click="derive()">导出</el-button>
+          </el-col>
+          <el-col :span="3" style="display: flex; justify-content: flex-end">
+            <el-button size="small" @click="resetScreenForm()">清空</el-button>
+            <el-button size="small" type="primary" @click="getList()">搜索</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+    <el-table
+      :span-method="objectSpanMethod"
+      :data="dataList"
+      element-loading-text="Loading"
+      border
+      fit
+      highlight-current-row
+      stripe
+    >
+      <el-table-column prop="poolId" label="账单编号" align="center" width="180"></el-table-column>
+      <el-table-column prop="month" align="center" label="月份"></el-table-column>
+      <el-table-column prop="websitName" align="center" label="网点名称" width="180"></el-table-column>
+      <el-table-column prop="workerName" align="center" label="工程师信息" width="110"></el-table-column>
+      <el-table-column prop="workerMobile" align="center" label="联系电话" width="140"></el-table-column>
+      <el-table-column prop="workerIdcard" align="center" label="身份证" width="180"></el-table-column>
+      <el-table-column prop="totalAmount" align="center" label="结算金额 (元)" width="110"></el-table-column>
+      <el-table-column prop="status" align="center" label="发放状态">
+        <template slot-scope="scope">
+          {{ scope.row.status == 'NO' ? '未发放' : scope.row.status == 'YES' ? '已发放' : '' }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="poolCreateBy" align="center" label="汇总人" width="180"></el-table-column>
+      <el-table-column prop="poolCreateTime" align="center" label="汇总时间" width="160"></el-table-column>
+      <el-table-column prop="poolUpdateBy" align="center" label="发放人" width="180"></el-table-column>
+      <el-table-column prop="poolUpdateTime" align="center" label="发放时间" width="160"></el-table-column>
+      <el-table-column prop="orderBaseId" align="center" label="工单单号" width="220">
+        <template slot-scope="scope">
+          <div style="display: flex; text-align: left" @click="copy(scope.row.orderBaseId)">
+            <el-button type="text">{{ scope.row.orderBaseId }}</el-button>
+            <el-button type="text" style="margin-left: 10px">复制</el-button>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="customerName" align="center" label="客户名字"></el-table-column>
+      <el-table-column prop="customerMobile" align="center" label="客户电话" width="110"></el-table-column>
+      <el-table-column
+        prop="customerAddress"
+        align="center"
+        label="详细地址"
+        width="350"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column prop="orderStatus" align="center" label="工单状态" width="120">
+        <template slot-scope="scope">
+          {{
+            scope.row.orderStatus == 'DYY'
+              ? '待预约'
+              : scope.row.orderStatus == 'DSHPG'
+              ? '待商户派工'
+              : scope.row.orderStatus == 'DWDPG'
+              ? '待网点派工'
+              : scope.row.orderStatus == 'DJD'
+              ? '待接单'
+              : scope.row.orderStatus == 'FWZ'
+              ? '服务中'
+              : scope.row.orderStatus == 'YCD'
+              ? '异常单'
+              : scope.row.orderStatus == 'YWG'
+              ? '已完工待结算'
+              : scope.row.orderStatus == 'YJS'
+              ? '已结算'
+              : scope.row.orderStatus == 'YQX'
+              ? '已取消'
+              : ''
+          }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="orderCreateTime" align="center" label="创建时间" width="160"></el-table-column>
+      <el-table-column prop="workerEndTime" align="center" label="完工时间" width="160"></el-table-column>
+      <el-table-column prop="orderTypeText" align="center" label="工单类型"></el-table-column>
+      <el-table-column prop="brand" align="center" label="产品品牌"></el-table-column>
+      <el-table-column prop="orderSource" align="center" label="工单来源"></el-table-column>
+      <el-table-column prop="parentCategoryName" align="center" label="产品大类"></el-table-column>
+      <el-table-column prop="categoryName" align="center" label="产品小类"></el-table-column>
+      <el-table-column prop="goodsName" align="center" label="机型名称"></el-table-column>
+      <el-table-column prop="orderNum" align="center" label="数量"></el-table-column>
+      <el-table-column prop="settleOrderType" align="center" label="结算单类型" width="110">
+        <template slot-scope="scope">
+          {{
+            scope.row.settleOrderType == 'INSTALL'
+              ? '安装'
+              : scope.row.settleOrderType == 'REPAIR'
+              ? '维修'
+              : scope.row.settleOrderType == 'OTHER'
+              ? '其他'
+              : scope.row.settleOrderType == 'EXAMINE'
+              ? '奖罚单'
+              : ''
+          }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="installLabel" align="center" label="安装功率"></el-table-column>
+      <el-table-column prop="installNormAmount" align="center" label="安装结算标准" width="110"></el-table-column>
+      <el-table-column prop="repairLabel" align="center" label="质保类型">
+        <template slot-scope="scope">
+          {{ scope.row.repairLabel == 'INSIDE' ? '保内' : scope.row.repairLabel == 'OUT' ? '保外' : '' }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="repairAmount" align="center" label="维修上门费" width="110"></el-table-column>
+      <el-table-column prop="repairRate" align="center" label="维修费用结算比例" width="140"></el-table-column>
+      <el-table-column prop="repairSettleAmount" align="center" label="维修费用"></el-table-column>
+      <el-table-column prop="otherType" align="center" label="其他费用类型" width="110"></el-table-column>
+      <el-table-column prop="otherLabel" align="center" label="其他费用规格" width="110"></el-table-column>
+      <el-table-column prop="otherPrice" align="center" label="其他费用单价" width="110"></el-table-column>
+      <!-- <el-table-column prop="" align="center" label="其他费用结算数量" width="140"></el-table-column> -->
+      <el-table-column prop="examineProject" align="center" label="奖罚单考核项目" width="120"></el-table-column>
+      <el-table-column prop="examineType" align="center" label="奖罚单考核类型" width="120">
+        <template slot-scope="scope">
+          {{ scope.row.examineType == 'PUNISH' ? '惩罚' : scope.row.examineType == 'REWARD' ? '奖励' : '' }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="settleNum" align="center" label="结算数量"></el-table-column>
+      <el-table-column prop="settleAmount" align="center" label="结算金额"></el-table-column>
+      <el-table-column prop="remark" align="center" label="备注"></el-table-column>
+      <el-table-column label="操作" align="center" width="80" fixed="right">
+        <template slot-scope="scope" v-if="scope.row.status == 'NO'">
+          <el-button type="text" style="color: #ff0000" @click="cancel(scope.row.orderId, scope.row.poolId)"
+            >驳回</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
 </template>
 
 <script>
-	import { listPageV2,pageExport, cancel } from "@/api/workOrder/summaryBillDetail";
-	import { getTypeList } from "@/api/workOrder/settlementStandardInstall";
-	import { downloadFiles2 } from "@/utils/util.js";
-	export default {
-		props: ['id','title'],
-		data() {
-			return {
-				dataList: [],
-				orderTypeList: [],
-				cellList: [], // 单元格数组
-				count: null, // 计数
-				screenForm: {
-					customerMobile: '',
-					customerName: '',
-					idcard: '',
-					mobile: '',
-					orderSmallType: '',
-					orderBaseId: '',
-					settleOrderType: '',
-					workerName: '',
-				}
-			};
-		},
-		computed: {},
-		created() {
-			if(this.id){
-				this.getList()
-			}
-			this.getTypeList()
-		},
-		methods: {
-			// 返回
-			goBack() {
-				this.$emit('back');
-			},
-			getTypeList(){
-				getTypeList({pageNum: 1,pageSize: -1,params: [{param: 'a.order_type',compare: '=',value: 'INSTALL'},{param: 'a.status',compare: '=',value: true}]}).then(res => {
-					this.orderTypeList = res.data.records
-				})
-			},
-			derive(){
-				downloadFiles2('settle/order/export/pool/detail',{
-					id: this.id,
-					customerMobile: this.screenForm.customerMobile,
-					customerName: this.screenForm.customerName,
-					idcard: this.screenForm.idcard,
-					mobile: this.screenForm.mobile,
-					orderSmallType: this.screenForm.orderSmallType,
-					orderBaseId: this.screenForm.orderBaseId,
-					settleOrderType: this.screenForm.settleOrderType,
-					workerName: this.screenForm.workerName,
-				},'汇总结算单明细')
-			},
-			getList(){
-				this.cellList = []
-				this.count = null
-				listPageV2({
-					id: this.id,
-					customerMobile: this.screenForm.customerMobile,
-					customerName: this.screenForm.customerName,
-					idcard: this.screenForm.idcard,
-					mobile: this.screenForm.mobile,
-					orderSmallType: this.screenForm.orderSmallType,
-					orderBaseId: this.screenForm.orderBaseId,
-					settleOrderType: this.screenForm.settleOrderType,
-					workerName: this.screenForm.workerName,
-				}).then(res => {
-					this.dataList = res.data
-					this.computeCell(this.dataList)
-				})
-			},
-			cancel(id,poolId){
-				this.$confirm(`请确定是否驳回该数据, 是否继续?`, '提示', {
-					confirmButtonText: '确定',
-					cancelButtonText: '取消',
-					type: 'warning'
-				}).then(() => {
-					cancel({ids: [id],poolId}).then(res => {
-						if(res.code == 200){
-							this.$message.success('审核成功！')
-							this.goBack()
-						}
-					})
-				});
-			},
-			copy(row) {
-			    var oInput = document.createElement('input');
-			    oInput.value = row;
-			    document.body.appendChild(oInput);
-			    oInput.select();
-			    document.execCommand("Copy");
-			    oInput.className = 'oInput';
-			    oInput.style.display = 'none';
-				this.$message({
-					type: 'success',
-					message: '复制成功!'
-				});
-			},
-			// 重置筛选表单
-			resetScreenForm() {
-				this.$refs.screenForm.resetFields();
-				this.getList();
-			},
-			computeCell(tableBody) {
-				// 循环遍历表体数据
-				for (let i = 0; i < tableBody.length; i++) {
-					if (i == 0) {
-					// 先设置第一项
-					this.cellList.push(1); // 初为1，若下一项和此项相同，就往cellList数组中追加0
-					this.count = 0; // 初始计数为0
-					console.log("索引", 0, this.count);
-					} else {
-					// 判断当前项与上项的设备类别是否相同，因为是合并这一列的单元格
-					if (tableBody[i].workerName == tableBody[i - 1].workerName) {
-						// 如果相等
-						this.cellList[this.count] += 1; // 增加计数
-						this.cellList.push(0); // 相等就往cellList数组中追加0
-						console.log("索引", i, this.count);
-					} else {
-						this.cellList.push(1); // 不等就往cellList数组中追加1
-						this.count = i; // 将索引赋值为计数
-						console.log("索引", i, this.count);
-					}
-					}
-				}
-			},
-			// 第2步，将计算好的结果返回给el-table，这样的话表格就会根据这个结果做对应合并列渲染
-			objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-				// 给第二列做单元格合并。0是第一列，1是第二列。
-				if (columnIndex < 13) {
-					console.log("单元格数组，若下一项为0，则代表合并上一项", this.cellList);
-					const rowCell = this.cellList[rowIndex];
-					if (rowCell > 0) {
-					const colCell = 1;
-					console.log(`动态竖向合并单元格, 第${colCell}列，竖向合并${rowCell}个单元格 `);
-					return {
-						rowspan: rowCell,
-						colspan: colCell,
-					};
-					} else {
-					// 清除原有的单元格，必须要加，否则就会出现单元格会被横着挤到后面了！！！
-					// 本例中数据是写死的不会出现，数据若是动态后端获取的，就会出现了！！！
-					return {
-						rowspan: 0,
-						colspan: 0,
-					};
-					}
-				}
-			},
-		}
-	};
+import { listPageV2, pageExport, cancel } from '@/api/workOrder/summaryBillDetail'
+import { getTypeList } from '@/api/workOrder/settlementStandardInstall'
+import { downloadFiles2 } from '@/utils/util.js'
+export default {
+  props: ['id', 'title'],
+  data() {
+    return {
+      dataList: [],
+      orderTypeList: [],
+      cellList: [], // 单元格数组
+      count: null, // 计数
+      screenForm: {
+        customerMobile: '',
+        customerName: '',
+        idcard: '',
+        mobile: '',
+        orderSmallType: '',
+        orderBaseId: '',
+        settleOrderType: '',
+        workerName: ''
+      }
+    }
+  },
+  computed: {},
+  created() {
+    if (this.id) {
+      this.getList()
+    }
+    this.getTypeList()
+  },
+  methods: {
+    // 返回
+    goBack() {
+      this.$emit('back')
+    },
+    getTypeList() {
+      getTypeList({
+        pageNum: 1,
+        pageSize: -1,
+        params: [
+          { param: 'a.order_type', compare: '=', value: 'INSTALL' },
+          { param: 'a.status', compare: '=', value: true }
+        ]
+      }).then(res => {
+        this.orderTypeList = res.data.records
+      })
+    },
+    derive() {
+      downloadFiles2(
+        'settle/order/export/pool/detail',
+        {
+          id: this.id,
+          customerMobile: this.screenForm.customerMobile,
+          customerName: this.screenForm.customerName,
+          idcard: this.screenForm.idcard,
+          mobile: this.screenForm.mobile,
+          orderSmallType: this.screenForm.orderSmallType,
+          orderBaseId: this.screenForm.orderBaseId,
+          settleOrderType: this.screenForm.settleOrderType,
+          workerName: this.screenForm.workerName
+        },
+        '汇总结算单明细'
+      )
+    },
+    getList() {
+      this.cellList = []
+      this.count = null
+      listPageV2({
+        id: this.id,
+        customerMobile: this.screenForm.customerMobile,
+        customerName: this.screenForm.customerName,
+        idcard: this.screenForm.idcard,
+        mobile: this.screenForm.mobile,
+        orderSmallType: this.screenForm.orderSmallType,
+        orderBaseId: this.screenForm.orderBaseId,
+        settleOrderType: this.screenForm.settleOrderType,
+        workerName: this.screenForm.workerName
+      }).then(res => {
+        this.dataList = res.data
+        this.computeCell(this.dataList)
+      })
+    },
+    cancel(id, poolId) {
+      this.$confirm(`请确定是否驳回该数据, 是否继续?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        cancel({ ids: [id], poolId }).then(res => {
+          if (res.code == 200) {
+            this.$message.success('审核成功！')
+            this.goBack()
+          }
+        })
+      })
+    },
+    copy(row) {
+      var oInput = document.createElement('input')
+      oInput.value = row
+      document.body.appendChild(oInput)
+      oInput.select()
+      document.execCommand('Copy')
+      oInput.className = 'oInput'
+      oInput.style.display = 'none'
+      this.$message({
+        type: 'success',
+        message: '复制成功!'
+      })
+    },
+    // 重置筛选表单
+    resetScreenForm() {
+      this.$refs.screenForm.resetFields()
+      this.getList()
+    },
+    computeCell(tableBody) {
+      // 循环遍历表体数据
+      for (let i = 0; i < tableBody.length; i++) {
+        if (i == 0) {
+          // 先设置第一项
+          this.cellList.push(1) // 初为1，若下一项和此项相同，就往cellList数组中追加0
+          this.count = 0 // 初始计数为0
+          console.log('索引', 0, this.count)
+        } else {
+          // 判断当前项与上项的设备类别是否相同，因为是合并这一列的单元格
+          if (tableBody[i].workerName == tableBody[i - 1].workerName) {
+            // 如果相等
+            this.cellList[this.count] += 1 // 增加计数
+            this.cellList.push(0) // 相等就往cellList数组中追加0
+            console.log('索引', i, this.count)
+          } else {
+            this.cellList.push(1) // 不等就往cellList数组中追加1
+            this.count = i // 将索引赋值为计数
+            console.log('索引', i, this.count)
+          }
+        }
+      }
+    },
+    // 第2步，将计算好的结果返回给el-table，这样的话表格就会根据这个结果做对应合并列渲染
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      // 给第二列做单元格合并。0是第一列，1是第二列。
+      if (columnIndex < 13) {
+        console.log('单元格数组，若下一项为0，则代表合并上一项', this.cellList)
+        const rowCell = this.cellList[rowIndex]
+        if (rowCell > 0) {
+          const colCell = 1
+          console.log(`动态竖向合并单元格, 第${colCell}列，竖向合并${rowCell}个单元格 `)
+          return {
+            rowspan: rowCell,
+            colspan: colCell
+          }
+        } else {
+          // 清除原有的单元格，必须要加，否则就会出现单元格会被横着挤到后面了！！！
+          // 本例中数据是写死的不会出现，数据若是动态后端获取的，就会出现了！！！
+          return {
+            rowspan: 0,
+            colspan: 0
+          }
+        }
+      }
+    }
+  }
+}
 </script>
 
 <style scoped="scoped" lang="scss">
-	.s-page {
-		padding: 20px;
-		background-color: #ffffff;
-	}
-</style>
+.s-page {
+  padding: 20px;
+  background-color: #ffffff;
+}
+</style>

src/views/workOrder/settleAccountsManagement/summaryBill/index.vue

@@ -1,23 +1,32 @@
 <template>
-	<div class="page">
-		<template-page v-show="!formDialog" ref="pageRef" :get-list="getList" :table-attributes="tableAttributes"
-			:table-events="tableEvents" :operationColumnWidth="120" :options-evens-group="optionsEvensGroup"
-			:moreParameters="moreParameters" :column-parsing="columnParsing" :operation="operation()">
-			<!--  :exportList="exportList" -->
-			<div slot="moreSearch">
-				<el-radio-group v-model="status" size="mini" @change="changeType">
-					<el-radio-button label="">全部</el-radio-button>
-					<el-radio-button label="NO">待发放</el-radio-button>
-					<el-radio-button label="YES">已发放</el-radio-button>
-					<el-radio-button label="NOT">驳回</el-radio-button>
-				</el-radio-group>
-				<br><br>
-			</div>
-		</template-page>
-		<div class="detail" v-if="formDialog">
-			<detailList :id="id" @back="backList" :title="'汇总账单明细-' + id"></detailList>
-		</div>
-	</div>
+  <div class="page">
+    <template-page
+      v-show="!formDialog"
+      ref="pageRef"
+      :get-list="getList"
+      :table-attributes="tableAttributes"
+      :table-events="tableEvents"
+      :operationColumnWidth="120"
+      :options-evens-group="optionsEvensGroup"
+      :moreParameters="moreParameters"
+      :column-parsing="columnParsing"
+      :operation="operation()"
+    >
+      <!--  :exportList="exportList" -->
+      <div slot="moreSearch">
+        <el-radio-group v-model="status" size="mini" @change="changeType">
+          <el-radio-button label="">全部</el-radio-button>
+          <el-radio-button label="NO">待发放</el-radio-button>
+          <el-radio-button label="YES">已发放</el-radio-button>
+          <el-radio-button label="NOT">驳回</el-radio-button>
+        </el-radio-group>
+        <br /><br />
+      </div>
+    </template-page>
+    <div class="detail" v-if="formDialog">
+      <detailList :id="id" @back="backList" :title="'汇总账单明细-' + id"></detailList>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -26,222 +35,225 @@ import import_mixin from '@/components/template/import_mixin.js'
 import ImageUpload from '@/components/file-upload'
 import detailList from './detailList.vue'
 import { required, mobileRequired, mobile, httpUrl, email } from '@/components/template/rules_verify.js'
-import { listPageV2, pageExport, cancel, confirm } from "@/api/workOrder/summaryBill";
+import { listPageV2, pageExport, cancel, confirm } from '@/api/workOrder/summaryBill'
 import operation_mixin from '@/components/template/operation_mixin.js'
 export default {
-	components: { TemplatePage, ImageUpload, detailList },
-	mixins: [import_mixin, operation_mixin],
-	data() {
-		return {
-			// 表格属性
-			tableAttributes: {
-				// 启用勾选列
-				selectColumn: true,
-				selectable: this.selectable
-			},
-			// 表格事件
-			tableEvents: {
-				'selection-change': this.selectionChange
-			},
-			// 勾选选中行
-			recordSelected: [],
-			/** 表单变量 */
-			formDialogType: 0,
-			formDialogTitles: ["汇总"],
-			formDialog: false,
-			type: JSON.parse(localStorage.getItem('greemall_user')).type, //type=1商户, type=0网点
-			formData: {
-				companyName: JSON.parse(localStorage.getItem('greemall_user')).companyName,
-				month: (new Date().getFullYear()) + '-' + ((new Date().getMonth() + 1) > 9 ? (new Date().getMonth() + 1) : ('0' + (new Date().getMonth() + 1))),
-				createdTime: [],
-				starDate: '',
-				endDate: '',
-			},
-			status: '',
-			id: ''
-		}
-	},
-	computed: {
-		// 事件组合
-		optionsEvensGroup() {
-			return [
-				[
-					[
-						this.optionsEvensAuth("rejectPl", {
-							click: this.cancelMore
-						})
-					],
-					[
-						this.optionsEvensAuth("issuePl", {
-							click: this.confirmMore
-						})
-					]
-				]
-			]
-		},
-		// 更多参数
-		moreParameters() {
-			return []
-		},
-		formItems() {
-			return [{
-				md: 24,
-				isShow: true,
-				name: 'el-input',
-				attributes: { placeholder: '请输入', disabled: true },
-				formItemAttributes: {
-					label: '所属商户',
-					prop: 'companyName',
-					rules: [...required]
-				},
-			}, {
-				md: 24,
-				isShow: true,
-				name: 'el-input',
-				attributes: { placeholder: '请输入', disabled: true },
-				formItemAttributes: {
-					label: '月份',
-					prop: 'month',
-					rules: [...required]
-				}
-			}, {
-				md: 24,
-				isShow: true,
-				name: 'slot-component',
-				attributes: { placeholder: '请选择', },
-				formItemAttributes: {
-					label: '创建结算单时间',
-					prop: 'createdTime',
-					rules: [...required]
-				},
-				render: (h, { props, onInput }) => {
-					var { value } = props
-					return (
-						<el-date-picker
-							v-model={this.formData.createdTime}
-							type="daterange"
-							range-separator="至"
-							start-placeholder="开始日期"
-							end-placeholder="结束日期"
-							onChange={e => {
-								this.formData.starDate = e[0]
-								this.formData.endDate = e[1]
-							}}>
-						</el-date-picker>
-					)
-				}
-			}]
-		}
-	},
-	methods: {
-		// 切换状态
-		changeType(val) {
-			this.$refs.pageRef.refreshList()
-		},
-		backList() {
-			this.id = ''
-			this.formDialog = false;
-			this.$refs.pageRef.refreshList()
-		},
-		selectable(row, index) {
-			return ["NO"].includes(Object.entries(row.selectMapData.status).find(([key, val]) => val == row.status)?.[0])
-		},
-		// 列表请求函数
-		getList(p, cb) {
-			try {
-				var pam = JSON.parse(JSON.stringify(p))
-				pam.params.push({ 'param': 'a.status', "compare": "=", "value": this.status })
-				cb && cb(pam)
-				return listPageV2(pam)
-			} catch (error) {
-				console.log(error)
-			}
-		},
-		// 列表导出函数
-		exportList: pageExport,
-		// 表格列解析渲染数据更改
-		columnParsing(item, defaultData) {
-			return defaultData
-		},
-		// 监听勾选变化
-		selectionChange(data) {
-			this.recordSelected = data
-		},
+  components: { TemplatePage, ImageUpload, detailList },
+  mixins: [import_mixin, operation_mixin],
+  data() {
+    return {
+      // 表格属性
+      tableAttributes: {
+        // 启用勾选列
+        selectColumn: true,
+        selectable: this.selectable
+      },
+      // 表格事件
+      tableEvents: {
+        'selection-change': this.selectionChange
+      },
+      // 勾选选中行
+      recordSelected: [],
+      /** 表单变量 */
+      formDialogType: 0,
+      formDialogTitles: ['汇总'],
+      formDialog: false,
+      type: JSON.parse(localStorage.getItem('greemall_user')).type, //type=1商户, type=0网点
+      formData: {
+        companyName: JSON.parse(localStorage.getItem('greemall_user')).companyName,
+        month:
+          new Date().getFullYear() +
+          '-' +
+          (new Date().getMonth() + 1 > 9 ? new Date().getMonth() + 1 : '0' + (new Date().getMonth() + 1)),
+        createdTime: [],
+        starDate: '',
+        endDate: ''
+      },
+      status: '',
+      id: ''
+    }
+  },
+  computed: {
+    // 事件组合
+    optionsEvensGroup() {
+      return [
+        [
+          [
+            this.optionsEvensAuth('rejectPl', {
+              click: this.cancelMore
+            })
+          ],
+          [
+            this.optionsEvensAuth('issuePl', {
+              click: this.confirmMore
+            })
+          ]
+        ]
+      ]
+    },
+    // 更多参数
+    moreParameters() {
+      return []
+    },
+    formItems() {
+      return [
+        {
+          md: 24,
+          isShow: true,
+          name: 'el-input',
+          attributes: { placeholder: '请输入', disabled: true },
+          formItemAttributes: {
+            label: '月份',
+            prop: 'month',
+            rules: [...required]
+          }
+        },
+        {
+          md: 24,
+          isShow: true,
+          name: 'slot-component',
+          attributes: { placeholder: '请选择' },
+          formItemAttributes: {
+            label: '创建结算单时间',
+            prop: 'createdTime',
+            rules: [...required]
+          },
+          render: (h, { props, onInput }) => {
+            var { value } = props
+            return (
+              <el-date-picker
+                v-model={this.formData.createdTime}
+                type="daterange"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                onChange={e => {
+                  this.formData.starDate = e[0]
+                  this.formData.endDate = e[1]
+                }}
+              ></el-date-picker>
+            )
+          }
+        }
+      ]
+    }
+  },
+  methods: {
+    // 切换状态
+    changeType(val) {
+      this.$refs.pageRef.refreshList()
+    },
+    backList() {
+      this.id = ''
+      this.formDialog = false
+      this.$refs.pageRef.refreshList()
+    },
+    selectable(row, index) {
+      return ['NO'].includes(Object.entries(row.selectMapData.status).find(([key, val]) => val == row.status)?.[0])
+    },
+    // 列表请求函数
+    getList(p, cb) {
+      try {
+        var pam = JSON.parse(JSON.stringify(p))
+        pam.params.push({ param: 'a.status', compare: '=', value: this.status })
+        cb && cb(pam)
+        return listPageV2(pam)
+      } catch (error) {
+        console.log(error)
+      }
+    },
+    // 列表导出函数
+    exportList: pageExport,
+    // 表格列解析渲染数据更改
+    columnParsing(item, defaultData) {
+      return defaultData
+    },
+    // 监听勾选变化
+    selectionChange(data) {
+      this.recordSelected = data
+    },
 
-		operation() {
-			return this.operationBtn({
-				detail: {
-					click: ({ row, index, column }) => {
-						this.id = row.id
-						this.formDialog = true
-					}
-				},
-				issue: {
-					conditions: ({ row, index, column }) => {
-						return row.status == 'NO'
-					},
-					click: ({ row, index, column }) => {
-						this.confirm([row.id])
-					}
-				},
-				reject: {
-					conditions: ({ row, index, column }) => {
-						return row.status == 'NO'
-					},
-					click: ({ row, index, column }) => {
-						this.cancel([row.id])
-					}
-				},
-			})
-		},
+    operation() {
+      return this.operationBtn({
+        detail: {
+          click: ({ row, index, column }) => {
+            this.id = row.id
+            this.formDialog = true
+          }
+        },
+        issue: {
+          conditions: ({ row, index, column }) => {
+            return row.status == 'NO'
+          },
+          click: ({ row, index, column }) => {
+            this.confirm([row.id])
+          }
+        },
+        reject: {
+          conditions: ({ row, index, column }) => {
+            return row.status == 'NO'
+          },
+          click: ({ row, index, column }) => {
+            this.cancel([row.id])
+          }
+        }
+      })
+    },
 
-
-		cancelMore() {
-			if (this.recordSelected.length == 0) {
-				return this.$message.warning('请至少勾选一条数据！');
-			}
-			this.cancel(this.recordSelected.map(item => { return item.id }))
-		},
-		cancel(ids) {
-			this.$confirm('请确认是否驳回选中的数据, 是否继续?', '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning'
-			}).then(() => {
-				cancel(ids).then(res => {
-					this.$message({ type: 'success', message: `驳回成功!` })
-					this.$refs.pageRef.refreshList()
-				})
-			});
-		},
-		confirmMore() {
-			if (this.recordSelected.length == 0) {
-				return this.$message.warning('请至少勾选一条数据！');
-			}
-			this.confirm(this.recordSelected.map(item => { return item.id }))
-		},
-		confirm(ids) {
-			this.$confirm('请确认是否发放选中的数据, 是否继续?', '提示', {
-				confirmButtonText: '确定',
-				cancelButtonText: '取消',
-				type: 'warning'
-			}).then(() => {
-				confirm(ids).then(res => {
-					this.$message({ type: 'success', message: `发放成功!` })
-					this.$refs.pageRef.refreshList()
-				})
-			});
-		}
-	}
+    cancelMore() {
+      if (this.recordSelected.length == 0) {
+        return this.$message.warning('请至少勾选一条数据！')
+      }
+      this.cancel(
+        this.recordSelected.map(item => {
+          return item.id
+        })
+      )
+    },
+    cancel(ids) {
+      this.$confirm('请确认是否驳回选中的数据, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        cancel(ids).then(res => {
+          this.$message({ type: 'success', message: `驳回成功!` })
+          this.$refs.pageRef.refreshList()
+        })
+      })
+    },
+    confirmMore() {
+      if (this.recordSelected.length == 0) {
+        return this.$message.warning('请至少勾选一条数据！')
+      }
+      this.confirm(
+        this.recordSelected.map(item => {
+          return item.id
+        })
+      )
+    },
+    confirm(ids) {
+      this.$confirm('请确认是否发放选中的数据, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        confirm(ids).then(res => {
+          this.$message({ type: 'success', message: `发放成功!` })
+          this.$refs.pageRef.refreshList()
+        })
+      })
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
 .tab {
-	padding: 20px 20px 0 20px;
+  padding: 20px 20px 0 20px;
 }
 
 .page {
-	height: 100%;
+  height: 100%;
 }
 </style>

src/views/workOrder/workOrderPool/detailModule/Payment/index.vue

@@ -319,7 +319,6 @@ export default {
                 labelStyle={{ width: '13%' }}
                 contentStyle={{ width: '37%' }}
               >
-                <el-descriptions-item label="所属商户">{formData.companyWechatName}</el-descriptions-item>
                 <el-descriptions-item label="申请单号">{formData.orderId}</el-descriptions-item>
                 <el-descriptions-item label="项目名称">{formData.rpProjectRepairName}</el-descriptions-item>
                 <el-descriptions-item label="工单单号">{formData.workerOrderId}</el-descriptions-item>