no message

src/views/auxiliaryFittings/purchasingManagement/components/inStorage.vue

@@ -1,24 +1,50 @@
 <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="({ M: '辅材入库单', P: '配件入库单' })[storageType]" width="100%" :modal="false" :visible.sync="formDialog"
-        :before-close="formCancel">
+      <el-dialog
+        :title="{ M: '辅材入库单', P: '配件入库单' }[storageType]"
+        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="formItems1">
+          <zj-form-module
+            title="单据信息"
+            label-width="120px"
+            :showPackUp="false"
+            :form-data="formData"
+            :form-items="formItems1"
+          >
           </zj-form-module>
-          <zj-form-module :title="({ M: '辅材信息', P: '配件信息' })[storageType]" label-width="120px" :showPackUp="false"
-            :form-data="formData" :form-items="formItems2">
+          <zj-form-module
+            :title="{ M: '辅材信息', P: '配件信息' }[storageType]"
+            label-width="120px"
+            :showPackUp="false"
+            :form-data="formData"
+            :form-items="formItems2"
+          >
           </zj-form-module>
         </zj-form-container>
         <div slot="footer" class="dialog-footer">
           <el-button size="mini" @click="formCancel">取 消</el-button>
-          <el-button v-if="~[0, 1].indexOf(formDialogType)" size="mini" @click="formConfirm" type="primary">确
-            定</el-button>
-          <el-button v-if="~[3].indexOf(formDialogType)" size="mini" @click="passExamination"
-            type="primary">审核通过</el-button>
+          <el-button v-if="~[0, 1].indexOf(formDialogType)" size="mini" @click="formConfirm" type="primary"
+            >确 定</el-button
+          >
+          <el-button v-if="~[3].indexOf(formDialogType)" size="mini" @click="passExamination" type="primary"
+            >审核通过</el-button
+          >
         </div>
       </el-dialog>
     </div>
@@ -29,13 +55,20 @@
 import TemplatePage from '@/components/template/template-page-1.vue'
 import import_mixin from '@/components/template/import_mixin.js'
 import operation_mixin from '@/components/template/operation_mixin.js'
