Merge remote-tracking branch 'origin/master'

src/assets/al-icon/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3389785 */
-  src: url('iconfont.eot?t=1682478244283'); /* IE9 */
-  src: url('iconfont.eot?t=1682478244283#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('iconfont.woff2?t=1682478244283') format('woff2'),
-       url('iconfont.woff?t=1682478244283') format('woff'),
-       url('iconfont.ttf?t=1682478244283') format('truetype'),
-       url('iconfont.svg?t=1682478244283#iconfont') format('svg');
+  src: url('iconfont.eot?t=1683179152831'); /* IE9 */
+  src: url('iconfont.eot?t=1683179152831#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('iconfont.woff2?t=1683179152831') format('woff2'),
+       url('iconfont.woff?t=1683179152831') format('woff'),
+       url('iconfont.ttf?t=1683179152831') format('truetype'),
+       url('iconfont.svg?t=1683179152831#iconfont') format('svg');
 }
 
 .iconfont {
@@ -16,6 +16,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-tiaoxingma:before {
+  content: "\e626";
+}
+
 .icon-max1:before {
   content: "\e6e3";
 }

src/assets/al-icon/iconfont.json

@@ -6,6 +6,13 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "2736409",
+      "name": "条形码",
+      "font_class": "tiaoxingma",
+      "unicode": "e626",
+      "unicode_decimal": 58918
+    },
+    {
       "icon_id": "32474959",
       "name": "全屏最大化",
       "font_class": "max1",

src/assets/al-icon/iconfont.svg

@@ -14,6 +14,8 @@
     />
       <missing-glyph />
       
+      <glyph glyph-name="tiaoxingma" unicode="&#58918;" d="M910.613 695.812H1024V72.19000000000005H910.613zM540.613 695.812H654V72.19000000000005H540.613zM0 695.812h56.693V72.19000000000005H0zM84.173 695.812h28.347V72.19000000000005H84.173zM144.173 695.812h28.347V72.19000000000005h-28.347zM206.173 695.812h28.347V72.19000000000005h-28.347zM361.653 695.812H390V72.19000000000005h-28.347zM421.653 695.812H450V72.19000000000005h-28.347zM483.653 695.812H512V72.19000000000005h-28.347zM691.653 695.812H720V72.19000000000005h-28.347zM753.653 695.812H782V72.19000000000005h-28.347zM262 695.812h56.693V72.19000000000005H262zM814 695.812h56.693V72.19000000000005H814z"  horiz-adv-x="1024" />
+      
       <glyph glyph-name="max1" unicode="&#59107;" d="M910.827 763v-184c0-11.046-8.954-20-20-20s-20 8.954-20 20V714.716L641.142 485.031c-7.81-7.81-20.474-7.81-28.284 0-7.81 7.81-7.81 20.474 0 28.284l229.686 229.687-135.717-0.002c-11.046 0-20 8.954-20 20s8.954 20 20 20h184c11.046 0 20-8.954 20-20zM113 763v-184c0-11.046 8.954-20 20-20s20 8.954 20 20V714.716l229.685-229.685c7.81-7.81 20.474-7.81 28.284 0 7.81 7.81 7.81 20.474 0 28.284L181.283 743.002 317 743c11.046 0 20 8.954 20 20s-8.954 20-20 20H133c-11.046 0-20-8.954-20-20z m797.827-758.827v184c0 11.046-8.954 20-20 20s-20-8.954-20-20v-135.716L641.142 282.14200000000005c-7.81 7.81-20.474 7.81-28.284 0-7.81-7.81-7.81-20.474 0-28.284L842.544 24.16999999999996l-135.717 0.002c-11.046 0-20-8.954-20-20s8.954-20 20-20h184c11.046 0 20 8.954 20 20z m-797.827 0v184c0 11.046 8.954 20 20 20s20-8.954 20-20v-135.716l229.685 229.685c7.81 7.81 20.474 7.81 28.284 0 7.81-7.81 7.81-20.474 0-28.284L181.283 24.16999999999996 317 24.173000000000002c11.046 0 20-8.954 20-20s-8.954-20-20-20H133c-11.046 0-20 8.954-20 20z"  horiz-adv-x="1024" />
       
       <glyph glyph-name="min" unicode="&#59108;" d="M607 499.173v184c0 11.046 8.954 20 20 20s20-8.954 20-20v-135.716l229.685 229.685c7.81 7.81 20.474 7.81 28.284 0 7.81-7.81 7.81-20.474 0-28.284L675.283 519.1700000000001 811 519.173c11.046 0 20-8.954 20-20s-8.954-20-20-20H627c-11.046 0-20 8.954-20 20z m-190.173 0v184c0 11.046-8.954 20-20 20s-20-8.954-20-20v-135.716L147.142 777.142c-7.81 7.81-20.474 7.81-28.284 0-7.81-7.81-7.81-20.474 0-28.284L348.544 519.1700000000001l-135.717 0.002c-11.046 0-20-8.954-20-20s8.954-20 20-20h184c11.046 0 20 8.954 20 20zM607 268v-184c0-11.046 8.954-20 20-20s20 8.954 20 20V219.716l229.685-229.685c7.81-7.81 20.474-7.81 28.284 0 7.81 7.81 7.81 20.474 0 28.284L675.283 248.00199999999995 811 248c11.046 0 20 8.954 20 20s-8.954 20-20 20H627c-11.046 0-20-8.954-20-20z m-190.173 0v-184c0-11.046-8.954-20-20-20s-20 8.954-20 20V219.716L147.142-9.969000000000051c-7.81-7.81-20.474-7.81-28.284 0-7.81 7.81-7.81 20.474 0 28.284l229.686 229.687-135.717-0.002c-11.046 0-20 8.954-20 20s8.954 20 20 20h184c11.046 0 20-8.954 20-20z"  horiz-adv-x="1024" />

src/components-app/base/dk-app-table-more/dk-app-table-more.vue

@@ -8,8 +8,6 @@
         @click="onOpenDetail(tableDataItem, tableDataIndex)"
         style="background: #fff;margin: 10px 10px 10px 10px;border-radius: 7px;  "
         :style="{ boxShadow: (boxShadowFlag ? '2px 2px 5px #e5e5e6' : '') }">
-        <!--        有测拉删除的组件 -->
-
         <div style="display: flex;width: 100%; padding: 10px 10px 10px 10px;">
           <!-- 复选框-->
           <div style="width: 10%;background: white;justify-items: center;align-items: center;display: flex"
@@ -75,7 +73,9 @@
                 <van-collapse-item title="查看明细" name="1">
                   <div class="app-row " style="display: flow;" v-for="(bomItems, bomIndex) in tableDataItem.bomItems"
                     :key="bomIndex">
-                    <van-swipe-cell :disabled="bomItems.flgBindUnique">
+                    <!-- 成型标识为true  允许绑码标识 true 才能替换 -->
+                    <!-- 左滑替换组件 -->
+                    <van-swipe-cell  :disabled="bomItems.flgBindUnique || !bomItems.flgMolding">
                       <div v-for="(rowsBomItem, rowsBomIndex) in rowsBom" :key="rowsBomIndex">
                         <div style="width: 100%;display: flex">
                           <!-- 标题字段-->

src/components/base/dk-message/index.vue

@@ -1,6 +1,6 @@
 <!-- @desc:Message信息  @auth:周兴  @time:2022/11/15 14:31 -->
 <template>
-  <DkModal ref="modal_message" v-model="visible" width="390" :title="title"
+  <DkModal ref="modal_message" v-model="visible" width="300" :title="title"
            @modalOk="onOk"
            @modalCancel="onCancel"
            @on-cancel="onCancel">
@@ -30,7 +30,7 @@ export default {
       okFunc: () => {
       },//确定回调
       okText: vm.$t('confirm'),
-      cancelText: vm.$t('close'),
+      cancelText: vm.$t('cancel'),
     }
   },
   methods: {
@@ -137,7 +137,7 @@ export default {
 }
 
 .content-div {
-  height: 180px;
+  height: 130px;
   align-items: center;
   justify-content: center;
   display: flex;

src/components/base/dk-modal/dk-modal.vue

@@ -44,7 +44,7 @@
         <DkButton :loading="loading" v-if="okVisibleFlag" type="primary" @click="modalOk" name="confirm"
                   :ref="saveFlag?'save':'confirm'">{{ saveFlag ? '保存(S)' : '确定(O)' }}
         </DkButton>
-        <DkButton v-if="cancelVisibleFlag" @click="modalCancel" name="close" ref="close">{{ '关闭(X)' }}</DkButton>
+        <DkButton v-if="cancelVisibleFlag" @click="modalCancel" name="close" ref="close">{{ saveFlag ? '关闭(X)' : '取消(T)' }}</DkButton>
       </div>
     </Modal>
   </div>

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

@@ -94,7 +94,7 @@
     <template #default="{ row,rowIndex}">
       <div class="normal-class" @dblclick.stop="copyValue(row,rowIndex)"><a
         style="text-decoration: underline;color: #2d8cf0;"
-        @click="handleLink(row)">{{
+        @click="handleLink(row,rowIndex)">{{
           row[field]
         }}</a>
         <!--        <span v-else>{{ row[field] }}</span></div>-->
@@ -389,6 +389,11 @@ export default {
     seqTipContent:{
       type:String,
       default:null
+    },
+    // 是否居中
+    centerFlag:{
+      type:Boolean,
+      default:null
     }
   },
   data() {
@@ -527,12 +532,12 @@ export default {
      * @author : 周兴
      * @date   : 2022/8/9 9:58
      */
-    handleLink(row) {
+    handleLink(row,rowIndex) {
       // 切换当前行
       if (this.dkTable) {
         this.dkTable.setCurrentRow(row);
       }
-      this.$emit('on-link', row)
+      this.$emit('on-link', row,rowIndex,this.field)
     },
     /**
      * @desc   : 查询可替换的数据

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

@@ -871,6 +871,10 @@ export default {
       for (let it of this.$slots.default) {
         if (it && it.componentInstance) {
           if (it.componentInstance.field === column.property) {
+            // 直接设置为居中
+            if(it.componentInstance.centerFlag != null && it.componentInstance.centerFlag){
+              return {textAlign: "center"}
+            }
             if (it.componentInstance.columnType === 'number') {
               return {textAlign: 'right'}
             } else if (it.componentInstance.columnType === 'checkbox' || it.componentInstance.columnType === 'date') {

src/components/business/print/template.less

@@ -110,21 +110,21 @@
   }
 
   .header {
-    height: 60px;
+    //height: 60px;
     width: 100%;
-    background: #2d8cf0;
+    //background: #2d8cf0;
     margin-bottom: 10px;
-    display: flex;
-    padding: 0 10px 0 20px;
-    justify-content: space-between;
-    align-items: center;
+    //display: flex;
+    //padding: 0 10px 0 20px;
+    //justify-content: space-between;
+    //align-items: center;
   }
 
   .print-content {
     width: 100%;
     display: flex;
     justify-content: space-between;
-    height: ~"calc(100% - 70px)";
+    height: 100%;
     .left {
       width: 300px;
       background: #fff;
@@ -137,9 +137,9 @@
       overflow: hidden;
       padding: 20px;
       position: relative;
-      overflow-y: scroll;
-      overflow-x: scroll;
-      height:~"calc(100% - 6px)";
+      //overflow-y: scroll;
+      //overflow-x: scroll;
+      height: 100%;
     }
 
     .right {

src/components/business/print/template.vue

@@ -1,37 +1,6 @@
 <!-- @desc:打印模板  @auth:洪旭东  @time:2022-05-20 14:31 -->
 <template>
   <div class="print-template" style="height: 100%;background: #f2f2f2;" onselectstart="return false">
-    <div class="header">
-      <img style="height: 60%;" src="http://www.dongkesoft.com/public/static/dongke/img/0logo.png"/>
-      <div style="display:flex;">
-<!--        <SelectPop v-model="templateType" style="width:200px;" :multiple="false"-->
-<!--                   :placeholder="$t('selectWords', { 'search-name': $t('templateType') })"-->
-<!--                   @on-select="changeTemplateType" :disabled="!(!(editRow))" label-key="label" value-key="value"-->
-<!--                   :options="templateTypeList" :clearable="false"-->
-<!--        />-->
-<!--        <InputPop name="templateName" v-model="templateName" style="width: 200px;margin-left: 10px;"/>-->
-        <SelectPop v-model="paperDirection" style="width:200px;margin-left: 10px;" :multiple="false"
-                   @on-select="changePaperDirection" label-key="label" value-key="value"
-                   :options="paperDirectionList"
-                   :placeholder="$t('selectWords', { 'search-name': $t('paperDirection') })"
-        />
-        <SelectPop v-model="paperType" style="width:200px;margin-left: 10px;" :multiple="false"
-                   @on-select="paperTypeChange" label-key="label" value-key="value"
-                   :options="paperTypeList" :placeholder="$t('selectWords', { 'search-name': $t('paperType') })"
-        />
-        <div style="color: white;line-height: 33px;margin-left: 10px;" v-if="paperType==0">宽度</div>
-        <InputNumberPop v-model="customWidth" style="width: 200px;margin-left: 10px;" :digits="1"
-                        @on-blur="(val)=> paperTypeList[0].width = val" v-if="paperType==0"/>
-        <div style="color: white;line-height: 33px;margin-left: 10px;" v-if="paperType==0">高度</div>
-        <InputNumberPop v-model="customHeight" style="width: 200px;margin-left: 10px;" :digits="1"
-                        @on-blur="(val)=> paperTypeList[0].height = val" v-if="paperType==0"/>
-      </div>
-      <div>
-<!--        <Button type="primary" @click="close" style="margin-right: 10px;">取消</Button>-->
-        <Button @click="save">保存</Button>
-      </div>
-    </div>
-
     <div class="print-content" v-if="templateType">
       <!--   左侧部分   -->
       <div class="center">
@@ -166,15 +135,65 @@
                            :y="item.top"
                            :x="item.left">
             <img :src="item.path" style="width: 100%;height: 100%;" v-if="item.name != '$scanCode' && item.name != '$barCode'"/>
-            <img :src="scanCode" style="width: 100%;height: 100%;" v-if="item.name == '$scanCode'"/>
-            <img :src="scanCode" style="width: 100%;height: 100%;" v-if="item.name == '$barCode'"/>
+            <div v-if="item.name == '$scanCode'">
+              <img :src="scanCode" style="width: 100%;height: 100%;"/>
+              {{dataSource.main.filter(f=>f.key==item.dataSourceKey)[0].value}}
+            </div>
+            <div v-if="item.name == '$barCode'">
+              <img :src="scanCode" style="width: 100%;height: 100%;"/>
+              {{dataSource.main.filter(f=>f.key==item.dataSourceKey)[0].value}}
+            </div>
           </vue-drag-resize>
 
         </div>
       </div>
       <!--  右侧部分    -->
       <div class="right" @mousedown.stop>
-        <Tabs value="name1" style="height: 100%;">
+        <div class="header">
+          <div>
+            <DkForm :col-count="1">
+              <DkFormItem :label="$t('paperDirection')">
+                <SelectPop v-model="paperDirection" style="width:200px;margin-left: 10px;" :multiple="false"
+                           @on-select="changePaperDirection" label-key="label" value-key="value"
+                           :options="paperDirectionList"
+                           :placeholder="$t('selectWords', { 'search-name': $t('paperDirection') })"
+                />
+              </DkFormItem>
+              <DkFormItem :label="$t('paperType')">
+                <SelectPop v-model="paperType" style="width:200px;margin-left: 10px;" :multiple="false"
+                           @on-select="paperTypeChange" label-key="label" value-key="value"
+                           :options="paperTypeList" :placeholder="$t('selectWords', { 'search-name': $t('paperType') })"
+                />
+              </DkFormItem>
+              <DkFormItem label="宽度">
+<!--                <div style="color: white;line-height: 33px;margin-left: 10px;" v-if="paperType==0">宽度</div>-->
+                <InputNumberPop v-model="customWidth" style="width: 200px;margin-left: 10px;" :digits="1"
+                                @on-blur="(val)=> paperTypeList[0].width = val" v-if="paperType==0"/>
+              </DkFormItem>
+              <DkFormItem label="高度">
+<!--                <div style="color: white;line-height: 33px;margin-left: 10px;" v-if="paperType==0">高度</div>-->
+                <InputNumberPop v-model="customHeight" style="width: 200px;margin-left: 10px;" :digits="1"
+                                @on-blur="(val)=> paperTypeList[0].height = val" v-if="paperType==0"/>
+              </DkFormItem>
+            </DkForm>
+            <!--        <SelectPop v-model="templateType" style="width:200px;" :multiple="false"-->
+            <!--                   :placeholder="$t('selectWords', { 'search-name': $t('templateType') })"-->
+            <!--                   @on-select="changeTemplateType" :disabled="!(!(editRow))" label-key="label" value-key="value"-->
+            <!--                   :options="templateTypeList" :clearable="false"-->
+            <!--        />-->
+            <!--        <InputPop name="templateName" v-model="templateName" style="width: 200px;margin-left: 10px;"/>-->
+
+
+
+
+          </div>
+          <div>
+<!--                    <Button type="primary" @click="close" style="margin-right: 10px;">取消</Button>-->
+<!--            <Button @click="save">保存</Button>-->
+          </div>
+        </div>
+
+        <Tabs value="name1">
           <TabPane label="控件" name="name1" style="height: 100%;">
             <div class="left-item" draggable="true" @dragend="dragend($event,'text')"
                  @click="drop({offsetY:0,offsetX:0},'text')">
@@ -237,11 +256,9 @@
               <div style="display: flex;justify-content: space-between;align-items: center;margin-bottom: 10px;">
                 <div style="width: 20%;display: flex;justify-content: space-between;align-items: center;">
                   <span>数</span><span>据</span><span>源</span></div>
-                <Select style="width: 75%;" filterable clearable v-model="moveList[currentIndex].dataSourceKey">
-                  <Option value="name" v-for="(item,index) in dataSource.main" :key="index" :value="item.key">
-                    {{ item.title }}
-                  </Option>
-                </Select>
+                <SelectPop v-model="moveList[currentIndex].dataSourceKey" style="width:75%;" :multiple="false" clearable
+                           label-key="title" value-key="key"
+                           :options="dataSource.main"/>
               </div>
             </div>
             <!--      当前选中为表格      -->
@@ -255,11 +272,9 @@
               <div style="display: flex;justify-content: space-between;align-items: center;margin-bottom: 10px;">
                 <div style="width: 20%;display: flex;justify-content: space-between;align-items: center;"><span>数</span><span>据</span><span>源</span>
                 </div>
-                <Select style="width: 75%;" clearable v-model="tableCol[getCurrentColIndexReal(currentColIndex)].key">
-                  <Option value="name" v-for="(item,index) in dataSource.detail" :key="index" :value="item.key">
-                    {{ item.title }}
-                  </Option>
-                </Select>
+                <SelectPop v-model="tableCol[getCurrentColIndexReal(currentColIndex)].key" style="width:75%;" :multiple="false" clearable
+                           label-key="title" value-key="key"
+                           :options="dataSource.detail"/>
               </div>
             </div>
             <!--     当前选择为图片       -->
@@ -295,11 +310,9 @@
                 <div style="display: flex;justify-content: space-between;align-items: center;margin-bottom: 10px;">
                   <div style="width: 20%;display: flex;justify-content: space-between;align-items: center;">
                     <span>数</span><span>据</span><span>源</span></div>
-                  <Select style="width: 75%;" filterable clearable v-model="imgList[currentImgIndex].dataSourceKey">
-                    <Option value="name" v-for="(item,index) in dataSource.main" :key="index" :value="item.key">
-                      {{ item.title }}
-                    </Option>
-                  </Select>
+                  <SelectPop v-model="imgList[currentImgIndex].dataSourceKey" style="width:75%;" :multiple="false" clearable
+                             label-key="title" value-key="key"
+                             :options="dataSource.main.copy()"/>
                 </div>
               </div>
             </div>
@@ -725,7 +738,6 @@ export default {
      * @date   : 2022-5-25 20:01
      */
     importSuccess(event) {
-      console.log('event', event)
       // if (event.code == 200 && event.data && event.data.uuidName) {
       //   this.imgList[this.currentImgIndex].path = this.$config.imgUrl + '/' + event.data.uuidName
       //阿里OSS
@@ -743,7 +755,6 @@ export default {
     importSuccessBackground(response, file, fileList) {
       //如果多次上传，要把上一次图片的替换掉
       if (fileList.length > 1) {
-        console.log('this.$refs.backgroundImg', this.$refs.backgroundImg)
         this.$refs.backgroundImg.fileList.splice(0, 1)
       }
       if (response.code == 200 && response.data && response.data.relativePath) {
@@ -767,7 +778,6 @@ export default {
      * @date   : 2022-5-25 19:20
      */
     beforeUpload(file) {
-      console.log('beforeUpload', file.size / 1024, this.maxSize)
       if (!this.acceptFile.split(',').includes(file.type)) {
         this.$Message.warning('图片格式不在允许的范围内')
         return false
@@ -793,7 +803,6 @@ export default {
       })
     },
     checkItemInPaper(paper) {
-      console.log('paper', paper)
       let div = document.createElement('div')
       div.id = 'cm'
       div.style.width = paper.width + 'cm'
@@ -806,7 +815,6 @@ export default {
       let heightPx = this.paperDirection === 'portrait' ? cm.height : cm.width
       div.remove()
 
-      console.log('切换之后宽：' + widthPx + '，高：' + heightPx)
 
       return new Promise(resolve => {
         let flag = true
@@ -832,18 +840,15 @@ export default {
       this.checkItemInPaper(this.paperTypeList[index]).then(flag => {
         if (flag) {
           let paperEl = document.getElementById('paper')
-          console.log('offsetHeight', paperEl.offsetHeight)
           this.parentH = paperEl.clientHeight
           this.parentW = paperEl.clientWidth
           /*  重新打乱 */
           this.$nextTick(() => {
             // debugger
-            console.log(this.paperTypeList[this.paperType].label)
             let maxWidth = 0
             let currentRowIndex = 0
             /* 计算一下最多能摆多少个 */
             let rowCount = Math.floor(document.getElementById('paper').offsetHeight / 20)
-            console.log('rowCount', rowCount)
             let moveListIndex = 0
             setTimeout(() => {
               this.moveList.forEach(it => {
@@ -871,11 +876,9 @@ export default {
 
     },
     visibleChange(val) {
-      console.log('visibleChange')
       this.$emit('input', val)
       if (val) {
         if (this.editRow) {
-          console.log('visibleChange-editRow', this.editRow)
           this.lastTemplateType = this.editRow.docCode
           this.templateType = this.editRow.docCode
           this.templateName = this.editRow.tmName
@@ -889,7 +892,7 @@ export default {
           this.paperDirection = this.editRow.templateData.paperDirection
           this.organization = this.editRow.orgId
           this.backgroundConfig = this.editRow.templateData.backgroundConfig
-          this.paperType = this.paperTypeList.map(it => it.label).indexOf(this.editRow.templateData.paperInfo.label)
+          this.paperType = this.paperTypeList.map(it => it.label).indexOf(this.editRow.templateData.paperInfo.label).toString()
           this.paperTypeList[0].width = this.editRow.templateData.paperInfo.width
           this.customWidth = this.editRow.templateData.paperInfo.width
           this.paperTypeList[0].height = this.editRow.templateData.paperInfo.height
@@ -898,7 +901,6 @@ export default {
           this.lastPaperDirection = this.paperDirection
           //通过这种方式去渲染，避免双向绑定冲突问题
           this.$nextTick(() => {
-            console.log('this.tableCol', this.tableCol)
             let table = this.$refs.printTemplateTable
             /* 过滤一下 2022年8月30日14:51:25 */
             this.tableCol.filter(it => it.checked).forEach((it, index) => {
@@ -1156,7 +1158,6 @@ export default {
               },
               on: {
                 click: () => {
-                  console.log('del text', data)
                   event.stopPropagation()
                   switch (data.type) {
                     case 'text':
@@ -1176,7 +1177,6 @@ export default {
               },
               on: {
                 'on-change': (flag) => {
-                  console.log('change Checkbox', data)
                   event.stopPropagation()
                   switch (data.type) {
                     case 'text':
@@ -1188,7 +1188,6 @@ export default {
                         return index !== data.index
                       })
                       let qy = willDelWidth % this.tableCol.length
-                      console.log(qy)
                       if (qy === 0) {
                         this.tableCol.forEach(it => {
                           it.width += willDelWidth / this.tableCol.length
@@ -1305,7 +1304,6 @@ export default {
                   event.stopPropagation()
                   switch (data.type) {
                     case 'col':
-                      console.log(flag)
                       /* 添加明细 */
                       if (flag) {
                         let width = 10 /* 默认新加的列宽度就是10 */
@@ -1347,7 +1345,6 @@ export default {
      * @date   : 2022-5-12 11:39
      */
     onSelectChange(current) {
-      console.log('current', current)
       if (current.length <= 0 || !current[0].type) {
         return
       }
@@ -1355,7 +1352,6 @@ export default {
       if (current[0].type === 'text') {
         this.moveList[current[0].index].currentFlag = true
         this.currentIndex = current[0].index
-        console.log(this.moveList)
       }
 
       if (current[0].type === 'col') {
@@ -1438,7 +1434,6 @@ export default {
           }
         })
         this.tableCol[this.currentColIndex - 1].width = 100 - withoutBeforeWidth
-        console.log('该行前行宽度' + (100 - withoutBeforeWidth))
       } else {
         let withoutAfterWidth = 0
         this.tableCol.forEach((it, index) => {
@@ -1447,7 +1442,6 @@ export default {
           }
         })
         this.tableCol[this.currentColIndex + 1].width = 100 - withoutAfterWidth
-        console.log('该行后行宽度' + (100 - withoutAfterWidth))
       }
     },
     getItemTemplate(e) {
@@ -1456,12 +1450,9 @@ export default {
       temp.left = e.offsetX - 30 <= 0 ? 0 : e.offsetX - 30
       temp.checked = true
       temp.deleteFlag = true
-      console.log('temp', temp)
       return temp
     },
     dragend(e, type) {
-      console.log('e', e)
-      // console.log(document.getElementById('paper'))
       let tempE = { offsetX: e.clientX - 365, offsetY: e.clientY - 113 }
       this.drop(tempE, type)
     },
@@ -1471,7 +1462,6 @@ export default {
      * @date   : 2022-5-12 11:47
      */
     drop(e, type) {
-      console.log('drop')
       switch (type) {
         case 'page':
           let data = this.getItemTemplate(e)
@@ -1647,7 +1637,6 @@ export default {
       this.tableInfo.left = newRect.left
     },
     selectDragImg(index) {
-      console.log(index)
       this.clearAllSelect()
       this.imgList.forEach((it, i) => {
         if (index === i) {
@@ -1699,14 +1688,11 @@ export default {
 
       // 提交时 重新处理一下width
       let table = document.getElementById('printTemplateTable')
-      console.log('tableCol', this.tableCol)
       if (table) {
         for (let j = 0; j < table.rows[0].cells.length; j++) {
-          console.log('offsetWidth', table.rows[0].cells[j].getAttribute('data-key'))
           let width = table.rows[0].cells[j].offsetWidth
           this.tableCol.forEach(tcIt => {
             if (tcIt.key === table.rows[0].cells[j].getAttribute('data-key')) {
-              console.log(tcIt.key, width)
               tcIt.width = parseInt(width)
             }
           })
@@ -1760,7 +1746,6 @@ export default {
       return uuid
     },
     changeTemplateType(val) {
-      console.log('changeTemplateType', this.moveList, this.tableInfo, this.imgList)
       if (this.moveList.length > 0 || this.tableInfo || this.imgList.length > 0) {
         this.$Modal.confirm({
           title: '提示',
@@ -1790,17 +1775,14 @@ export default {
       return ctx.measureText(str).width
     },
     changeFunc(val) {
-      console.log('changeFunc', val)
       if (!val) {
         return
       }
       let templateObj = this.templateTypeList.filter(it => {
         return it.value === val
       })[0]
-      console.log('templateObj', templateObj)
       /* 这块得改一下  因为元素太多会超出纸张范围 沈博 2022年6月30日13:43:01*/
       this.$nextTick(() => {
-        console.log('paperDirection', this.paperDirection, this.paperTypeList[this.paperType], document.getElementById('paper').offsetHeight)
 
         let paperHeight = document.getElementById('paper').offsetHeight
         let paperWidth = document.getElementById('paper').offsetWidth
@@ -1911,7 +1893,6 @@ export default {
      * @date   : 2022-5-13 14:40
      */
     moveDom(way) {
-      console.log('this.currentIndex', this.currentIndex, 'this.currentImgIndex', this.currentImgIndex, this.currentColIndex)
       if (this.currentIndex >= 0) {
         switch (way) {
           case 'left':
@@ -1980,7 +1961,6 @@ export default {
       let nextElement = null
       let nextWidth = 0
 
-      // console.log('table', table)
       for (let j = 0; j < table.rows[0].cells.length; j++) {
         table.rows[0].cells[j].onmousedown = function (e) {
           //记录单元格

src/config/index.js

@@ -1529,7 +1529,7 @@ export default {
    * @date   : 2022-5-13 13:10
    */
   paperTypeList: [
-    { label: '自定义', value: 0, width: 0, height: 0 },
+    { label: '自定义', value: '0', width: 0, height: 0 },
     { label: 'A4 (21cm x 29.7cm)', value: 1, width: 21, height: 29.7 },
     { label: 'A5 (14.8cm x 21cm)', value: 2, width: 14.8, height: 21 },
     { label: 'B5 (17.6cm x 25cm)', value: 3, width: 17.6, height: 25 },,

src/locale/lang/zh-CN.js

@@ -352,6 +352,7 @@ export const columns = {
   className: '分类名称',
   classCode: '模块',
   settingName: '参数名称',
+  settingStyle:'参数分类',
   settingValue: '参数值',
   settingDefault: '默认值',
   settingDescription: '参数说明',
@@ -962,6 +963,8 @@ export const columns = {
   columns:'列',
   rows:'行',
   data:'值',
+  paperType: '纸张类型',
+  paperDirection: '纸张方向',
 }
 
 /**

src/mixins/index.js

@@ -510,11 +510,15 @@ export const indexMixin = {
      * @author : 周兴
      * @date   : 2023/1/6 13:04
      */
-    getMaxDisplayNo(displayNoTable, formDataName = null) {
+    getMaxDisplayNo(displayNoTable,otherParams = null, formDataName = null) {
       let params = {
         table: displayNoTable.model + "." + displayNoTable.table,
         ftyId: this.$store.state.user.ftyId
       }
+      // 如果有其他条件，需要合并到查询条件中
+      if(otherParams){
+        this.objectMerge(params, otherParams)
+      }
       this.excute(this.$service.commonService, this.$service.commonService.getMaxDisplayNo, params).then(res => {
         if (res.code === this.$config.SUCCESS_CODE) {
           if (!formDataName) {

src/view-app/login/app-login.vue

@@ -10,17 +10,17 @@
         flex-direction: column;align-items: center;justify-content: center;background: #8c939d">
         <div style="width: 80%;border-radius: 3px;margin: 10px 20px">
           <!-- 输输入用户名 -->
-          <dk-app-field ref="ftyCode" v-model="ftyCode" :label="$t('appftyCode')"
+          <dk-app-field ref="ftyCode" :isOnceHideKeyboard="false" v-model="ftyCode" :label="$t('appftyCode')"
                         @changeBarCode="setFocus('userCode')"/>
         </div>
         <div style="width: 80%;border-radius: 3px;margin: 10px 20px  ">
           <!-- 输输入用户名 -->
-          <dk-app-field ref="userCode" v-model="userCode" :label="$t('appUserCode')"
+          <dk-app-field ref="userCode"  :isOnceHideKeyboard="false" v-model="userCode" :label="$t('appUserCode')"
                         @changeBarCode="setFocus('userPwd')"/>
         </div>
         <div style="width: 80%;border-radius: 3px;margin: 10px 20px ">
           <!-- 输入密码 -->
-          <dk-app-field ref="userPwd" v-model="userPwd" :formatter-flg="false" type-input="password"
+          <dk-app-field  :isOnceHideKeyboard="false" ref="userPwd" v-model="userPwd" :formatter-flg="false" type-input="password"
                         :label="$t('appUserPw')"
                         @changeBarCode="login"/>
         </div>

src/view/core/system-setting/index.vue

@@ -18,11 +18,11 @@
     <card ref="tableCard">
       <div style="display: flex;width: 100%;height: 100%">
         <!-- 列表部分左侧   -->
-        <div style="width: 260px;">
+        <div style="width: 200px;">
           <DkTable
             ref="leftTable"
             :data="searchInfo"
-            :height="tableHeight-20"
+            :height="tableHeight-30"
             :page-flag="false"
             :page-total-flag="false"
             :show-setting-flag="false"
@@ -30,23 +30,23 @@
             :choose-flag="false"
             @current-change="currentChangeEvent($event)">
             <DkTableColumn :title="$t('className')" field="className"
-                           width="auto" :filter=false></DkTableColumn>
+                           width="auto" :filter=false :center-flag="true"></DkTableColumn>
           </DkTable>
         </div>
 
         <!-- 列表部分右侧   -->
-        <div style="margin-left: 5px;width:calc( 100% - 260px )">
+        <div style="margin-left: 5px;width:calc( 100% - 200px )">
           <DkTable
             ref="rightTable"
             :data="tableRightData"
-            :height="tableHeight-20"
+            :height="tableHeight-30"
             :page-flag="false"
             :page-total-flag="false"
             :show-setting-flag="false"
             :freeze="false"
             :choose-flag="false">
-            <DkTableColumn field="classCode"></DkTableColumn>
-            <DkTableColumn field="settingName" width="280"></DkTableColumn>
+            <DkTableColumn field="classCode" :title="$t('settingStyle')"  width="100"></DkTableColumn>
+            <DkTableColumn field="settingName" width="220"></DkTableColumn>
             <vxe-column show-overflow="ellipsis" field="settingValue" width="100" height="100" min-width="80" class-name="setting-value-class"
                         :title="$t('settingValue')"
             >
@@ -80,24 +80,24 @@
               </template>
 
             </vxe-column>
-            <vxe-column show-overflow="ellipsis" field="settingDefault" width="100" height="100" min-width="80"
-                        :title="$t('settingDefault')"
-            >
-              <template #default="{ row }">
-                <!--数字类型-->
-                <vxe-input v-if="row.valueKind == 'INT' || row.valueKind == 'NUM'" size="mini" :disabled=true
-                           v-model="row.settingDefault"></vxe-input>
-                <!--文本类型-->
-                <vxe-input v-if="row.valueKind == 'STR'" :disabled=true
-                           size="mini" v-model="row.settingDefault"></vxe-input>
-                <!--下拉框类型-->
-                <vxe-input v-if="row.valueKind == 'S-CHOICE'" :disabled=true
-                           size="mini" v-model="row.settingDefault"></vxe-input>
-                <!--布尔类型-->
-                <i-switch size="small" :disabled=true v-if="row.valueKind == 'BOOL'"
-                          v-model="row.settingDefault"></i-switch>
-              </template>
-            </vxe-column>
+<!--            <vxe-column show-overflow="ellipsis" field="settingDefault" width="100" height="100" min-width="80"-->
+<!--                        :title="$t('settingDefault')"-->
+<!--            >-->
+<!--              <template #default="{ row }">-->
+<!--                &lt;!&ndash;数字类型&ndash;&gt;-->
+<!--                <vxe-input v-if="row.valueKind == 'INT' || row.valueKind == 'NUM'" size="mini" :disabled=true-->
+<!--                           v-model="row.settingDefault"></vxe-input>-->
+<!--                &lt;!&ndash;文本类型&ndash;&gt;-->
+<!--                <vxe-input v-if="row.valueKind == 'STR'" :disabled=true-->
+<!--                           size="mini" v-model="row.settingDefault"></vxe-input>-->
+<!--                &lt;!&ndash;下拉框类型&ndash;&gt;-->
+<!--                <vxe-input v-if="row.valueKind == 'S-CHOICE'" :disabled=true-->
+<!--                           size="mini" v-model="row.settingDefault"></vxe-input>-->
+<!--                &lt;!&ndash;布尔类型&ndash;&gt;-->
+<!--                <i-switch size="small" :disabled=true v-if="row.valueKind == 'BOOL'"-->
+<!--                          v-model="row.settingDefault"></i-switch>-->
+<!--              </template>-->
+<!--            </vxe-column>-->
             <DkTableColumn field="settingDescription" width="auto"></DkTableColumn>
           </DkTable>
         </div>
@@ -428,6 +428,14 @@ export default {
 /deep/.setting-value-class .vxe-cell{
   padding-left: 0 !important;
   padding-right: 0 !important;
+  display: flex !important;
+  align-items: center !important;
+  justify-content: center;
+}
+
+/deep/.vxe-input--inner{
+  text-align: center !important;
+  padding: 0 !important;
 }
 
 /deep/ .vxe-cell {

src/view/mst/custom-report/form.vue

@@ -1271,24 +1271,24 @@ export default {
      */
     handleSqlScript(sqlItem) {
       let sqlScript = sqlItem.sqlScript
-      sqlScript = sqlScript.replaceAll('#{ftyId}', -1)
       let conditionData = this.$refs['conditionTable'].getTableDataFilter();
-      conditionData.forEach(t => {
-        // 日期范围
-        if (t.kind === this.$config.reportKind.dateRange) {
-          sqlScript = sqlScript.replaceAll('#{' + t.code?.trim() + 'Start' + '}', null)
-          sqlScript = sqlScript.replaceAll('#{' + t.code?.trim() + 'End' + '}', null)
-        } else {
-          sqlScript = sqlScript.replaceAll('#{' + t.code?.trim() + '}', null)
-        }
-      })
       // 不用控制严格，只要有跳转条件，其他页签的都处理下的（兼容link模式）
       this.sqlTabsOptions.forEach((t, index) => {
         if (t.changeScript) {
           let changeScripts = t.changeScript.trim().split(',');
           this.sqlTabsOptions.forEach((item, itemNo) => {
-            if(index != itemNo){
+            if (index != itemNo) {
               sqlScript = item.sqlScript
+              sqlScript = sqlScript.replaceAll('#{ftyId}', -1)
+              conditionData.forEach(t => {
+                // 日期范围
+                if (t.kind === this.$config.reportKind.dateRange) {
+                  sqlScript = sqlScript.replaceAll('#{' + t.code?.trim() + 'Start' + '}', null)
+                  sqlScript = sqlScript.replaceAll('#{' + t.code?.trim() + 'End' + '}', null)
+                } else {
+                  sqlScript = sqlScript.replaceAll('#{' + t.code?.trim() + '}', null)
+                }
+              })
               changeScripts.forEach(it => {
                 sqlScript = sqlScript.replaceAll('#{' + it + '}', null)
               })
@@ -1339,19 +1339,32 @@ export default {
       params.conditionDeleteList = this.$refs['conditionTable'].getDeleteData();
       // sql
       params.sqlList = this.sqlTabsOptions.copy();
+      let filters = null;
       params.sqlList.forEach((item, i) => {
         item.displayNo = i + 1;
-        let filters = this.sqlTabsOptions.filter(it => it.changeTabName === item.label);
-        item.changeScriptOthers = []
+        filters = this.sqlTabsOptions.filter(it => it.changeTabName === item.label);
         if (filters && filters.length > 0) {
           filters.forEach(it => {
             if (it.changeScript) {
+              if(!item.changeScriptOthers){
+                item.changeScriptOthers = []
+              }
               item.changeScriptOthers.pushNoRepeat(it.changeScript)
             }
           })
         }
         // 处理表格
         item.tableSettingList.forEach((it, index) => {
+          // 统计在列表中的跳转页签
+          if (it.changeTabName) {
+            filters = params.sqlList.filter(t => t.label === it.changeTabName);
+            if(filters && filters.length > 0){
+              if(!filters[0].changeScriptOthers){
+                filters[0].changeScriptOthers = []
+              }
+              filters[0].changeScriptOthers.pushNoRepeat(item.changeScript)
+            }
+          }
           // 宽度为空默认150
           it.width = it.width ? it.width : '150';
           // 数据类型如果为空默认是字符串

src/view/mst/custom-report/report.vue

@@ -26,7 +26,7 @@
 
     <!-- 表格展示  -->
     <!--    {{form['tableData_' + tabIndex]}}-->
-    <div v-if="tabsOptions && tabsOptions[tabIndex] ">
+    <div v-if="tabsOptions && tabsOptions[tabIndex] && flgVisible">
       <DkTable slot="top" :id="'table-'+$options.name" :ref="'table-select-' + tabIndex"
                :data="form['tableData_' + tabIndex]"
                :height="tabsOptions.length > 1?this.tableHeight - 30:this.tableHeight"
@@ -71,6 +71,7 @@ export default {
   data() {
     return {
       reportId: '',
+      flgVisible:true,
       form: {},
       reportForm: {},
       tableData: [],// 报表数据
@@ -80,7 +81,7 @@ export default {
       tabsOptions: [], // tab数据源
       changeFlag: false,// 是否是跳转
       searchParams: {},// 查询条件
-      linkChangeTabs:[],// 点击链接跳转到相应的页签
+      linkChangeTabs:{},// 点击链接跳转到相应的页签
     }
   },
   methods: {
@@ -106,7 +107,7 @@ export default {
      * @date   : 2023/4/19 18:01
      */
     async chooseData(row, rowIndex,changeTabName) {
-      console.log('eee',row,rowIndex,changeTabName)
+      this.flgVisible = false
       if(!changeTabName){
         changeTabName = this.tabsOptions[this.tabIndex].changeTabName
       }
@@ -124,6 +125,7 @@ export default {
         }
         // 切换页签，处理小计
         this.changeTabHandleSubTotal();
+        this.flgVisible = true;
         this.$nextTick(() => {
           //查询条件
           this.setCondition(this.searchCond)
@@ -135,7 +137,7 @@ export default {
           if (changeScript.indexOf(',') >= 0) {
             let changeScripts = changeScript.split(',');
             changeScripts.forEach(it => {
-              params[it] = row[it]
+              params[it] = row[it]?row[it]:null
             })
           } else {
             params[changeScript] = row[changeScript]
@@ -144,7 +146,6 @@ export default {
           this.getData(params)              // 执行查询
           this.searchParams = {...params}  // 记录当时的查询条件
           this.changeFlag = true;
-
         })
       }
     },
@@ -179,6 +180,7 @@ export default {
      * @date   : 2023/3/30 8:48
      */
     handleChangeSqlTab(val) {
+      this.flgVisible = false
       this.$nextTick(() => {
         // 先记录现在的页签的表格翻页信息
         // console.log('this.pageInfo', this.pageInfo, this.tabsOptions[this.tabIndex])
@@ -189,6 +191,9 @@ export default {
         }
         // 切换页签，处理小计
         this.changeTabHandleSubTotal();
+        setTimeout(()=>{
+          this.flgVisible = true;
+        },200)
       })
     },
     /**
@@ -262,8 +267,9 @@ export default {
      * @author : 周兴
      * @date   : 2023/4/28 16:00
      */
-    handleLink(e){
-      this.chooseData(e);
+    handleLink(row,rowIndex, field){
+      let changeTabName = this.linkChangeTabs[field]
+      this.chooseData(row,rowIndex,changeTabName);
     },
     /**
      * @desc   : 设置小计行
@@ -515,7 +521,7 @@ export default {
      * @date   : 2023/3/28 19:55
      */
     handleTableSetting(row, index) {
-      let table = row.tableSettingList;
+      let table = row.tableSettingList?.copy();
       row.tableColumns = []
       this.showFooter = false;
       if (table && table.length > 0) {
@@ -533,10 +539,7 @@ export default {
             // 是否是链接
             if(it.flgLink){
               item.type = 'link'
-              this.linkChangeTabs.push({
-                field:it.code,
-                tabName:it.changeTabName
-              })
+              this.linkChangeTabs[it.code] = it.changeTabName
             }
             item.dataType = it.dataType ? it.dataType : this.$config.dataType.str
             if (it.flgSum) {

src/view/mst/dictionary/index.vue

@@ -33,7 +33,8 @@
                :choose-flag="false"
                :height="this.tableHeight" primaryKey="dataId"
                @pageChange="pageSizeChange">
-        <DkTableColumn field="dictCode" type="link" @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
+        <DkTableColumn field="dictCode" type="link"
+                       @on-link="handleLink(Object.assign($event,{button:'edit'}))"></DkTableColumn>
         <DkTableColumn field="dataValue"></DkTableColumn>
         <DkTableColumn field="displayNo"></DkTableColumn>
         <DkTableColumn field="flgValid" type="switch" @on-switch-change="onSwitchChange"
@@ -136,20 +137,20 @@ export default {
      * @author : 周兴
      * @date   : 2023/2/8 12:55
      */
-    createdInit(){
+    createdInit() {
       this.primaryKey = 'dataId'     // 设置主键
       this.routeObjName = 'dictionaryData'  // 设置路由名称
-      if(this.formType === this.$config.dictionaryType.kilnType){    // 窑炉类型
+      if (this.formType === this.$config.dictionaryType.kilnType) {    // 窑炉类型
         this.dictCodeType = this.$config.dicCode.kilnDicCode
-      }else if(this.formType === this.$config.dictionaryType.moldingType){    // 成型线类型
+      } else if (this.formType === this.$config.dictionaryType.moldingType) {    // 成型线类型
         this.dictCodeType = this.$config.dicCode.moldingDicCode
-      }else if(this.formType === this.$config.dictionaryType.carrierMaterial){    // 模具原料
+      } else if (this.formType === this.$config.dictionaryType.carrierMaterial) {    // 模具原料
         this.dictCodeType = this.$config.dicCode.carrierMaterialDicCode
-      }else if(this.formType === this.$config.dictionaryType.unformedReason){    // 未成型原因
+      } else if (this.formType === this.$config.dictionaryType.unformedReason) {    // 未成型原因
         this.dictCodeType = this.$config.dicCode.unformedReasonDicCode
-      }else if(this.formType === this.$config.dictionaryType.processType){    // 工艺类别
+      } else if (this.formType === this.$config.dictionaryType.processType) {    // 工艺类别
         this.dictCodeType = this.$config.dicCode.processTypeDicCode
-      }else if(this.formType === this.$config.dictionaryType.nodeType){    // 工序类别
+      } else if (this.formType === this.$config.dictionaryType.nodeType) {    // 工序类别
         this.dictCodeType = this.$config.dicCode.nodeTypeDicCode
       }
       // 导出额外的条件
@@ -172,7 +173,7 @@ export default {
         remarks: ''
       }
       // 加载最大序号
-      this.getMaxDisplayNo(this.$config.displayNoTable.dictionaryData);
+      this.getMaxDisplayNo(this.$config.displayNoTable.dictionaryData, this.dictCodeType);
     },
     /**
      *   @desc   : 给参数赋值
@@ -213,14 +214,14 @@ export default {
     initData(type) {
       if (type === this.$config.formMode.add) {
         // 加载最大序号
-        this.getMaxDisplayNo(this.$config.displayNoTable.dictionaryData);
+        this.getMaxDisplayNo(this.$config.displayNoTable.dictionaryData, {dictCode: this.dictCodeType});
       }
     },
     /**
-    * @desc   : 编辑按钮事件
-    * @author : 常皓宁
-    * @date   : 2023/2/7 13:51
-    */
+     * @desc   : 编辑按钮事件
+     * @author : 常皓宁
+     * @date   : 2023/2/7 13:51
+     */
     edit(rows) {
       this.modalParams = {
         button: this.$config.formMode.edit,

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

@@ -93,10 +93,10 @@
       v-model="showSetTemplate"
       fullscreen
       :title="$v('searchSet')"
-      :footer-flag="false"
+      @modalOk="$refs.setting ? $refs.setting.save():null"
     >
       <Setting :label-kind="labelKind" :id="$refs['table-select'] ? $refs['table-select'].batchKeys[0]:null" v-if="showSetTemplate"
-      @close="showSetTemplate=false"/>
+      @close="showSetTemplate=false" ref="setting"/>
     </DkModal>
   </div>
 </template>

src/view/mst/label-print-layout/setting.vue

@@ -28,13 +28,19 @@ export default {
   },
   methods: {
     /**
+     * @desc   : template中的保存
+     * @author : 洪旭东
+     * @date   : 2023-05-04 09:55
+     */
+    save() {
+      this.$refs.print.save()
+    },
+    /**
      * @desc   : 保存模板
      * @author : 姜宏超
      * @date   : 2022/5/5 10:46
      */
     saveTemplate(val) {
-      console.log(val)
-
       this.excute(this.$service.labelPrintLayoutService, this.$service.labelPrintLayoutService.update, {
         layoutId: this.id,
         layoutData: val.templateInfo
@@ -46,35 +52,6 @@ export default {
           this.$Message.error(res.message)
         }
       })
-
-      // let params = {
-      //   tmId: val.tmId,
-      //   tmName: val.name,
-      //   docCode: val.typeCode,
-      //   tmData: val.templateInfo,
-      //   displayNo: val.displayNo,
-      //   cpId: this.$store.state.user.cpId,
-      //   sysId: this.$store.state.user.sysId
-      // }
-      // if (val.tmId) {
-      //   PrintTemplateService.update(params).then(res => {
-      //     if (res.code === 200) {
-      //       this.$Message.success(res.message)
-      //       this.closeTag(this.$route)
-      //     } else {
-      //       this.$Message.error(res.message)
-      //     }
-      //   })
-      // } else {
-      //   PrintTemplateService.insert(params).then(res => {
-      //     if (res.code === 200) {
-      //       this.$Message.success(res.message)
-      //       this.closeTag(this.$route)
-      //     } else {
-      //       this.$Message.error(res.message)
-      //     }
-      //   })
-      // }
     },
     /**
      * @desc   : 重写计算表格高度方法，避免报错