1、修改登录（暂时写死）

2、修改页面

.env.dev

@@ -1,6 +1,6 @@
 NODE_ENV = 'development'
 VUE_APP_BUILD_TYPE='dev'
-VUE_APP_SERVER_URL='http://s.dev01.dkiboss.com:8000/api'
+VUE_APP_SERVER_URL='http://localhost:9001'
 VUE_APP_UPLOAD_URL='http://localhost:9001/basic-server/file/upload'
 VUE_APP_LOGS_URL='https://ibossmp.dongkesoft.com:7050/logs'
 VUE_APP_IMG_URL='https://hgscrm-dev.oss-cn-shenzhen.aliyuncs.com/'

src/api/system/user/login.js

@@ -1,64 +1,91 @@
 import axios from '@/libs/base/api.request'
-import { request } from '@/api/base.js'
+import {request} from '@/api/base.js'
 import config from '@/config/index.js'
 import md5 from 'js-md5'
-import { Base64 } from 'js-base64'
+import {Base64} from 'js-base64'
 import iView from 'view-design'
 import store from '@/store'
 import qs from 'qs';
 
-export const login = ({ userCode, userPwd }) => {
+export const login = ({userCode, userPwd}) => {
 
   const data = {
-    'grant_type':'password',
-    'client_id':'f3ed0d90-3fc8-4eba-b83c-a0cfe54c174d',
-    'client_secret':'78e238b4-c199-49ad-b619-69b6a78959d8',
+    'grant_type': 'password',
+    'client_id': 'f3ed0d90-3fc8-4eba-b83c-a0cfe54c174d',
+    'client_secret': '78e238b4-c199-49ad-b619-69b6a78959d8',
     'username': userCode,
     'password': md5(userPwd)
   }
 
-  return new Promise(resolve => {
-
-    axios.request({
-      url: `oauth-server/oauth/token`,
-      data: qs.stringify(data),
-      method: 'post',
-      headers: {
-        'Content-Type': 'application/x-www-form-urlencoded'
+  const returnData = {
+    code: 200,
+    data: {
+      user: {
+        userCode: '测试',
+        userName: '测试'
       },
-    }).then(res=>{
-      if (res.data.code == 200) {
-        resolve(res.data)
-      } else {
-        resolve(res.data)
+      menu: [
+        {
+          levelCode: "#000#",
+          menuName: "首页",
+          menuUuid: "93d130dd-94f0-4665-b734-bb8080edd943",
+          menuTag: {
+            cache: true,
+            hideInMenu: true,
+            name: "home",
+          }
+        }
+      ],
+      setting: {
+        'HGHAP_OSS2': "https://hegii-hap.oss-cn-shenzhen.aliyuncs.com/",
+        'HGSCRM_OSS1': "https://hgscrm-dev.oss-cn-shenzhen.aliyuncs.com/"
       }
-    })
+    }
+  }
 
+  return new Promise(resolve => {
+    // TODO 暂时注释掉
+    // axios.request({
+    //   url: `oauth-server/oauth/token`,
+    //   data: qs.stringify(data),
+    //   method: 'post',
+    //   headers: {
+    //     'Content-Type': 'application/x-www-form-urlencoded'
+    //   },
+    // }).then(res => {
+    //   if (res.data.code == 200) {
+    //     console.log('3333',  res.data)
+    //     resolve(res.data)
+    //   } else {
+    //     resolve(res.data)
+    //   }
+    // })
+    resolve(returnData)
 
   })
 }
 
 
-export const getMenuList = (token,id) => {
+export const getMenuList = (token, id) => {
   return new Promise((resolve, reject) => {
     iView.LoadingBar.start()
     axios.request({
       url: config.dkAuthSysServerUrl + `user-server/user/menu/${id}`,
-      data:null,
+      data: null,
       method: 'post',
-      headers: { Authorization: token },
-    }).then(res=>{
+      headers: {Authorization: token},
+    }).then(res => {
       iView.LoadingBar.finish()
       if (res.headers.version && (localStorage.getItem('VERSION') == null || localStorage.getItem('VERSION') !== res.headers.version)) {
         console.log('update version')
         localStorage.setItem('VERSION', res.headers.version)
         iView.Message.info('系统即将自动升级')
-        setTimeout(function (){
+        setTimeout(function () {
           window.location.reload(true)
         }, 1000)
       }
       return res.data
-    },err => {
+    }, err => {
       reject(err)
     }).then((res) => {
       resolve(res)
@@ -66,14 +93,14 @@ export const getMenuList = (token,id) => {
   })
 }
 /* 不走请求的方法 */
-export const getMenuListStatic = (token,id) => {
+export const getMenuListStatic = (token, id) => {
   return new Promise((resolve, reject) => {
     iView.LoadingBar.start()
-    setTimeout(()=>{
+    setTimeout(() => {
       let obj = {
-        code:200,
-        message:'操作成功',
-        data:[
+        code: 200,
+        message: '操作成功',
+        data: [
           {
             'pageSize': null,
             'currentPage': null,
@@ -898,7 +925,7 @@ export const getMenuListStatic = (token,id) => {
         ]
       }
       resolve(obj)
-    },1000)
+    }, 1000)
   })
 }
 
@@ -907,7 +934,7 @@ export const logout = () => {
     url: '/user-server/core/user/logout',
     method: 'post',
     headers: {
-      Authorization: "Bearer "+store.state.user.token
+      Authorization: "Bearer " + store.state.user.token
     }
   })
 }

src/components/base/dk-table/dk-table-column.vue

@@ -89,6 +89,17 @@
     </template>
   </vxe-column>
 
+  <!--  图片  -->
+  <vxe-column :sortable="false" :id="id" type="image" align="center"
+              v-else-if="typeData === 'image'"
+              :class-name="classNameData" show-header-overflow show-footer-overflow
+              show-overflow="title" :min-width="minWidthData" :title="titleData"
+              :fixed="fixedData" :radioRight="radioRight" :width="widthData" :field="field">
+    <template #default="{row}">
+      <img :src="row[field]" style="width: 150px; height: 100px;"/>
+    </template>
+  </vxe-column>
+
   <!--  操作  -->
   <vxe-column :sortable="false" :id="id" type="operate" align="center"
               v-else-if="typeData === 'operate'"

src/components/main/components/side-menu/side-menu.vue

@@ -1,6 +1,8 @@
 <template>
   <div class="side-menu-wrapper">
-    <div style="width: calc(100% - 40px);padding-left:20px;padding-right:20px;position:absolute;bottom: 20px;display: flex;" :style="{justifyContent:collapsed?'start':'start'}">
+    <div
+      style="width: calc(100% - 40px);padding-left:20px;padding-right:20px;position:absolute;bottom: 20px;display: flex;"
+      :style="{justifyContent:collapsed?'start':'start'}">
       <Icon @click="changeCollapsed" :style="{transform:collapsed?'rotate(90deg)':'rotate(0deg)'}"
             style="margin-left: 1px;transition:.3s;font-size: 24px;color:#fff;cursor: pointer;" type="md-menu"/>
     </div>
@@ -13,14 +15,16 @@
           :theme="theme" width="auto" @on-select="handleSelect">
       <template v-for="item in menuListData">
         <template v-if="item.children && item.children.length === 1">
-          <side-menu-item v-if="showChildren(item)" :key="`menu-${item.name?item.name:JSON.stringify(item)}`" :parent-item="item"
+          <side-menu-item v-if="showChildren(item)" :key="`menu-${item.name?item.name:JSON.stringify(item)}`"
+                          :parent-item="item"
                           @enter="enter" @out="out"></side-menu-item>
           <menu-item v-else :name="getNameOrHref(item, true)" :key="`menu-${item.children[0].name}`">
             <common-icon :type="item.children[0].icon || ''"/>
             <span>{{ showTitle(item.children[0]) }}</span></menu-item>
         </template>
         <template v-else>
-          <side-menu-item v-if="showChildren(item)" :key="`menu-${item.name?item.name:JSON.stringify(item)}`" :parent-item="item"
+          <side-menu-item v-if="showChildren(item)" :key="`menu-${item.name?item.name:JSON.stringify(item)}`"
+                          :parent-item="item"
                           @enter="enter" @out="out"></side-menu-item>
           <menu-item v-else :name="getNameOrHref(item)" :key="`menu-${item.name?item.name:JSON.stringify(item)}`">
             <common-icon :type="item.icon || ''"/>
@@ -42,7 +46,8 @@
       </template>
     </div>
 
-    <div v-if="menuListData.length<=0" style="text-align: center;height: 100px;padding-top: 125px;color: #B3B9BF;font-size: 12px;">
+    <div v-if="menuListData.length<=0"
+         style="text-align: center;height: 100px;padding-top: 125px;color: #B3B9BF;font-size: 12px;">
       <Icon type="logo-dropbox" style="font-size: 28px;"/>
       <p>{{ $t('noMatchFunction') }}</p>
     </div>
@@ -85,7 +90,7 @@ export default {
         return []
       }
     },
-    mousePosition:{
+    mousePosition: {
       type: Array,
       default() {
         return []
@@ -136,7 +141,7 @@ export default {
      */
     changeCollapsed() {
       this.collapsed = !this.collapsed
-      this.$emit('on-collapsed-change',this.collapsed)
+      this.$emit('on-collapsed-change', this.collapsed)
     },
     /**
      *   @author : 寇珊珊
@@ -146,7 +151,9 @@ export default {
     mouseenter(it) {
       // console.log('mouseenter')
       //查询是否有权限设置hover属性
-      let functionList = JSON.parse(sessionStorage.getItem('menu'));
+      let menu = sessionStorage.getItem('menu');
+      if (!menu) return;
+      let functionList = JSON.parse(menu);
       if (!functionList) return;
       let name = it.name + '-add';
       let filterList = functionList.filter(it => it.menuTag && it.menuTag.name === name && !it.menuTag.modal);
@@ -178,14 +185,14 @@ export default {
       this.overTimer = setTimeout(() => {
         this.showDrawer(e, children)
       }, 300)
-      setTimeout(()=>{
+      setTimeout(() => {
         // console.log(this.mousePosition)
-        if(!this.mousePosition.map(it=>it.id).includes("side-menu-drawer")
-          && !this.mousePosition.map(it=>it.className).includes("side-menu-wrapper")
-          && !this.mousePosition.map(it=>it.className).includes("left-sider")){
+        if (!this.mousePosition.map(it => it.id).includes("side-menu-drawer")
+          && !this.mousePosition.map(it => it.className).includes("side-menu-wrapper")
+          && !this.mousePosition.map(it => it.className).includes("left-sider")) {
           this.showCard = false
         }
-      },1000)
+      }, 1000)
     },
 
     /**
@@ -432,7 +439,7 @@ export default {
 
 </style>
 <style scoped>
-.ivu-drawer-body{
+.ivu-drawer-body {
   background-color: #112037 !important;
 }
 </style>

src/locale/lang/zh-CN.js

@@ -1273,7 +1273,7 @@ export const columns = {
   ftyName:'工厂名称',
 
   staffStatusName:'员工状态',
-  staffStatus:'员工状态'
+  staffStatus:'员工状态',
 
 }
 

src/view/core/carr-kiln-car/index.vue

@@ -23,7 +23,7 @@
 
     <!--  查询条件区域  -->
     <div id="search-cond-div" ref="search-cond-div" style="margin-top: 1px;padding: 0">
-      <SearchCond ref="searchCond" v-model="searchCond" :type="this.$config.pageCode['position']"
+      <SearchCond ref="searchCond" v-model="searchCond"
                   @collapse-change="collapseChange" :set-flag="false"
                   :search-content="searchContent"></SearchCond>
     </div>
@@ -31,15 +31,14 @@
       <DkTable :id="'table-'+$options.name" ref="table-select" :data="tableData"
                :pageFlag=false
                :multiple="false"
-               :height="this.tableHeight" primaryKey="carId"
-               name="table">
+               :height="this.tableHeight" primaryKey="carId">
         <DkTableColumn field="carCode" ></DkTableColumn>
         <DkTableColumn field="carNo" ></DkTableColumn>
         <DkTableColumn field="kilnName" ></DkTableColumn>
         <DkTableColumn field="ftyName" ></DkTableColumn>
-        <DkTableColumn field="flgValid" type="switch" :title="$t('flgValid')" @on-switch-change="onSwitchChange"
-                       :switch-disabled=false min-width="100px"></DkTableColumn>
-        <DkTableColumn field="remarks" min-width="200" width="auto" :filter=false></DkTableColumn>
+        <DkTableColumn field="flgValid" type="switch"  @on-switch-change="onSwitchChange"
+                       :switch-disabled="false" ></DkTableColumn>
+        <DkTableColumn field="remarks" width="auto"></DkTableColumn>
       </DkTable>
     </div>
     <!--新建编辑-->
@@ -51,33 +50,25 @@
       :saveFlag="true"
       :title=modalTitle
     >
-      <DkForm ref="formInline" style="width:100%;" name="dk-form" v-model="formData">
+      <DkForm ref="formInline" v-model="formData" :col-count="1">
         <!--    窑车编码    -->
-        <DkFormItem prop="carCode" style="margin-top: 10px;" :required="true">
+        <DkFormItem prop="carCode"  :required="true">
           <InputPop v-model="formData.carCode" ref="carCode"/>
         </DkFormItem>
         <!--    窑车序号    -->
-        <DkFormItem prop="carNo" style="margin-top: 10px;" :required="true">
+        <DkFormItem prop="carNo"  :required="true">
           <InputPop v-model="formData.carNo" ref="carNo"/>
         </DkFormItem>
         <!--    窑炉    -->
-        <DkFormItem prop="kilnId" style="margin-top: 10px;" :required="true" :data-type="this.$config.dataType.number">
+        <DkFormItem prop="kilnId"  :required="true" :label="$t('equipKiln')" :data-type="this.$config.dataType.number">
           <SelectPop v-model="formData.kilnId" ref="ftyId" :multiple="false"
                      :options="kilnList"
                      labelKey="kilnName"
                      valueKey="kilnId">
           </SelectPop>
         </DkFormItem>
-        <!--    工厂    -->
-        <DkFormItem prop="ftyId" style="margin-top: 10px;" :required="true" :data-type="this.$config.dataType.number">
-          <SelectPop v-model="formData.ftyId" ref="ftyId" :multiple="false"
-                     :options="ftyList"
-                     labelKey="ftyName"
-                     valueKey="ftyId">
-          </SelectPop>
-        </DkFormItem>
         <!--    备注    -->
-        <DkFormItem prop="remarks" style="margin-top: 10px;">
+        <DkFormItem prop="remarks" >
           <InputPop v-model="formData.remarks" textareaFlag/>
         </DkFormItem>
       </DkForm>
@@ -110,10 +101,6 @@
           {kilnId: 1, kilnName: '窑车1'},
           {kilnId: 2, kilnName: '窑车2'},
         ],
-        ftyList: [
-          {ftyId: 1, ftyName: '工厂1'},
-          {ftyId: 2, ftyName: '工厂2'},
-        ],
         searchContent: [
           {
             itemName: 'categoryName',
@@ -136,6 +123,16 @@
       }
     },
     methods: {
+      /*************************************************一览界面操作start*******************************************/
+      /**
+       *   @desc   : 分页变化
+       *   @date   : 2022/12/20 15:00
+       *   @author : 寇珊珊
+       */
+      pageSizeChange(pageInfo) {
+        this.pageInfo = pageInfo
+        this.getData() // 查询数据
+      },
       /**
        *   @desc   : switch停用启用
        *   @date   : 2022/12/20 15:32
@@ -180,6 +177,8 @@
         params.sysId = this.$store.state.user.sysId
         return params
       },
+      /*************************************************一览界面操作end*********************************************/
+      /*************************************************新建/编辑start*********************************************/
       /**
        *   @desc   : 清空参数
        *   @date   : 2022/12/20 15:33
@@ -210,7 +209,7 @@
        *   @author : 寇珊珊
        */
       saveData() {
-        return this.modalParams.button === 'add'
+        return this.modalParams.button === this.$config.formMode.add
           ? this.excute(this.$service.carrKilnCarService, this.$service.carrKilnCarService.insert, this.params)
           : this.excute(this.$service.carrKilnCarService, this.$service.carrKilnCarService.update, this.params)
       },
@@ -220,13 +219,7 @@
        *   @author : 寇珊珊
        */
       add() {
-        this.modalTitle = this.setTitle('add', 'carrKilnCar')
-        this.modalParams = {
-          formRef: 'modal_editAdd',
-          button: 'add',
-          clearFlag: true,
-          closeFlag: false
-        }
+        this.modalTitle = this.setTitle(this.$config.formMode.add, 'carrKilnCar')
         this.editAddModal = true
       },
       /**
@@ -236,29 +229,31 @@
        */
       edit(rows) {
         this.modalParams = {
-          formRef: 'modal_editAdd',
-          button: 'edit',
-          clearFlag: true,
+          button: this.$config.formMode.edit,
           closeFlag: true
         }
-        this.modalTitle = this.setTitle('edit', 'carrKilnCar')
+        this.modalTitle = this.setTitle(this.$config.formMode.edit, 'carrKilnCar')
         if (rows.length > 0) {
-          this.formData = {...rows[0]}
+          this.detail(rows[0].carId)
         }
         this.editAddModal = true
       },
       /**
-       *   @desc   : 分页变化
-       *   @date   : 2022/12/20 15:00
-       *   @author : 寇珊珊
+       * @desc   : 通过id查询
+       * @author : 周兴
+       * @date   : 2022/5/5 13:15
        */
-      pageSizeChange() {
-
+      detail(id) {
+        this.excuteNoParam(this.$service.carrKilnCarService, this.$service.carrKilnCarService.selectById,
+          [id], false).then(res => {//调用api查询方法
+          if (res.code === this.$config.SUCCESS_CODE) {
+            this.formData = res.data
+          }
+        })
       },
-
+      /*************************************************新建/编辑end***********************************************/
     },
     created() {
-
     }
   }
 </script>

src/view/core/equip-kiln/index.vue

@@ -23,7 +23,7 @@
 
     <!--  查询条件区域  -->
     <div id="search-cond-div" ref="search-cond-div" style="margin-top: 1px;padding: 0">
-      <SearchCond ref="searchCond" v-model="searchCond" :type="this.$config.pageCode['position']"
+      <SearchCond ref="searchCond" v-model="searchCond"
                   @collapse-change="collapseChange" :set-flag="false"
                   :search-content="searchContent"></SearchCond>
     </div>
@@ -33,16 +33,17 @@
                :multiple="false"
                :height="this.tableHeight" primaryKey="kilnId"
                name="table">
-        <DkTableColumn field="kilnCode" ></DkTableColumn>
+        <DkTableColumn field="uniqueCode" :title="$t('kilnCode')" ></DkTableColumn>
         <DkTableColumn field="kilnName" ></DkTableColumn>
+        <DkTableColumn field="modelKindName" ></DkTableColumn>
+        <DkTableColumn field="modelId" ></DkTableColumn>
         <DkTableColumn field="displayNo" ></DkTableColumn>
         <DkTableColumn field="totalNumUses" ></DkTableColumn>
         <DkTableColumn field="useCycle" ></DkTableColumn>
         <DkTableColumn field="numUses" ></DkTableColumn>
-        <DkTableColumn field="flgValid" type="switch" :title="$t('flgValid')" @on-switch-change="onSwitchChange"
-                       :switch-disabled=false min-width="100px"></DkTableColumn>
-        <DkTableColumn field="remarks" min-width="200" width="auto" :filter=false></DkTableColumn>
-        <DkTableColumn field="ftyName" ></DkTableColumn>
+        <DkTableColumn field="flgValid" type="switch"  @on-switch-change="onSwitchChange"
+                       :switch-disabled="false" ></DkTableColumn>
+        <DkTableColumn field="remarks" width="auto" ></DkTableColumn>
       </DkTable>
     </div>
     <!--新建编辑-->
@@ -54,39 +55,23 @@
       :saveFlag="true"
       :title=modalTitle
     >
-      <DkForm ref="formInline" style="width:100%;" name="dk-form" v-model="formData" :label-max-words="6">
+      <DkForm ref="formInline" v-model="formData" :col-count="1">
         <!--   釉色代码     -->
-        <DkFormItem prop="kilnCode" style="margin-top: 10px;" :required="true">
+        <DkFormItem prop="kilnCode" :required="true">
           <InputPop v-model="formData.kilnCode" ref="kilnCode"/>
         </DkFormItem>
         <!--    釉色名称    -->
-        <DkFormItem prop="kilnName" style="margin-top: 10px;" :required="true">
+        <DkFormItem prop="kilnName" :required="true">
           <InputPop v-model="formData.kilnName" ref="kilnName"/>
         </DkFormItem>
-        <!--    工厂    -->
-        <DkFormItem prop="ftyId" style="margin-top: 10px;" :required="true" :data-type="this.$config.dataType.number">
-          <SelectPop v-model="formData.ftyId" ref="ftyId" :multiple="false"
-                     :options="ftyList"
-                     labelKey="ftyName"
-                     valueKey="ftyId">
-          </SelectPop>
-        </DkFormItem>
         <!--    显示顺序    -->
-        <DkFormItem prop="displayNo" style="margin-top: 10px;" :required="true" :data-type="this.$config.dataType.number">
+        <DkFormItem prop="displayNo" :required="true" :data-type="this.$config.dataType.number">
           <InputNumberPop v-model="formData.displayNo" ref="displayNo" :min="1" :digits="0"/>
         </DkFormItem>
-        <!--    总使用次数    -->
-        <DkFormItem prop="totalNumUses" style="margin-top: 10px;" :required="true" :data-type="this.$config.dataType.number">
-          <InputNumberPop v-model="formData.totalNumUses" ref="totalNumUses" :min="1" :digits="0"/>
-        </DkFormItem>
         <!--    使用周期    -->
-        <DkFormItem prop="useCycle" style="margin-top: 10px;" :required="true" :data-type="this.$config.dataType.number">
+        <DkFormItem prop="useCycle" :required="true" :data-type="this.$config.dataType.number">
           <InputNumberPop v-model="formData.useCycle" ref="useCycle" :min="1" :digits="0"/>
         </DkFormItem>
-        <!--    周期内使用次数    -->
-        <DkFormItem prop="numUses" style="margin-top: 10px;" :required="true" :data-type="this.$config.dataType.number">
-          <InputNumberPop v-model="formData.numUses" ref="numUses" :min="1" :digits="0"/>
-        </DkFormItem>
         <!--    备注    -->
         <DkFormItem prop="remarks" style="margin-top: 10px;">
           <InputPop v-model="formData.remarks" textareaFlag/>
@@ -107,7 +92,7 @@ export default {
       tableData: [
         {
           kilnId: 1,
-          kilnCode: 'dkdkdk',
+          uniqueCode: 'dkdkdk',
           kilnName: '东科东科东科',
           ftyId: 1,
           ftyName: '工厂1',
@@ -120,7 +105,7 @@ export default {
         },
         {
           kilnId: 2,
-          kilnCode: 'dkdkdk',
+          uniqueCode: 'dkdkdk',
           kilnName: '东科东科东科',
           ftyId: 2,
           ftyName: '工厂2',
@@ -145,10 +130,6 @@ export default {
         useCycle: 1,
         numUses: 1
       },
-      ftyList: [
-        {ftyId: 1, ftyName: '工厂1'},
-        {ftyId: 2, ftyName: '工厂2'},
-      ],
       searchContent: [
         {
           itemName: 'kilnName',
@@ -171,6 +152,16 @@ export default {
     }
   },
   methods: {
+    /*************************************************一览界面操作start*******************************************/
+    /**
+     *   @desc   : 分页变化
+     *   @date   : 2022/12/21
+     *   @author : 洪旭东
+     */
+    pageSizeChange(pageInfo) {
+      this.pageInfo = pageInfo
+      this.getData() // 查询数据
+    },
     /**
      *   @desc   : switch停用启用
      *   @date   : 2022/12/21
@@ -215,6 +206,8 @@ export default {
       params.sysId = this.$store.state.user.sysId
       return params
     },
+    /*************************************************一览界面操作end*********************************************/
+    /*************************************************新建/编辑start*********************************************/
     /**
      *   @desc   : 清空参数
      *   @date   : 2022/12/21
@@ -237,7 +230,7 @@ export default {
      *   @date   : 2022/12/21
      *   @author : 洪旭东
      */
-    setParams(arg) {
+    setParams() {
       this.params = this.formData
       this.params.cpId = this.$store.state.user.cpId
       this.params.sysId = this.$store.state.user.sysId
@@ -248,7 +241,7 @@ export default {
      *   @author : 洪旭东
      */
     saveData() {
-      return this.modalParams.button === 'add'
+      return this.modalParams.button === this.$config.formMode.add
         ? this.excute(this.$service.equipKilnService, this.$service.equipKilnService.insert, this.params)
         : this.excute(this.$service.equipKilnService, this.$service.equipKilnService.update, this.params)
     },
@@ -258,13 +251,7 @@ export default {
      *   @author : 洪旭东
      */
     add() {
-      this.modalTitle = this.setTitle('add', 'equipKiln')
-      this.modalParams = {
-        formRef: 'modal_editAdd',
-        button: 'add',
-        clearFlag: true,
-        closeFlag: false
-      }
+      this.modalTitle = this.setTitle(this.$config.formMode.add, 'equipKiln')
       this.editAddModal = true
     },
     /**
@@ -274,29 +261,31 @@ export default {
      */
     edit(rows) {
       this.modalParams = {
-        formRef: 'modal_editAdd',
-        button: 'edit',
-        clearFlag: true,
+        button: this.$config.formMode.edit,
         closeFlag: true
       }
-      this.modalTitle = this.setTitle('edit', 'equipKiln')
+      this.modalTitle = this.setTitle(this.$config.formMode.edit, 'equipKiln')
       if (rows.length > 0) {
-        this.formData = {...rows[0]}
+        this.detail(rows[0].kilnId)
       }
       this.editAddModal = true
     },
     /**
-     *   @desc   : 分页变化
-     *   @date   : 2022/12/21
-     *   @author : 洪旭东
+     * @desc   : 通过id查询
+     * @author : 周兴
+     * @date   : 2022/5/5 13:15
      */
-    pageSizeChange() {
-
+    detail(id) {
+      this.excuteNoParam(this.$service.equipKilnService, this.$service.equipKilnService.selectById,
+        [id], false).then(res => {//调用api查询方法
+        if (res.code === this.$config.SUCCESS_CODE) {
+          this.formData = res.data
+        }
+      })
     },
-
+    /*************************************************新建/编辑end***********************************************/
   },
   created() {
-
   }
 }
 </script>

src/view/core/label-print-layout/index.vue

@@ -23,7 +23,7 @@
 
     <!--  查询条件区域  -->
     <div id="search-cond-div" ref="search-cond-div" style="margin-top: 1px;padding: 0">
-      <SearchCond ref="searchCond" v-model="searchCond" :type="this.$config.pageCode['position']"
+      <SearchCond ref="searchCond" v-model="searchCond"
                   @collapse-change="collapseChange" :set-flag="false"
                   :search-content="searchContent"></SearchCond>
     </div>
@@ -31,15 +31,13 @@
       <DkTable :id="'table-'+$options.name" ref="table-select" :data="tableData"
                :pageFlag=false
                :multiple="false"
-               :height="this.tableHeight" primaryKey="layoutId"
-               name="table">
+               :height="this.tableHeight" primaryKey="layoutId">
         <DkTableColumn field="layoutName" ></DkTableColumn>
         <DkTableColumn field="layoutData" ></DkTableColumn>
         <DkTableColumn field="displayNo" ></DkTableColumn>
-        <DkTableColumn field="flgValid" type="switch" :title="$t('flgValid')" @on-switch-change="onSwitchChange"
-                       :switch-disabled=false min-width="100px"></DkTableColumn>
-        <DkTableColumn field="remarks" min-width="200" width="auto" :filter=false></DkTableColumn>
-        <DkTableColumn field="ftyName" ></DkTableColumn>
+        <DkTableColumn field="flgValid" type="switch" @on-switch-change="onSwitchChange"
+                       :switch-disabled="false"></DkTableColumn>
+        <DkTableColumn field="remarks"width="auto"></DkTableColumn>
       </DkTable>
     </div>
     <!--新建编辑-->
@@ -51,29 +49,21 @@
       :saveFlag="true"
       :title=modalTitle
     >
-      <DkForm ref="formInline" style="width:100%;" name="dk-form" v-model="formData">
+      <DkForm ref="formInline" v-model="formData" :col-count="1">
         <!--    模板名称    -->
-        <DkFormItem prop="layoutName" style="margin-top: 10px;" :required="true">
+        <DkFormItem prop="layoutName"  :required="true">
           <InputPop v-model="formData.layoutName" ref="layoutName"/>
         </DkFormItem>
         <!--   模板数据     -->
-        <DkFormItem prop="layoutData" style="margin-top: 10px;" :required="true">
+        <DkFormItem prop="layoutData"  :required="true">
           <InputPop v-model="formData.layoutData" ref="layoutData"/>
         </DkFormItem>
-        <!--    工厂    -->
-        <DkFormItem prop="ftyId" style="margin-top: 10px;" :required="true" :data-type="this.$config.dataType.number">
-          <SelectPop v-model="formData.ftyId" ref="ftyId" :multiple="false"
-                     :options="ftyList"
-                     labelKey="ftyName"
-                     valueKey="ftyId">
-          </SelectPop>
-        </DkFormItem>
         <!--    显示顺序    -->
-        <DkFormItem prop="displayNo" style="margin-top: 10px;" :required="true" :data-type="this.$config.dataType.number">
+        <DkFormItem prop="displayNo"  :required="true" :data-type="this.$config.dataType.number">
           <InputNumberPop v-model="formData.displayNo" ref="displayNo" :min="1" :digits="0"/>
         </DkFormItem>
         <!--    备注    -->
-        <DkFormItem prop="remarks" style="margin-top: 10px;">
+        <DkFormItem prop="remarks" >
           <InputPop v-model="formData.remarks" textareaFlag/>
         </DkFormItem>
       </DkForm>
@@ -121,10 +111,6 @@ export default {
         displayNo: 1,
         remarks: ''
       },
-      ftyList: [
-        {ftyId: 1, ftyName: '工厂1'},
-        {ftyId: 2, ftyName: '工厂2'},
-      ],
       searchContent: [
         {
           itemName: 'layoutData',
@@ -147,6 +133,16 @@ export default {
     }
   },
   methods: {
+    /*************************************************一览界面操作start*******************************************/
+    /**
+     *   @desc   : 分页变化
+     *   @date   : 2022/12/21
+     *   @author : 洪旭东
+     */
+    pageSizeChange(pageInfo) {
+      this.pageInfo = pageInfo
+      this.getData() // 查询数据
+    },
     /**
      *   @desc   : switch停用启用
      *   @date   : 2022/12/21
@@ -191,6 +187,8 @@ export default {
       params.sysId = this.$store.state.user.sysId
       return params
     },
+    /*************************************************一览界面操作end*********************************************/
+    /*************************************************新建/编辑start*********************************************/
     /**
      *   @desc   : 清空参数
      *   @date   : 2022/12/21
@@ -221,7 +219,7 @@ export default {
      *   @author : 洪旭东
      */
     saveData() {
-      return this.modalParams.button === 'add'
+      return this.modalParams.button === this.$config.formMode.add
         ? this.excute(this.$service.labelPrintLayoutService, this.$service.labelPrintLayoutService.insert, this.params)
         : this.excute(this.$service.labelPrintLayoutService, this.$service.labelPrintLayoutService.update, this.params)
     },
@@ -231,13 +229,7 @@ export default {
      *   @author : 洪旭东
      */
     add() {
-      this.modalTitle = this.setTitle('add', 'labelPrintLayout')
-      this.modalParams = {
-        formRef: 'modal_editAdd',
-        button: 'add',
-        clearFlag: true,
-        closeFlag: false
-      }
+      this.modalTitle = this.setTitle(this.$config.formMode.add, 'labelPrintLayout')
       this.editAddModal = true
     },
     /**
@@ -247,29 +239,31 @@ export default {
      */
     edit(rows) {
       this.modalParams = {
-        formRef: 'modal_editAdd',
-        button: 'edit',
-        clearFlag: true,
+        button: this.$config.formMode.edit,
         closeFlag: true
       }
-      this.modalTitle = this.setTitle('edit', 'labelPrintLayout')
+      this.modalTitle = this.setTitle(this.$config.formMode.edit, 'labelPrintLayout')
       if (rows.length > 0) {
-        this.formData = {...rows[0]}
+        this.detail(rows[0].layoutId)
       }
       this.editAddModal = true
     },
     /**
-     *   @desc   : 分页变化
-     *   @date   : 2022/12/21
-     *   @author : 洪旭东
+     * @desc   : 通过id查询
+     * @author : 周兴
+     * @date   : 2022/5/5 13:15
      */
-    pageSizeChange() {
-
+    detail(id) {
+      this.excuteNoParam(this.$service.labelPrintLayoutService, this.$service.labelPrintLayoutService.selectById,
+        [id], false).then(res => {//调用api查询方法
+        if (res.code === this.$config.SUCCESS_CODE) {
+          this.formData = res.data
+        }
+      })
     },
-
+    /*************************************************新建/编辑end***********************************************/
   },
   created() {
-
   }
 }
 </script>

src/view/core/label-printer/index.vue

@@ -23,7 +23,7 @@
 
     <!--  查询条件区域  -->
     <div id="search-cond-div" ref="search-cond-div" style="margin-top: 1px;padding: 0">
-      <SearchCond ref="searchCond" v-model="searchCond" :type="this.$config.pageCode['position']"
+      <SearchCond ref="searchCond" v-model="searchCond"
                   @collapse-change="collapseChange" :set-flag="false"
                   :search-content="searchContent"></SearchCond>
     </div>
@@ -31,16 +31,14 @@
       <DkTable :id="'table-'+$options.name" ref="table-select" :data="tableData"
                :pageFlag=false
                :multiple="false"
-               :height="this.tableHeight" primaryKey="printerId"
-               name="table">
+               :height="this.tableHeight" primaryKey="printerId">
         <DkTableColumn field="printerCode" ></DkTableColumn>
         <DkTableColumn field="printerName" ></DkTableColumn>
         <DkTableColumn field="printerIp" ></DkTableColumn>
         <DkTableColumn field="displayNo" ></DkTableColumn>
-        <DkTableColumn field="flgValid" type="switch" :title="$t('flgValid')" @on-switch-change="onSwitchChange"
-                       :switch-disabled=false min-width="100px"></DkTableColumn>
-        <DkTableColumn field="remarks" min-width="200" width="auto" :filter=false></DkTableColumn>
-        <DkTableColumn field="ftyName" ></DkTableColumn>
+        <DkTableColumn field="flgValid" type="switch"  @on-switch-change="onSwitchChange"
+                       :switch-disabled="false"></DkTableColumn>
+        <DkTableColumn field="remarks" width="auto" ></DkTableColumn>
       </DkTable>
     </div>
     <!--新建编辑-->
@@ -52,33 +50,25 @@
       :saveFlag="true"
       :title=modalTitle
     >
-      <DkForm ref="formInline" style="width:100%;" name="dk-form" v-model="formData" :label-max-words="5">
+      <DkForm ref="formInline"v-model="formData" :label-max-words="5" :col-count="1">
         <!--   打印机代码     -->
-        <DkFormItem prop="printerCode" style="margin-top: 10px;" :required="true">
+        <DkFormItem prop="printerCode"  :required="true">
           <InputPop v-model="formData.printerCode" ref="printerCode"/>
         </DkFormItem>
         <!--    打印机名称    -->
-        <DkFormItem prop="printerName" style="margin-top: 10px;" :required="true">
+        <DkFormItem prop="printerName"  :required="true">
           <InputPop v-model="formData.printerName" ref="printerName"/>
         </DkFormItem>
         <!--    打印机Ip    -->
-        <DkFormItem prop="printerIp" style="margin-top: 10px;" :required="true">
+        <DkFormItem prop="printerIp"  :required="true">
           <InputPop v-model="formData.printerIp" ref="printerIp"/>
         </DkFormItem>
-        <!--    工厂    -->
-        <DkFormItem prop="ftyId" style="margin-top: 10px;" :required="true" :data-type="this.$config.dataType.number">
-          <SelectPop v-model="formData.ftyId" ref="ftyId" :multiple="false"
-                     :options="ftyList"
-                     labelKey="ftyName"
-                     valueKey="ftyId">
-          </SelectPop>
-        </DkFormItem>
         <!--    显示顺序    -->
-        <DkFormItem prop="displayNo" style="margin-top: 10px;" :required="true" :data-type="this.$config.dataType.number">
+        <DkFormItem prop="displayNo"  :required="true" :data-type="this.$config.dataType.number">
           <InputNumberPop v-model="formData.displayNo" ref="displayNo" :min="1" :digits="0"/>
         </DkFormItem>
         <!--    备注    -->
-        <DkFormItem prop="remarks" style="margin-top: 10px;">
+        <DkFormItem prop="remarks" >
           <InputPop v-model="formData.remarks" textareaFlag/>
         </DkFormItem>
       </DkForm>
@@ -129,10 +119,6 @@ export default {
         displayNo: 1,
         remarks: ''
       },
-      ftyList: [
-        {ftyId: 1, ftyName: '工厂1'},
-        {ftyId: 2, ftyName: '工厂2'},
-      ],
       searchContent: [
         {
           itemName: 'printerName',
@@ -155,6 +141,16 @@ export default {
     }
   },
   methods: {
+    /*************************************************一览界面操作start*******************************************/
+    /**
+     *   @desc   : 分页变化
+     *   @date   : 2022/12/21
+     *   @author : 洪旭东
+     */
+    pageSizeChange(pageInfo) {
+      this.pageInfo = pageInfo
+      this.getData() // 查询数据
+    },
     /**
      *   @desc   : switch停用启用
      *   @date   : 2022/12/21
@@ -199,6 +195,8 @@ export default {
       params.sysId = this.$store.state.user.sysId
       return params
     },
+    /*************************************************一览界面操作end*********************************************/
+    /*************************************************新建/编辑start*********************************************/
     /**
      *   @desc   : 清空参数
      *   @date   : 2022/12/21
@@ -229,7 +227,7 @@ export default {
      *   @author : 洪旭东
      */
     saveData() {
-      return this.modalParams.button === 'add'
+      return this.modalParams.button === this.$config.formMode.add
         ? this.excute(this.$service.labelPrinterService, this.$service.labelPrinterService.insert, this.params)
         : this.excute(this.$service.labelPrinterService, this.$service.labelPrinterService.update, this.params)
     },
@@ -239,13 +237,7 @@ export default {
      *   @author : 洪旭东
      */
     add() {
-      this.modalTitle = this.setTitle('add', 'labelPrinter')
-      this.modalParams = {
-        formRef: 'modal_editAdd',
-        button: 'add',
-        clearFlag: true,
-        closeFlag: false
-      }
+      this.modalTitle = this.setTitle(this.$config.formMode.add, 'labelPrinter')
       this.editAddModal = true
     },
     /**
@@ -255,29 +247,31 @@ export default {
      */
     edit(rows) {
       this.modalParams = {
-        formRef: 'modal_editAdd',
-        button: 'edit',
-        clearFlag: true,
+        button: this.$config.formMode.edit,
         closeFlag: true
       }
-      this.modalTitle = this.setTitle('edit', 'labelPrinter')
+      this.modalTitle = this.setTitle(this.$config.formMode.edit, 'labelPrinter')
       if (rows.length > 0) {
-        this.formData = {...rows[0]}
+        this.detail(rows[0].printerId)
       }
       this.editAddModal = true
     },
     /**
-     *   @desc   : 分页变化
-     *   @date   : 2022/12/21
-     *   @author : 洪旭东
+     * @desc   : 通过id查询
+     * @author : 周兴
+     * @date   : 2022/5/5 13:15
      */
-    pageSizeChange() {
-
+    detail(id) {
+      this.excuteNoParam(this.$service.labelPrinterService, this.$service.labelPrinterService.selectById,
+        [id], false).then(res => {//调用api查询方法
+        if (res.code === this.$config.SUCCESS_CODE) {
+          this.formData = res.data
+        }
+      })
     },
-
+    /*************************************************新建/编辑end***********************************************/
   },
   created() {
-
   }
 }
 </script>

src/view/core/product-colour/index.vue

@@ -23,7 +23,7 @@
 
     <!--  查询条件区域  -->
     <div id="search-cond-div" ref="search-cond-div" style="margin-top: 1px;padding: 0">
-      <SearchCond ref="searchCond" v-model="searchCond" :type="this.$config.pageCode['position']"
+      <SearchCond ref="searchCond" v-model="searchCond"
                   @collapse-change="collapseChange" :set-flag="false"
                   :search-content="searchContent"></SearchCond>
     </div>
@@ -36,10 +36,9 @@
         <DkTableColumn field="colourCode" ></DkTableColumn>
         <DkTableColumn field="colourName" ></DkTableColumn>
         <DkTableColumn field="displayNo" ></DkTableColumn>
-        <DkTableColumn field="flgValid" type="switch" :title="$t('flgValid')" @on-switch-change="onSwitchChange"
-                       :switch-disabled=false min-width="100px"></DkTableColumn>
-        <DkTableColumn field="remarks" min-width="200" width="auto" :filter=false></DkTableColumn>
-        <DkTableColumn field="ftyName" ></DkTableColumn>
+        <DkTableColumn field="flgValid" type="switch" @on-switch-change="onSwitchChange"
+                       :switch-disabled="false" ></DkTableColumn>
+        <DkTableColumn field="remarks" width="auto" ></DkTableColumn>
       </DkTable>
     </div>
     <!--新建编辑-->
@@ -51,29 +50,21 @@
       :saveFlag="true"
       :title=modalTitle
     >
-      <DkForm ref="formInline" style="width:100%;" name="dk-form" v-model="formData">
+      <DkForm ref="formInline" v-model="formData" :col-count="1">
         <!--   釉色代码     -->
-        <DkFormItem prop="colourCode" style="margin-top: 10px;" :required="true">
+        <DkFormItem prop="colourCode" :required="true">
           <InputPop v-model="formData.colourCode" ref="colourCode"/>
         </DkFormItem>
         <!--    釉色名称    -->
-        <DkFormItem prop="colourName" style="margin-top: 10px;" :required="true">
+        <DkFormItem prop="colourName" :required="true">
           <InputPop v-model="formData.colourName" ref="colourName"/>
         </DkFormItem>
-        <!--    工厂    -->
-        <DkFormItem prop="ftyId" style="margin-top: 10px;" :required="true" :data-type="this.$config.dataType.number">
-          <SelectPop v-model="formData.ftyId" ref="ftyId" :multiple="false"
-                     :options="ftyList"
-                     labelKey="ftyName"
-                     valueKey="ftyId">
-          </SelectPop>
-        </DkFormItem>
         <!--    显示顺序    -->
-        <DkFormItem prop="displayNo" style="margin-top: 10px;" :required="true" :data-type="this.$config.dataType.number">
+        <DkFormItem prop="displayNo" :required="true" :data-type="this.$config.dataType.number">
           <InputNumberPop v-model="formData.displayNo" ref="displayNo" :min="1" :digits="0"/>
         </DkFormItem>
         <!--    备注    -->
-        <DkFormItem prop="remarks" style="margin-top: 10px;">
+        <DkFormItem prop="remarks" >
           <InputPop v-model="formData.remarks" textareaFlag/>
         </DkFormItem>
       </DkForm>
@@ -121,10 +112,6 @@ export default {
         displayNo: 1,
         remarks: ''
       },
-      ftyList: [
-        {ftyId: 1, ftyName: '工厂1'},
-        {ftyId: 2, ftyName: '工厂2'},
-      ],
       searchContent: [
         {
           itemName: 'colourName',
@@ -147,6 +134,16 @@ export default {
     }
   },
   methods: {
+    /*************************************************一览界面操作start*******************************************/
+    /**
+     *   @desc   : 分页变化
+     *   @date   : 2022/12/21
+     *   @author : 洪旭东
+     */
+    pageSizeChange(pageInfo) {
+      this.pageInfo = pageInfo
+      this.getData() // 查询数据
+    },
     /**
      *   @desc   : switch停用启用
      *   @date   : 2022/12/21
@@ -191,6 +188,8 @@ export default {
       params.sysId = this.$store.state.user.sysId
       return params
     },
+    /*************************************************一览界面操作end*********************************************/
+    /*************************************************新建/编辑start*********************************************/
     /**
      *   @desc   : 清空参数
      *   @date   : 2022/12/21
@@ -221,7 +220,7 @@ export default {
      *   @author : 洪旭东
      */
     saveData() {
-      return this.modalParams.button === 'add'
+      return this.modalParams.button === this.$config.formMode.add
         ? this.excute(this.$service.productColourService, this.$service.productColourService.insert, this.params)
         : this.excute(this.$service.productColourService, this.$service.productColourService.update, this.params)
     },
@@ -231,13 +230,7 @@ export default {
      *   @author : 洪旭东
      */
     add() {
-      this.modalTitle = this.setTitle('add', 'productColour')
-      this.modalParams = {
-        formRef: 'modal_editAdd',
-        button: 'add',
-        clearFlag: true,
-        closeFlag: false
-      }
+      this.modalTitle = this.setTitle(this.$config.formMode.add, 'productColour')
       this.editAddModal = true
     },
     /**
@@ -247,29 +240,31 @@ export default {
      */
     edit(rows) {
       this.modalParams = {
-        formRef: 'modal_editAdd',
-        button: 'edit',
-        clearFlag: true,
+        button: this.$config.formMode.edit,
         closeFlag: true
       }
-      this.modalTitle = this.setTitle('edit', 'productColour')
+      this.modalTitle = this.setTitle(this.$config.formMode.edit, 'productColour')
       if (rows.length > 0) {
-        this.formData = {...rows[0]}
+        this.detail(rows[0].colourId)
       }
       this.editAddModal = true
     },
     /**
-     *   @desc   : 分页变化
-     *   @date   : 2022/12/21
-     *   @author : 洪旭东
+     * @desc   : 通过id查询
+     * @author : 周兴
+     * @date   : 2022/5/5 13:15
      */
-    pageSizeChange() {
-
+    detail(id) {
+      this.excuteNoParam(this.$service.productColourService, this.$service.productColourService.selectById,
+        [id], false).then(res => {//调用api查询方法
+        if (res.code === this.$config.SUCCESS_CODE) {
+          this.formData = res.data
+        }
+      })
     },
-
+    /*************************************************新建/编辑end***********************************************/
   },
   created() {
-
   }
 }
 </script>

src/view/core/product-grade/index.vue

@@ -23,7 +23,7 @@
 
     <!--  查询条件区域  -->
     <div id="search-cond-div" ref="search-cond-div" style="margin-top: 1px;padding: 0">
-      <SearchCond ref="searchCond" v-model="searchCond" :type="this.$config.pageCode['position']"
+      <SearchCond ref="searchCond" v-model="searchCond"
                   @collapse-change="collapseChange" :set-flag="false"
                   :search-content="searchContent"></SearchCond>
     </div>
@@ -31,16 +31,14 @@
       <DkTable :id="'table-'+$options.name" ref="table-select" :data="tableData"
                :pageFlag=false
                :multiple="false"
-               :height="this.tableHeight" primaryKey="gradeId"
-               name="table">
+               :height="this.tableHeight" primaryKey="gradeId">
         <DkTableColumn field="gradeCode" ></DkTableColumn>
         <DkTableColumn field="gradeName" ></DkTableColumn>
         <DkTableColumn field="gradeKindName" ></DkTableColumn>
         <DkTableColumn field="displayNo" ></DkTableColumn>
-        <DkTableColumn field="flgValid" type="switch" :title="$t('flgValid')" @on-switch-change="onSwitchChange"
-                       :switch-disabled=false min-width="100px"></DkTableColumn>
-        <DkTableColumn field="remarks" min-width="200" width="auto" :filter=false></DkTableColumn>
-        <DkTableColumn field="ftyName" ></DkTableColumn>
+        <DkTableColumn field="flgValid" type="switch"  @on-switch-change="onSwitchChange"
+                       :switch-disabled="false"></DkTableColumn>
+        <DkTableColumn field="remarks"width="auto"></DkTableColumn>
       </DkTable>
     </div>
     <!--新建编辑-->
@@ -52,37 +50,29 @@
       :saveFlag="true"
       :title=modalTitle
     >
-      <DkForm ref="formInline" style="width:100%;" name="dk-form" v-model="formData">
+      <DkForm ref="formInline"  v-model="formData" :col-count="1">
         <!--   分级代码     -->
-        <DkFormItem prop="gradeCode" style="margin-top: 10px;" :required="true">
+        <DkFormItem prop="gradeCode"  :required="true">
           <InputPop v-model="formData.gradeCode" ref="gradeCode"/>
         </DkFormItem>
         <!--    分级名称    -->
-        <DkFormItem prop="gradeName" style="margin-top: 10px;" :required="true">
+        <DkFormItem prop="gradeName"  :required="true">
           <InputPop v-model="formData.gradeName" ref="gradeName"/>
         </DkFormItem>
         <!--    分级种类    -->
-        <DkFormItem prop="gradeKind" style="margin-top: 10px;" :required="true">
+        <DkFormItem prop="gradeKind"  :required="true">
           <SelectPop v-model="formData.gradeKind" ref="gradeKind" :multiple="false"
                      :options="gradeKindList"
                      labelKey="gradeName"
                      valueKey="gradeId">
           </SelectPop>
         </DkFormItem>
-        <!--    工厂    -->
-        <DkFormItem prop="ftyId" style="margin-top: 10px;" :required="true" :data-type="this.$config.dataType.number">
-          <SelectPop v-model="formData.ftyId" ref="ftyId" :multiple="false"
-                     :options="ftyList"
-                     labelKey="ftyName"
-                     valueKey="ftyId">
-          </SelectPop>
-        </DkFormItem>
         <!--    显示顺序    -->
-        <DkFormItem prop="displayNo" style="margin-top: 10px;" :required="true" :data-type="this.$config.dataType.number">
+        <DkFormItem prop="displayNo"  :required="true" :data-type="this.$config.dataType.number">
           <InputNumberPop v-model="formData.displayNo" ref="displayNo" :min="1" :digits="0"/>
         </DkFormItem>
         <!--    备注    -->
-        <DkFormItem prop="remarks" style="margin-top: 10px;">
+        <DkFormItem prop="remarks" >
           <InputPop v-model="formData.remarks" textareaFlag/>
         </DkFormItem>
       </DkForm>
@@ -135,10 +125,6 @@ export default {
         displayNo: 1,
         remarks: ''
       },
-      ftyList: [
-        {ftyId: 1, ftyName: '工厂1'},
-        {ftyId: 2, ftyName: '工厂2'},
-      ],
       gradeKindList: [
         {gradeId: '产品分级-良品', gradeName: '良品'},
         {gradeId: '产品分级-合格', gradeName: '合格'},
@@ -168,6 +154,16 @@ export default {
     }
   },
   methods: {
+    /*************************************************一览界面操作start*******************************************/
+    /**
+     *   @desc   : 分页变化
+     *   @date   : 2022/12/21
+     *   @author : 洪旭东
+     */
+    pageSizeChange(pageInfo) {
+      this.pageInfo = pageInfo
+      this.getData() // 查询数据
+    },
     /**
      *   @desc   : switch停用启用
      *   @date   : 2022/12/21
@@ -212,7 +208,8 @@ export default {
       params.sysId = this.$store.state.user.sysId
       return params
     },
-    /**
+    /*************************************************一览界面操作end*********************************************/
+    /*************************************************新建/编辑start*********************************************/ /**
      *   @desc   : 清空参数
      *   @date   : 2022/12/21
      *   @author : 洪旭东
@@ -243,7 +240,7 @@ export default {
      *   @author : 洪旭东
      */
     saveData() {
-      return this.modalParams.button === 'add'
+      return this.modalParams.button === this.$config.formMode.add
         ? this.excute(this.$service.productGradeService, this.$service.productGradeService.insert, this.params)
         : this.excute(this.$service.productGradeService, this.$service.productGradeService.update, this.params)
     },
@@ -253,13 +250,7 @@ export default {
      *   @author : 洪旭东
      */
     add() {
-      this.modalTitle = this.setTitle('add', 'productGrade')
-      this.modalParams = {
-        formRef: 'modal_editAdd',
-        button: 'add',
-        clearFlag: true,
-        closeFlag: false
-      }
+      this.modalTitle = this.setTitle(this.$config.formMode.add, 'productGrade')
       this.editAddModal = true
     },
     /**
@@ -269,29 +260,31 @@ export default {
      */
     edit(rows) {
       this.modalParams = {
-        formRef: 'modal_editAdd',
-        button: 'edit',
-        clearFlag: true,
+        button: this.$config.formMode.edit,
         closeFlag: true
       }
-      this.modalTitle = this.setTitle('edit', 'productGrade')
+      this.modalTitle = this.setTitle(this.$config.formMode.edit, 'productGrade')
       if (rows.length > 0) {
-        this.formData = {...rows[0]}
+        this.detail(rows[0].gradeId)
       }
       this.editAddModal = true
     },
     /**
-     *   @desc   : 分页变化
-     *   @date   : 2022/12/21
-     *   @author : 洪旭东
+     * @desc   : 通过id查询
+     * @author : 周兴
+     * @date   : 2022/5/5 13:15
      */
-    pageSizeChange() {
-
+    detail(id) {
+      this.excuteNoParam(this.$service.productGradeService, this.$service.productGradeService.selectById,
+        [id], false).then(res => {//调用api查询方法
+        if (res.code === this.$config.SUCCESS_CODE) {
+          this.formData = res.data
+        }
+      })
     },
-
+    /*************************************************新建/编辑end***********************************************/
   },
   created() {
-
   }
 }
 </script>

src/view/core/product-logo/index.vue

@@ -32,9 +32,9 @@
                :pageFlag=false
                :multiple="false"
                :height="this.tableHeight" primaryKey="logoId">
-        <vxe-column width="150" class-name="img-column">
+        <vxe-column width="150" class-name="img-column" :title="$t('productLogo')">
           <template #default="{row}">
-            <img :src="row.logoPaths.url" style="width: 150px; height: 100px;"/>
+            <img :src="row.logoPaths" style="width: 150px; height: 80px;"/>
           </template>
         </vxe-column>
         <DkTableColumn field="logoCode" ></DkTableColumn>
@@ -55,14 +55,7 @@
       :saveFlag="true"
       :title=modalTitle
     >
-      <DkPicWall slot="content" ref="uploadFile" v-model="formData.logoPaths"
-                 folder="t_product_logo/logo_paths" :accept="$config.uploadFileConfig.acceptPicType"
-                 :format="['jpg','jpeg','png']"></DkPicWall>
       <DkForm ref="formInline" v-model="formData" :col-count="1">
-        <!--   商标上传     -->
-        <DkFormItem prop="logoPaths"  :required="true">
-
-        </DkFormItem>
         <!--   商标代码     -->
         <DkFormItem prop="logoName"  :required="true">
           <InputPop v-model="formData.logoName" ref="logoName"/>
@@ -88,6 +81,12 @@
         <DkFormItem prop="remarks" >
           <InputPop v-model="formData.remarks" textareaFlag/>
         </DkFormItem>
+        <!--   商标上传     -->
+        <DkFormItem prop="logoPaths"  :required="true">
+          <DkPicWall ref="uploadFile" v-model="formData.logoPaths"
+                     folder="t_product_logo/logo_paths" :accept="$config.uploadFileConfig.acceptPicType"
+                     :format="['jpg','jpeg','png']"></DkPicWall>
+        </DkFormItem>
       </DkForm>
     </DkModal>
   </div>
@@ -113,9 +112,7 @@ export default {
           brandName: '产品品牌1',
           displayNo: 1,
           flgValid: true,
-          logoPaths: {
-            url: 'http://localhost:8080/img/dklogo.9404478a.png'
-          }
+          logoPaths :'http://localhost:8080/img/dklogo.9404478a.png',
         },
         {
           logoId: 2,
@@ -128,9 +125,7 @@ export default {
           brandName: '产品品牌2',
           displayNo: 2,
           flgValid: false,
-          logoPaths: {
-            url: 'http://localhost:8080/img/dklogo.9404478a.png'
-          }
+          logoPaths :'http://localhost:8080/img/dklogo.9404478a.png',
         }
       ],
       editAddModal: false,
@@ -204,10 +199,10 @@ export default {
       // 查询职位接口
       this.excute(this.$service.productLogoService, this.$service.productLogoService.selectByCond, params).then(res => {
         if (res.code === this.$config.SUCCESS_CODE) {
-          this.tableData = res.data.list
-          if (params.currentPage == 1) {
-            this.$refs['table-select'].pageInfo.total = res.data.total
-          }
+          // this.tableData = res.data.list
+          // if (params.currentPage == 1) {
+          //   this.$refs['table-select'].pageInfo.total = res.data.total
+          // }
         }
       })
     },