-import form_tpl from "../mixins/form_tpl.js"
-import { websitPurchaseInList, websitPurchaseInListExport, websitPurchaseInAdd, websitPurchaseInEdit, websitPurchaseInConfirm, websitPurchaseInDetail } from "@/api/purchasingManagement.js"
+import form_tpl from '../mixins/form_tpl.js'
+import {
+  websitPurchaseInList,
+  websitPurchaseInListExport,
+  websitPurchaseInAdd,
+  websitPurchaseInEdit,
+  websitPurchaseInConfirm,
+  websitPurchaseInDetail
+} from '@/api/purchasingManagement.js'
 export default {
   props: {
     storageType: {
       type: String,
-      default: ""
+      default: ''
     }
   },
   components: { TemplatePage },
@@ -44,36 +77,36 @@ export default {
     return {
       formData: {
         companyWechatName: JSON.parse(localStorage.getItem('greemall_user')).companyName,
-        "companyWechatId": "",
-        "confirmBy": "",
-        "confirmTime": "",
-        "createBy": "",
-        "createTime": "",
-        "flag": "",
-        "goodsType": this.storageType,
-        "purchaseId": "",
-        "purchaseTime": "",
-        "remark": "",
-        "totalAmount": 0,
-        "updateBy": "",
-        "updateTime": "",
-        "venderId": "",
-        "venderName": "",
-        storageId:"",
-        "websitId": "",
-        "websitName": "",
+        companyWechatId: '',
+        confirmBy: '',
+        confirmTime: '',
+        createBy: '',
+        createTime: '',
+        flag: '',
+        goodsType: this.storageType,
+        purchaseId: '',
+        purchaseTime: '',
+        remark: '',
+        totalAmount: 0,
+        updateBy: '',
+        updateTime: '',
+        venderId: '',
+        venderName: '',
+        storageId: '',
+        websitId: '',
+        websitName: '',
         items: [],
         imageUrl: []
-      },
+      }
     }
   },
   methods: {
     // 列表请求函数
     getList(p, cb) {
       var pam = JSON.parse(JSON.stringify(p))
-      pam.params.push({ "param": "a.goods_type", "compare": "=", "value": this.storageType })
+      pam.params.push({ param: 'a.goods_type', compare: '=', value: this.storageType })
       if (pam.flag) {
-        pam.params.push({ "param": "a.flag", "compare": "=", "value": pam.flag })
+        pam.params.push({ param: 'a.flag', compare: '=', value: pam.flag })
       }
       cb && cb(pam)
       return websitPurchaseInList(pam)
@@ -85,7 +118,7 @@ export default {
       return this.operationBtn({
         edit: {
           conditions: ({ row, index, column }) => {
-            return row.flag == "SAVE"
+            return row.flag == 'SAVE'
           },
           click: ({ row, index, column }) => {
             this.getDetail(row.purchaseId, 1)
@@ -98,12 +131,12 @@ export default {
         },
         examine: {
           conditions: ({ row, index, column }) => {
-            return row.flag == "SAVE"
+            return row.flag == 'SAVE'
           },
           click: ({ row, index, column }) => {
             this.getDetail(row.purchaseId, 3)
           }
-        },
+        }
       })
     },
 
@@ -123,22 +156,28 @@ export default {
     formConfirm() {
       this.$refs.formRef.validate((valid, invalidFields, errLabels) => {
         if (valid) {
-          ([websitPurchaseInAdd, websitPurchaseInEdit][this.formDialogType])({
-            ...this.formData,
-            "goodsType": this.storageType,
-            imageUrl: this.formData.imageUrl.map(item => item.url).join(",")
-          }).then(res => {
-            this.$message({ type: 'success', message: `${this.formDialogTitles[this.formDialogType]}成功!` })
-            this.formCancel()
-            this.$refs.pageRef.refreshList()
-          })
+          ;[websitPurchaseInAdd, websitPurchaseInEdit]
+            [this.formDialogType]({
+              ...this.formData,
+              goodsType: this.storageType,
+              imageUrl: this.formData.imageUrl.map(item => item.url).join(',')
+            })
+            .then(res => {
+              this.$message({ type: 'success', message: `${this.formDialogTitles[this.formDialogType]}成功!` })
+              this.formCancel()
+              this.$refs.pageRef.refreshList()
+            })
         }
       })
     },
     passExamination() {
       this.$refs.formRef.validate((valid, invalidFields, errLabels) => {
         if (valid) {
-          websitPurchaseInConfirm({ purchaseId: this.formData.purchaseId, flag: "OK", storageId: this?.formData?.storageId  }).then(res => {
+          websitPurchaseInConfirm({
+            purchaseId: this.formData.purchaseId,
+            flag: 'OK',
+            storageId: this?.formData?.storageId
+          }).then(res => {
             this.$message({ type: 'success', message: `审核通过!` })
             this.formCancel()
             this.$refs.pageRef.refreshList()

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

@@ -793,7 +793,11 @@ export default {
                           }}
                         >
                           {this.getWebsitList.map(item => (
-                            <el-option key={item.websitId} label={item.name} value={item.websitId}></el-option>
+                            <el-option
+                              key={item.websitId}
+                              label={`(${item.websitId})${item.name}`}
+                              value={item.websitId}
+                            ></el-option>
                           ))}
                         </el-select>
                       </el-form-item>

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

@@ -41,7 +41,12 @@
                   placeholder="请选择"
                   style="width: 100%"
                 >
-                  <el-option v-for="item in websitList" :key="item.websitId" :label="item.name" :value="item">
+                  <el-option
+                    v-for="item in websitList"
+                    :key="item.websitId"
+                    :label="`(${item.websitId})${item.name}`"
+                    :value="item"
+                  >
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -374,7 +379,12 @@
           <el-col :span="6">
             <el-form-item label="网点名称" prop="websit_id">
               <el-select v-model="formData1.websit_id" @change="changeWebsit" placeholder="请选择" style="width: 100%">
-                <el-option v-for="item in websitList" :key="item.websitId" :label="item.name" :value="item.websitId">
+                <el-option
+                  v-for="item in websitList"
+                  :key="item.websitId"
+                  :label="`(${item.websitId})${item.name}`"
+                  :value="item.websitId"
+                >
                 </el-option>
               </el-select>
             </el-form-item>

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

@@ -41,7 +41,12 @@
                   placeholder="请选择"
                   style="width: 100%"
                 >
-                  <el-option v-for="item in websitList" :key="item.websitId" :label="item.name" :value="item">
+                  <el-option
+                    v-for="item in websitList"
+                    :key="item.websitId"
+                    :label="`(${item.websitId})${item.name}`"
+                    :value="item"
+                  >
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -478,7 +483,12 @@
           <el-col :span="6">
             <el-form-item label="网点名称" prop="websit_id">
               <el-select v-model="formData1.websit_id" @change="changeWebsit" placeholder="请选择" style="width: 100%">
-                <el-option v-for="item in websitList" :key="item.websitId" :label="item.name" :value="item.websitId">
+                <el-option
+                  v-for="item in websitList"
+                  :key="item.websitId"
+                  :label="`(${item.websitId})${item.name}`"
+                  :value="item.websitId"
+                >
                 </el-option>
               </el-select>
             </el-form-item>

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

@@ -45,7 +45,12 @@
                   placeholder="请选择"
                   style="width: 100%"
                 >
-                  <el-option v-for="item in websitList" :key="item.websitId" :label="item.name" :value="item">
+                  <el-option
+                    v-for="item in websitList"
+                    :key="item.websitId"
+                    :label="`(${item.websitId})${item.name}`"
+                    :value="item"
+                  >
                   </el-option>
                 </el-select>
               </el-form-item>

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

@@ -63,7 +63,12 @@
                   placeholder="请选择"
                   style="width: 100%"
                 >
-                  <el-option v-for="item in websitList" :key="item.websitId" :label="item.name" :value="item">
+                  <el-option
+                    v-for="item in websitList"
+                    :key="item.websitId"
+                    :label="`(${item.websitId})${item.name}`"
+                    :value="item"
+                  >
                   </el-option>
                 </el-select>
               </el-form-item>

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

@@ -45,7 +45,12 @@
                   placeholder="请选择"
                   style="width: 100%"
                 >
-                  <el-option v-for="item in websitList" :key="item.websitId" :label="item.name" :value="item">
+                  <el-option
+                    v-for="item in websitList"
+                    :key="item.websitId"
+                    :label="`(${item.websitId})${item.name}`"
+                    :value="item"
+                  >
                   </el-option>
                 </el-select>
               </el-form-item>

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

@@ -41,7 +41,12 @@
                   placeholder="请选择"
                   style="width: 100%"
                 >
-                  <el-option v-for="item in websitList" :key="item.websitId" :label="item.name" :value="item">
+                  <el-option
+                    v-for="item in websitList"
+                    :key="item.websitId"
+                    :label="`(${item.websitId})${item.name}`"
+                    :value="item"
+                  >
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -401,7 +406,12 @@
           <el-col :span="6">
             <el-form-item label="网点名称" prop="websit_id">
               <el-select v-model="formData1.websit_id" @change="changeWebsit" placeholder="请选择" style="width: 100%">
-                <el-option v-for="item in websitList" :key="item.websitId" :label="item.name" :value="item.websitId">
+                <el-option
+                  v-for="item in websitList"
+                  :key="item.websitId"
+                  :label="`(${item.websitId})${item.name}`"
+                  :value="item.websitId"
+                >
                 </el-option>
               </el-select>
             </el-form-item>

src/views/auxiliaryFittings/shop/components/PurchaseAdjustmentArea.vue

@@ -19,7 +19,12 @@
           :rules="[{ required: true, message: '请选择网点', trigger: 'change' }]"
         >
           <el-select v-model="dataForm.websitId" :disabled="formDisabled" placeholder="请选择网点" style="width: 100%">
-            <el-option v-for="(item, index) in authShop" :key="index" :label="item.name" :value="item.websitId" />
+            <el-option
+              v-for="(item, index) in authShop"
+              :key="index"
+              :label="`(${item.websitId})${item.name}`"
+              :value="item.websitId"
+            />
           </el-select>
         </el-form-item>
       </el-col>

src/views/auxiliaryFittings/shop/components/PurchaseApplyArea.vue

@@ -15,7 +15,12 @@
       <el-col :span="8">
         <el-form-item label="网点" prop="websitId">
           <el-select v-model="dataForm.websitId" :disabled="formDisabled" placeholder="请选择网点" style="width: 100%">
-            <el-option v-for="(item, index) in authShop" :key="index" :label="item.name" :value="item.websitId" />
+            <el-option
+              v-for="(item, index) in authShop"
+              :key="index"
+              :label="`(${item.websitId})${item.name}`"
+              :value="item.websitId"
+            />
           </el-select>
         </el-form-item>
       </el-col>

src/views/auxiliaryFittings/shop/components/PurchaseArea.vue

@@ -15,7 +15,12 @@
       <el-col :span="8">
         <el-form-item label="网点" prop="websitId">
           <el-select v-model="dataForm.websitId" :disabled="formDisabled" placeholder="请选择网点" style="width: 100%">
-            <el-option v-for="(item, index) in authShop" :key="index" :label="item.name" :value="item.websitId" />
+            <el-option
+              v-for="(item, index) in authShop"
+              :key="index"
+              :label="`(${item.websitId})${item.name}`"
+              :value="item.websitId"
+            />
           </el-select>
         </el-form-item>
       </el-col>

src/views/auxiliaryFittings/statement/shop-sale-sum/index.vue

@@ -16,7 +16,12 @@
             <el-form-item label="网点" prop="websitId">
               <el-select v-model="screenForm.websitId" filterable placeholder="网点" size="small">
                 <el-option label="全部" value="" />
-                <el-option v-for="(item, index) in shopList" :key="index" :label="item.name" :value="item.websitId" />
+                <el-option
+                  v-for="(item, index) in shopList"
+                  :key="index"
+                  :label="`(${item.websitId})${item.name}`"
+                  :value="item.websitId"
+                />
               </el-select>
             </el-form-item>
           </el-col>

src/views/auxiliaryFittings/vender/components/ShopPurchaseArea.vue

@@ -14,7 +14,12 @@
       <el-col :span="8">
         <el-form-item label="网点" prop="websitId">
           <el-select v-model="dataForm.websitId" :disabled="formDisabled" placeholder="请选择网点" style="width: 100%">
-            <el-option v-for="(item, index) in authShop" :key="index" :label="item.name" :value="item.websitId" />
+            <el-option
+              v-for="(item, index) in authShop"
+              :key="index"
+              :label="`(${item.websitId})${item.name}`"
+              :value="item.websitId"
+            />
           </el-select>
         </el-form-item>
       </el-col>

src/views/mallManagement/settleManagElecpay/index.vue

@@ -31,7 +31,7 @@
               </div>
               <el-descriptions :column="4" border>
                 <el-descriptions-item labelStyle="width:110px" label="网点名称">{{
-                  formData.websitName
+                  `(${formData.websitId})${formData.websitName}`
                 }}</el-descriptions-item>
                 <el-descriptions-item labelStyle="width:110px" label="订单单号">{{
                   formData.orderId

src/views/workOrder/automaticDispatchConfig/streetConfiguration/index.vue

@@ -187,8 +187,8 @@ export default {
       return [
         {
           name: 'el-select',
-          md: 6,
-          options: this.dataList,
+          md: 12,
+          options: this.dataList.map(item => ({ ...item, label: `(${item.value})${item.label}` })),
           attributes: {
             disabled: true,
             placeholder: '请选择',

src/views/workOrder/penaltyWorkOrder/index.vue

@@ -1,25 +1,32 @@
 <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()">
+    <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()"
+        >
         </template-page>
       </div>
-      <div v-if="~['add', 'detail'].indexOf(activeKey)" style="box-sizing: border-box;padding: 16px;">
+      <div v-if="~['add', 'detail'].indexOf(activeKey)" style="box-sizing: border-box; padding: 16px">
         <div>
           <zj-form-container ref="formRef" :form-data="formData">
-            <zj-form-module title="单据信息" :form-data="formData" :form-items="formItems">
-            </zj-form-module>
-            <zj-form-module title="客户信息" :form-data="formData" :form-items="basicInfo">
-            </zj-form-module>
-            <zj-form-module title="产品信息" :form-data="formData" :form-items="product">
-            </zj-form-module>
+            <zj-form-module title="单据信息" :form-data="formData" :form-items="formItems"> </zj-form-module>
+            <zj-form-module title="客户信息" :form-data="formData" :form-items="basicInfo"> </zj-form-module>
+            <zj-form-module title="产品信息" :form-data="formData" :form-items="product"> </zj-form-module>
             <zj-form-module title="负激励信息" label-width="120px" :form-data="formData" :form-items="pandanxinxi">
             </zj-form-module>
             <zj-form-module title="正激励信息" label-width="120px" :form-data="formData" :form-items="czpandanxinxi">
@@ -27,10 +34,20 @@
           </zj-form-container>
           <div slot="footer" class="dialog-footer">
             <el-button size="mini" @click="data.removeTab">取 消</el-button>
-            <el-button v-if="!formData.status || formData.status == 'SAVE'" size="mini" type="primary"
-              @click="quedingbaocun(data.removeTab)">保存</el-button>
-            <el-button v-if="formData.status == 'SAVE'" size="mini" type="primary"
-              @click="quedingshenhe(data.removeTab)">审核</el-button>
+            <el-button
+              v-if="!formData.status || formData.status == 'SAVE'"
+              size="mini"
+              type="primary"
+              @click="quedingbaocun(data.removeTab)"
+              >保存</el-button
+            >
+            <el-button
+              v-if="formData.status == 'SAVE'"
+              size="mini"
+              type="primary"
+              @click="quedingshenhe(data.removeTab)"
+              >审核</el-button
+            >
           </div>
         </div>
       </div>
@@ -42,12 +59,19 @@
 import TemplatePage from '@/components/template/template-page-1.vue'
 import import_mixin from '@/components/template/import_mixin.js'
 import operation_mixin from '@/components/template/operation_mixin.js'
-import basicInfo from "./mixins/basicInfo"
-import productColumns from "./mixins/productColumns"
-import pandanxinxi from "./mixins/pandanxinxi"
-import czpandanxinxi from "./mixins/czpandanxinxi"
-import common_form from "./mixins/common_form"
-import { orderPunishList, orderPunishListExport, orderPunishExamine, orderPunishDelete, orderPunishDetail, orderPunishSave } from "@/api/penaltyWorkOrder";
+import basicInfo from './mixins/basicInfo'
+import productColumns from './mixins/productColumns'
+import pandanxinxi from './mixins/pandanxinxi'
+import czpandanxinxi from './mixins/czpandanxinxi'
+import common_form from './mixins/common_form'
+import {
+  orderPunishList,
+  orderPunishListExport,
+  orderPunishExamine,
+  orderPunishDelete,
+  orderPunishDetail,
+  orderPunishSave
+} from '@/api/penaltyWorkOrder'
 export default {
   components: { TemplatePage },
   mixins: [import_mixin, operation_mixin, basicInfo, productColumns, pandanxinxi, czpandanxinxi, common_form],
@@ -65,56 +89,56 @@ export default {
       // 勾选选中行
       recordSelected: [],
       formData: {
-        "address": "",
-        "area": "",
-        "areaId": "",
-        "city": "",
-        "cityId": "",
-        "disposeOrderBaseId": "",
-        "disposeOrderSmallType": "",
-        "disposeOrderSmallTypeText": "",
-        "disposeWebsitId": "",
-        "disposeWebsitName": "",
-        "disposeWorkerId": "",
-        "disposeWorkerMobile": "",
-        "disposeWorkerName": "",
-        "examineBy": "",
-        "examineRemark": "",
-        "examineTime": "",
-        "fileUrls": [],
-        "id": "",
-        "linkName": "",
-        "orderBaseId": "",
-        "orderSmallType": "",
-        "orderSmallTypeText": "",
-        "province": "",
-        "provinceId": "",
-        "punishOrderProducts": [
+        address: '',
+        area: '',
+        areaId: '',
+        city: '',
+        cityId: '',
+        disposeOrderBaseId: '',
+        disposeOrderSmallType: '',
+        disposeOrderSmallTypeText: '',
+        disposeWebsitId: '',
+        disposeWebsitName: '',
+        disposeWorkerId: '',
+        disposeWorkerMobile: '',
+        disposeWorkerName: '',
+        examineBy: '',
+        examineRemark: '',
+        examineTime: '',
+        fileUrls: [],
+        id: '',
+        linkName: '',
+        orderBaseId: '',
+        orderSmallType: '',
+        orderSmallTypeText: '',
+        province: '',
+        provinceId: '',
+        punishOrderProducts: [
           {
-            "brandId": "",
-            "brandName": "",
-            "insideCode": "",
-            "mainId": "",
-            "mainName": "",
-            "outCode": "",
-            "punishOrderId": "",
-            "smallId": "",
-            "smallName": "",
-            "specsName": "",
+            brandId: '',
+            brandName: '',
+            insideCode: '',
+            mainId: '',
+            mainName: '',
+            outCode: '',
+            punishOrderId: '',
+            smallId: '',
+            smallName: '',
+            specsName: ''
           }
         ],
-        "punishOrderWorkers": [],
-        "remark": "",
+        punishOrderWorkers: [],
+        remark: '',
         // "status": "",
-        "street": "",
-        "streetId": "",
-        "totalAmount": "",
-        "userMobile": "",
-        "userMobile2": "",
-        "userName": "",
-        "websitId": "",
-        "websitName": "",
-      },
+        street: '',
+        streetId: '',
+        totalAmount: '',
+        userMobile: '',
+        userMobile2: '',
+        userName: '',
+        websitId: '',
+        websitName: ''
+      }
     }
   },
   computed: {
@@ -131,11 +155,11 @@ export default {
               click: () => {
                 this.$refs.tabPage.addTab({
                   // 对应显示的模块
-                  activeKey: "add",
+                  activeKey: 'add',
                   // 唯一标识
-                  key: "add",
+                  key: 'add',
                   // 页签名称
-                  label: "新增",
+                  label: '新增',
                   // 打开时事件
                   triggerEvent: () => {
                     this.handleClose()
@@ -144,42 +168,42 @@ export default {
                     })
                   },
                   // 关闭时事件
-                  closeEvent: () => { }
+                  closeEvent: () => {}
                 })
               }
             })
           ]
         ]
       ]
-    },
+    }
   },
   mounted() {
     this.initFun()
   },
   methods: {
     initFun() {
-      if (this.pageType == "detail") {
+      if (this.pageType == 'detail') {
         this.$refs.tabPage.addTab({
           // 对应显示的模块
-          activeKey: "detail",
+          activeKey: 'detail',
           // 唯一标识
-          key: "detail",
+          key: 'detail',
           // 页签名称
-          label: "详情",
+          label: '详情',
           // 打开时事件
           triggerEvent: () => {
             this.handleClose()
             this.$nextTick(() => {
               orderPunishDetail({ id: this.pageCode }).then(res => {
                 Object.assign(this.formData, res.data, {
-                  fileUrls: res.data.fileUrls ? res.data.fileUrls.split(",").map(url => ({ url })) : []
+                  fileUrls: res.data.fileUrls ? res.data.fileUrls.split(',').map(url => ({ url })) : []
                 })
                 this.openForm()
               })
             })
           },
           // 关闭时事件
-          closeEvent: () => { }
+          closeEvent: () => {}
         })
       }
     },
@@ -214,7 +238,7 @@ export default {
         if (valid) {
           orderPunishSave({
             ...this.formData,
-            fileUrls: this.formData.fileUrls.map(item => item.url).join(",")
+            fileUrls: this.formData.fileUrls.map(item => item.url).join(',')
           }).then(res => {
             this.$message({
               type: 'success',
@@ -231,7 +255,7 @@ export default {
     quedingshenhe(removeTab) {
       orderPunishExamine({
         id: this.formData.id,
-        status: "OK",
+        status: 'OK'
       }).then(res => {
         this.$message({
           type: 'success',
@@ -249,32 +273,32 @@ export default {
           click: ({ row, index, column }) => {
             this.$refs.tabPage.addTab({
               // 对应显示的模块
-              activeKey: "detail",
+              activeKey: 'detail',
               // 唯一标识
-              key: "detail",
+              key: 'detail',
               // 页签名称
-              label: "详情",
+              label: '详情',
               // 打开时事件
               triggerEvent: () => {
                 this.handleClose()
                 this.$nextTick(() => {
                   orderPunishDetail({ id: row.id }).then(res => {
                     Object.assign(this.formData, res.data, {
-                      fileUrls: res.data.fileUrls ? res.data.fileUrls.split(",").map(url => ({ url })) : []
+                      fileUrls: res.data.fileUrls ? res.data.fileUrls.split(',').map(url => ({ url })) : []
                     })
                     this.openForm()
                   })
                 })
               },
               // 关闭时事件
-              closeEvent: () => { }
+              closeEvent: () => {}
             })
           }
         },
         del: {
-          prompt: "是否确定删除？",
+          prompt: '是否确定删除？',
           conditions: ({ row, index, column }) => {
-            return row.status != "OK"
+            return row.status != 'OK'
           },
           click: ({ row, index, column }) => {
             orderPunishDelete({ id: row.id }).then(res => {
@@ -287,7 +311,7 @@ export default {
           }
         }
       })
-    },
+    }
   }
 }
 </script>

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

@@ -194,7 +194,7 @@ export default {
         },
         {
           name: 'el-select-add',
-          options: this.websitList,
+          options: this.websitList.map(item => ({ ...item, label: `(${item.value})${item.label}` })),
           md: 6,
           attributes: {
             placeholder: '请选择',

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

@@ -145,9 +145,11 @@ export default {
                 placeholder="请选择"
                 style="width: 100%;"
               >
-                {this.websitList.map((item, index) => {
-                  return <el-option key={item.websitId} label={item.name} value={item}></el-option>
-                })}
+                {this.websitList
+                  .map(item => ({ ...item, label: `(${item.websitId})${item.name}` }))
+                  .map((item, index) => {
+                    return <el-option key={item.websitId} label={item.label} value={item}></el-option>
+                  })}
               </el-select>
             )
           }

src/views/workOrder/workOrderPool/detailModule/PartsApplication/formModule.vue

@@ -1,6 +1,9 @@
 <template>
   <zj-form-module :title="'申请信息' + (index + 1)" :form-data="item" :form-items="formItems">
-    <div v-if="item.status == 'ING'" style="text-align:right;box-sizing:border-box;padding-bottom: 10px; padding-right: 10px;">
+    <div
+      v-if="item.status == 'ING'"
+      style="text-align: right; box-sizing: border-box; padding-bottom: 10px; padding-right: 10px"
+    >
       <el-button size="mini" plain @click="quxiao">取消申请</el-button>
       <el-button size="mini" type="primary" plain @click="daohuo">到货反馈</el-button>
     </div>
@@ -8,27 +11,31 @@
 </template>
 
 <script>
-import editTable from "@/components/template/editTable.js"
-import { orderPartsApplyItemModify, orderPartsApplyCancel, orderPartsApplyEnd, orderPartsApplyItemDel } from "@/api/workOrderPool.js";
+import editTable from '@/components/template/editTable.js'
+import {
+  orderPartsApplyItemModify,
+  orderPartsApplyCancel,
+  orderPartsApplyEnd,
+  orderPartsApplyItemDel
+} from '@/api/workOrderPool.js'
 export default {
   props: {
     id: {
       type: [String, Number],
-      default: null,
+      default: null
     },
     item: {
       type: Object,
-      default: ()=>({}),
+      default: () => ({})
     },
     index: {
       type: [String, Number],
-      default: null,
-    },
+      default: null
+    }
   },
   mixins: [editTable],
   data() {
-    return {
-    }
+    return {}
   },
   computed: {
     formItems() {
@@ -37,7 +44,7 @@ export default {
           name: 'el-input',
           md: 6,
           attributes: { disabled: true, placeholder: '-' },
-          formItemAttributes: { label: '申请单号', prop: 'id' },
+          formItemAttributes: { label: '申请单号', prop: 'id' }
         },
         {
           name: 'slot-component',
@@ -45,44 +52,50 @@ export default {
           formItemAttributes: { label: '申请状态', prop: 'status' },
           render: (h, { props, onInput }) => {
             var { value } = props
-            return <el-input disabled={true} value={({ING:"申请中",END:"到货反馈",CANCEL:"取消申请"})[value]} placeholder=""></el-input>
+            return (
+              <el-input
+                disabled={true}
+                value={{ ING: '申请中', END: '到货反馈', CANCEL: '取消申请' }[value]}
+                placeholder=""
+              ></el-input>
+            )
           }
         },
         {
           name: 'el-input',
           md: 6,
           attributes: { disabled: true, placeholder: '-' },
-          formItemAttributes: { label: '申请人', prop: 'createBy' },
+          formItemAttributes: { label: '申请人', prop: 'createBy' }
         },
         {
           name: 'el-input',
           md: 6,
           attributes: { disabled: true, placeholder: '-' },
-          formItemAttributes: { label: '申请时间', prop: 'createTime' },
+          formItemAttributes: { label: '申请时间', prop: 'createTime' }
         },
         {
           name: 'el-input',
           md: 6,
           attributes: { disabled: true, placeholder: '-' },
-          formItemAttributes: { label: '取消人', prop: 'cancelBy' },
+          formItemAttributes: { label: '取消人', prop: 'cancelBy' }
         },
         {
           name: 'el-input',
           md: 6,
           attributes: { disabled: true, placeholder: '-' },
-          formItemAttributes: { label: '取消时间', prop: 'cancelTime' },
+          formItemAttributes: { label: '取消时间', prop: 'cancelTime' }
         },
         {
           name: 'el-input',
           md: 6,
           attributes: { disabled: true, placeholder: '-' },
-          formItemAttributes: { label: '反馈人', prop: 'confirmBy' },
+          formItemAttributes: { label: '反馈人', prop: 'confirmBy' }
         },
         {
           name: 'el-input',
           md: 6,
           attributes: { disabled: true, placeholder: '-' },
-          formItemAttributes: { label: '反馈时间', prop: 'confirmTime' },
+          formItemAttributes: { label: '反馈时间', prop: 'confirmTime' }
         },
         {
           name: 'el-input',
@@ -95,7 +108,7 @@ export default {
           },
           formItemAttributes: {
             label: '备注',
-            prop: 'remark',
+            prop: 'remark'
           }
         },
         {
@@ -105,115 +118,133 @@ export default {
           render: (h, { props, onInput }) => {
             var { value } = props
             console.log(value)
-            return this.convertTableJson(value, [
-              {
-                columnAttributes: {
-                  label: '配件名称',
-                  prop: 'name',
-                  propName: 'name'
-                },
-                editRender: (h, { row, column, index }) => {
-                  return (
-                    <div class="redbordererr">
-                      <el-form-item label="" label-width="0px">
-                        <el-input value={row[column.columnAttributes.prop]} onInput={val => { row[column.columnAttributes.prop] = val }} placeholder="请输入内容"></el-input>
-                      </el-form-item>
-                    </div>
-                  )
+            return this.convertTableJson(
+              value,
+              [
+                {
+                  columnAttributes: {
+                    label: '配件名称',
+                    prop: 'name',
+                    propName: 'name'
+                  },
+                  editRender: (h, { row, column, index }) => {
+                    return (
+                      <div class="redbordererr">
+                        <el-form-item label="" label-width="0px">
+                          <el-input
+                            value={row[column.columnAttributes.prop]}
+                            onInput={val => {
+                              row[column.columnAttributes.prop] = val
+                            }}
+                            placeholder="请输入内容"
+                          ></el-input>
+                        </el-form-item>
+                      </div>
+                    )
+                  },
+                  viewRender: (h, { row, column, index }) => {
+                    return <div style="padding-left:10px">{row[column.columnAttributes.prop]}</div>
+                  }
                 },
-                viewRender: (h, { row, column, index }) => {
-                  return <div style="padding-left:10px">{row[column.columnAttributes.prop]}</div>
+                {
+                  columnAttributes: {
+                    label: '数量',
+                    prop: 'qty',
+                    propName: 'qty'
+                  },
+                  editRender: (h, { row, column, index }) => {
+                    return (
+                      <div class="redbordererr">
+                        <el-form-item label="" label-width="0px">
+                          <el-input
+                            value={row[column.columnAttributes.prop]}
+                            onInput={val => {
+                              row[column.columnAttributes.prop] = val
+                            }}
+                            placeholder="请输入内容"
+                            type="number"
+                          ></el-input>
+                        </el-form-item>
+                      </div>
+                    )
+                  },
+                  viewRender: (h, { row, column, index }) => {
+                    return <div style="padding-left:10px">{row[column.columnAttributes.prop]}</div>
+                  }
                 }
-              },
+              ],
               {
-                columnAttributes: {
-                  label: '数量',
-                  prop: 'qty',
-                  propName: 'qty'
-                },
-                editRender: (h, { row, column, index }) => {
-                  return (
-                    <div class="redbordererr">
-                      <el-form-item label="" label-width="0px">
-                        <el-input value={row[column.columnAttributes.prop]} onInput={val => { row[column.columnAttributes.prop] = val }} placeholder="请输入内容" type="number"></el-input>
-                      </el-form-item>
-                    </div>
-                  )
-                },
-                viewRender: (h, { row, column, index }) => {
-                  return <div style="padding-left:10px">{row[column.columnAttributes.prop]}</div>
-                }
+                isEdit: this.item.status == 'ING',
+                isAdd: false,
+                isDel: false // this.item.status == "ING",
               },
-            ], {
-              isEdit: this.item.status == "ING",
-              isAdd: false,
-              isDel: false // this.item.status == "ING",
-            }, {
-              confirm:({ row, column, index })=>{
-                orderPartsApplyItemModify({...row}).then(res=>{
-                  this.isEditTableIndex = -1
-                  this.$message({
-                    type: 'success',
-                    message: '保存成功'
+              {
+                confirm: ({ row, column, index }) => {
+                  orderPartsApplyItemModify({ ...row }).then(res => {
+                    this.isEditTableIndex = -1
+                    this.$message({
+                      type: 'success',
+                      message: '保存成功'
+                    })
                   })
-                })
-              },
-              delete:({ row, column, index },cb)=>{
-                orderPartsApplyItemDel({...row}).then(res=>{
-                  this.$message({
-                    type: 'success',
-                    message: '删除成功'
+                },
+                delete: ({ row, column, index }, cb) => {
+                  orderPartsApplyItemDel({ ...row }).then(res => {
+                    this.$message({
+                      type: 'success',
+                      message: '删除成功'
+                    })
+                    cb && cb()
                   })
-                  cb && cb()
-                })
-              },
-            })
+                }
+              }
+            )
           }
-        },
+        }
       ]
-    },
+    }
   },
   methods: {
-    quxiao(){
+    quxiao() {
       this.$confirm('是否确认取消?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(() => {
-        orderPartsApplyCancel({
-          id:this.item.id
-        }).then(res=>{
-          this.$message({
-            type: 'success',
-            message: '取消成功'
+      })
+        .then(() => {
+          orderPartsApplyCancel({
+            id: this.item.id
+          }).then(res => {
+            this.$message({
+              type: 'success',
+              message: '取消成功'
+            })
+            this.$emit('shuaxin')
           })
-          this.$emit("shuaxin")
         })
-      }).catch(() => {
-      });
+        .catch(() => {})
     },
-    daohuo(){
+    daohuo() {
       this.$confirm('是否确认反馈?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(() => {
-        orderPartsApplyEnd({
-          id:this.item.id
-        }).then(res=>{
-          this.$message({
-            type: 'success',
-            message: '反馈成功'
+      })
+        .then(() => {
+          orderPartsApplyEnd({
+            id: this.item.id
+          }).then(res => {
+            this.$message({
+              type: 'success',
+              message: '反馈成功'
+            })
+            this.$emit('shuaxin')
           })
-          this.$emit("shuaxin")
         })
-      }).catch(() => {
-      });
-    },
+        .catch(() => {})
+    }
   }
 }
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>

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

@@ -4,8 +4,7 @@
       <template v-if="payData.length">
         <zj-form-container>
           <template v-for="(item, index) in payData">
-            <formModule :item="payData[index]" :index="index" @shuaxin="shuaxin">
-            </formModule>
+            <formModule :item="payData[index]" :index="index" @shuaxin="shuaxin"> </formModule>
           </template>
         </zj-form-container>
       </template>
@@ -15,17 +14,17 @@
 </template>
 
 <script>
-import { orderPartsApplyRecord } from "@/api/workOrderPool.js";
-import formModule from "./formModule.vue"
+import { orderPartsApplyRecord } from '@/api/workOrderPool.js'
+import formModule from './formModule.vue'
 export default {
-  components:{
+  components: {
     formModule
   },
   props: {
     id: {
       type: [String, Number],
-      default: null,
-    },
+      default: null
+    }
   },
   data() {
     return {
@@ -38,19 +37,18 @@ export default {
         this.shuaxin()
       },
       deep: true,
-      immediate: true,
-    },
-  },
-  computed: {
+      immediate: true
+    }
   },
+  computed: {},
   methods: {
-    shuaxin(){
+    shuaxin() {
       orderPartsApplyRecord({
         orderId: this.id
       }).then(res => {
         this.payData = res.data || []
       })
-    },
+    }
   }
 }
 </script>
@@ -60,11 +58,11 @@ export default {
   box-sizing: border-box;
   padding-left: 16px;
 
-  ::v-deep &>.zj-page-fill-scroll {
+  ::v-deep & > .zj-page-fill-scroll {
     box-sizing: border-box;
     padding-right: 16px;
 
-    &>div:nth-child(1) {
+    & > div:nth-child(1) {
       margin-top: 20px;
     }
   }

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

@@ -76,7 +76,7 @@ export default {
                 labelStyle={{ width: '11%' }}
                 contentStyle={{ width: '22.3%' }}
               >
-                <el-descriptions-item label="网点名称">{formData.websitName}</el-descriptions-item>
+                <el-descriptions-item label="网点名称">{`(${formData.websitId})${formData.websitName}`}</el-descriptions-item>
                 <el-descriptions-item label="工单号">{formData.workerOrderId}</el-descriptions-item>
                 <el-descriptions-item label="工程师编号">
                   {formData.workerNumber || formData.workerId}

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

@@ -1197,10 +1197,21 @@ export default {
     repairInfo() {
       return [
         {
-          name: 'el-input',
+          name: 'slot-component',
           md: 6,
           attributes: { disabled: true },
-          formItemAttributes: { label: '网点名称', prop: 'websitName' }
+          formItemAttributes: { label: '网点名称', prop: 'websitName' },
+          render: (h, { props, onInput }) => {
+            var { formData } = props
+            return (
+              <el-input
+                value={`(${formData.websitId || ''})${formData.websitName || ''}`}
+                disabled={true}
+                size="mini"
+                placeholder="请输入"
+              ></el-input>
+            )
+          }
         },
         {
           name: 'el-input',

src/views/workOrder/workOrderPool/detailModule/workOrderInfo/mixins/dispatchInfo.js

@@ -101,7 +101,7 @@ export default {
             var { formData } = props
             return (
               <el-input
-                value={`${formData.websitName || ''}-${formData.websitId || ''}`}
+                value={`(${formData.websitId || ''})${formData.websitName || ''}`}
                 disabled={true}
                 size="mini"
                 placeholder="请输入"
@@ -109,7 +109,7 @@ export default {
             )
           },
           getValue: () => {
-            return `${this.orderInfo.websitName}  ${this.orderInfo.websitId}`
+            return `(${this.orderInfo.websitId})${this.orderInfo.websitName}`
           }
         },
         {

src/views/workOrder/workOrderPool/detailModule/workOrderInfo/mixins/pandanxinxi.js

@@ -74,7 +74,7 @@ export default {
           isShow:
             !this?.orderInfo?.isThreeOrder && this.formOptions.websitId.isShow && this.formOptions.websitId.isEdit,
           name: 'el-select',
-          options: this.websitList,
+          options: this.websitList.map(item => ({ ...item, label: `(${item.value})${item.label}` })),
           echoInsertion: true,
           md: 8,
           attributes: {

src/views/workOrder/workOrderPool/detailModule/workOrderInfo/mixins/serviceInfo.js

@@ -18,7 +18,7 @@ export default {
           isShow: this.formOptions.createWebsitId.isShow,
           name: 'el-select',
           md: 6,
-          options: this.createWebsitList,
+          options: this.createWebsitList.map(item => ({ ...item, label: `(${item.value})${item.label}` })),
           attributes: {
             disabled: !this.formOptions.createWebsitId.isEdit,
             placeholder: '请选择',