Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into develop

src/server/api.js

@@ -28,7 +28,7 @@ export const deleteData = (url, params) =>
 // 标准定义
 export const getStanderOne = (params) =>
   service.request({
-		url: "/admin/base/stdef/query",
+		url: "/admin/base/stdef/selectlist",
     method: "get",
     params,
   });

src/views/system/printer/printertab/addOrEdit.vue

@@ -133,7 +133,7 @@ export default {
 	created() {
 		this.options = getWorkshopList()
 		this.getStanderOne({ statid: 'Printer-PrinterType' }).then(res => {
-      this.typeArray = res.data.records || []
+      this.typeArray = res.data || []
     })
 	},
 	methods: {

src/views/system/printer/printertab/index.vue

@@ -2,7 +2,7 @@
   <div>
     <SearchTemplate>
 			<el-form :inline="true" class="clearfix search-content">
-        <el-form-item label="打印ID">
+        <el-form-item :label="getColumnName('Printer-PrinterId')">
 					<el-input
 						v-model.trim="queryParams.printerid"
 						placeholder="请输入查询内容"