Merge branch 'master' of http://git.dongkesoft.com:9001/DK-MES-3.0/mes-web

src/components/business/select-magnifier/setting.js

@@ -302,7 +302,7 @@ const data = {
     selectLabel: 'nodeName',
     // 列表列
     columns: [
-      {field: 'nodeName', width: 'auto'},
+      {field: 'nodeCodeName', width: 'auto',title:$t('productionProcess')},
       {field: 'nodeKindName', width: 'auto'},
       {field: 'flowName', width: 'auto'},
       {field: 'workShopName', width: 'auto'},

src/locale/lang/zh-CN.js

@@ -360,6 +360,7 @@ export const columns = {
   contactName: '联系人',
   customTags: '标签',
   tagName: '标签名称',
+  TagsTemplement:'标签模版',
   longitude: '经度',
   latitude: '纬度',
   addressRange: '行政区划',

src/view/mst/molding/index.vue

@@ -99,7 +99,7 @@
 
   export default {
     mixins: [indexMixin],
-    name: 'molding',
+    name: 'moldline',
     data() {
       let self = this
       return {

src/view/pdm/work-station/index.vue

@@ -48,7 +48,7 @@
                        :handleLink(Object.assign($event,{button:'editPrinter'}))"></DkTableColumn>
         <DkTableColumn field="workShopName"></DkTableColumn>
         <DkTableColumn field="levelName" :title="$t('workSpaceId')" width="280"></DkTableColumn>
-        <DkTableColumn field="nodeName"></DkTableColumn>
+        <DkTableColumn field="nodeCodeName" :title="$t('productionProcess')"></DkTableColumn>
         <!--        <DkTableColumn field="stationUsers"></DkTableColumn>-->
         <DkTableColumn field="uniqueCode" :title="$t('kilnCode')"></DkTableColumn>
         <DkTableColumn field="stationCode"></DkTableColumn>
@@ -88,10 +88,10 @@
                  ref="workTeam-select"
                  :choose-flag="false"
                  :data="workStationPrinter">
-          <DkTableColumn field="printerName" ></DkTableColumn>
-          <DkTableColumn field="printTypeName" ></DkTableColumn>
-          <DkTableColumn field="printLayoutName" ></DkTableColumn>
-          <DkTableColumn field="stationName" ></DkTableColumn>
+          <DkTableColumn field="printerName"></DkTableColumn>
+          <DkTableColumn field="printTypeName" :title="$t('labelPrintType')"></DkTableColumn>
+          <DkTableColumn field="printLayoutName" :title="$t('TagsTemplement')"></DkTableColumn>
+          <DkTableColumn field="stationName"></DkTableColumn>
           <DkTableColumn field="printCopies" width="100px" :data-type="$config.dataType.number"></DkTableColumn>
           <DkTableColumn field="displayNo" width="100px" :data-type="$config.dataType.number"></DkTableColumn>
           <DkTableColumn field="remarks" width="auto"></DkTableColumn>
@@ -214,7 +214,7 @@ export default {
           options: () => self.printLayoutList,
         },
         //打印份数
-        {field: 'printCopies', type: 'number', width: 'auto',max:999},
+        {field: 'printCopies', type: 'number', width: 'auto', max: 999},
         //显示顺序
         {field: 'displayNo', type: 'number', width: 'auto'},
         //备注
@@ -231,6 +231,7 @@ export default {
         },
         {
           itemCode: 'flowNodeName',
+          itemName: 'productionProcess',
           valueFormat: {code: 'nodeIds'},
           valueKind: self.$config.docUserInput.mSearch,
           magnifierType: self.$config.MagnifierType.processNode
@@ -265,12 +266,14 @@ export default {
       }
     },
     /**
-     * @desc   : 加载数据
-     * @author : 常皓宁
-     * @date   : 2023/1/6 12:58
+     * @desc   : 设置查询条件
+     * @author : 周兴
+     * @date   : 2023/12/27 14:06
      */
-    initData(type) {
-
+    setSearchParams(params){
+      // 只查标签打印为true的
+      params.flgPrint = true;
+      return params;
     },
     /**
      *   @desc   : 获取数据