Просмотр исходного кода

1、修改dk-table复制的问题
2、修改工位的问题

周兴 2 лет назад
Родитель
Сommit
343550418e

+ 7 - 2
src/components/base/dk-table/dk-table-column.vue

@@ -491,13 +491,18 @@ export default {
      */
      */
     copyValue(row) {
     copyValue(row) {
       if (row && row[this.field]) {
       if (row && row[this.field]) {
-        this.$message.success(vm.$t('copySuccess') + ':' + row[this.field]);
+        let value = row[this.field];
+        // 如果是对象,需要处理下
+        if(typeof row[this.field] === 'object'){
+          value = JSON.stringify(row[this.field])
+        }
+        this.$message.success(vm.$t('copySuccess') + ':' + value);
         //创建一个input框
         //创建一个input框
         const input = document.createElement("input");
         const input = document.createElement("input");
         //将指定的DOM节点添加到body的末尾
         //将指定的DOM节点添加到body的末尾
         document.body.appendChild(input);
         document.body.appendChild(input);
         //设置input框的value值为直播地址
         //设置input框的value值为直播地址
-        input.setAttribute("value", row[this.field]);
+        input.setAttribute("value", value);
         //选取文本域中的内容
         //选取文本域中的内容
         input.select();
         input.select();
         //copy的意思是拷贝当前选中内容到剪贴板
         //copy的意思是拷贝当前选中内容到剪贴板

+ 1 - 1
src/components/business/select-magnifier/select-magnifier.vue

@@ -1501,7 +1501,7 @@ export default {
         self.methodsName = 'getMoldlineGroupByPage'
         self.methodsName = 'getMoldlineGroupByPage'
         self.methodsNameDetail = 'getMoldlineGroupByPage'
         self.methodsNameDetail = 'getMoldlineGroupByPage'
         self.searchContent = [
         self.searchContent = [
-          {itemCode: 'groupNo', valueKind: 'NUMBER', valueFormat: {default: 1},},
+          {itemCode: 'groupNo', valueKind: 'NUMBER'},
           {itemCode: 'moldlineCode'},
           {itemCode: 'moldlineCode'},
           {itemCode: 'moldlineName'},
           {itemCode: 'moldlineName'},
         ]
         ]

+ 1 - 0
src/locale/lang/zh-CN.js

@@ -1184,6 +1184,7 @@ export const columns = {
   checkOpinion:'审核意见',
   checkOpinion:'审核意见',
   tableSetting:'表格设置',
   tableSetting:'表格设置',
   yuan:'元',
   yuan:'元',
+  flgPrint:'标签打印',
 }
 }
 
 
 /**
 /**

+ 7 - 1
src/view/pdm/work-station/form.vue

@@ -419,7 +419,13 @@ export default {
       //获取删除的数据(编辑页面)
       //获取删除的数据(编辑页面)
       this.formData.delWorkStationPrinterList=this.$refs.editTableWSPrinter?.getDeleteData();
       this.formData.delWorkStationPrinterList=this.$refs.editTableWSPrinter?.getDeleteData();
       this.formData.delWorkStationUserList = this.$refs.editTableWSUser?.getDeleteData().concat(this.$refs.editTableWSUser2?.getDeleteData())
       this.formData.delWorkStationUserList = this.$refs.editTableWSUser?.getDeleteData().concat(this.$refs.editTableWSUser2?.getDeleteData())
-      this.params = this.formData;
+      this.params = {...this.formData};
+      // 如果打印机有值,工位的标签打印标识为true
+      if(this.formData.workStationPrinterList && this.formData.workStationPrinterList.length > 0){
+        this.params.flgPrint = true;
+      }else{
+        this.params.flgPrint = false;
+      }
     },
     },
     /**
     /**
      *   @desc   : 保存数据
      *   @desc   : 保存数据

+ 1 - 0
src/view/pdm/work-station/index.vue

@@ -50,6 +50,7 @@
         <!--        <DkTableColumn field="stationUsers"></DkTableColumn>-->
         <!--        <DkTableColumn field="stationUsers"></DkTableColumn>-->
         <DkTableColumn field="uniqueCode" :title="$t('kilnCode')"></DkTableColumn>
         <DkTableColumn field="uniqueCode" :title="$t('kilnCode')"></DkTableColumn>
         <DkTableColumn field="stationCode"></DkTableColumn>
         <DkTableColumn field="stationCode"></DkTableColumn>
+        <DkTableColumn field="flgPrint" type="switch"></DkTableColumn>
         <DkTableColumn field="flgValid" type="switch" :title="$t('flgValid')" @on-switch-change="onSwitchChange"
         <DkTableColumn field="flgValid" type="switch" :title="$t('flgValid')" @on-switch-change="onSwitchChange"
                        :switch-disabled=false min-width="100px"></DkTableColumn>
                        :switch-disabled=false min-width="100px"></DkTableColumn>
         <DkTableColumn field="remarks" min-width="200" width="auto" :filter=false></DkTableColumn>
         <DkTableColumn field="remarks" min-width="200" width="auto" :filter=false></DkTableColumn>