فهرست منبع

feat: 保养工单增加填报人字段

- 新建、填报、详情页增加填报人展示与手动输入
- 提交表单绑定 mainWorkOrder.applicant 并增加必填校验
- 补充保养工单填报人多语言文案
Zimo 2 روز پیش
والد
کامیت
ef7f4d56cc

+ 1 - 1
config/env.dev.js

@@ -1,7 +1,7 @@
 // 开发环境配置
 export default {
   // apiUrl: "http://192.168.188.198:48080",
-  apiUrl: "https://iot.deepoli.css:5443",
+  apiUrl: "https://iot.deepoil.cc:5443",
   // apiUrl: 'https://aims.deepoil.cc', //正式
   apiUrlSuffix: "/admin-api",
   // 其他开发环境配置...

+ 12 - 12
config/env.prod.js

@@ -1,14 +1,14 @@
 // 生产环境配置
 export default {
-	// apiUrl: 'http://192.168.1.63:8888',
-	apiUrl: "https://aims.deepoil.cc", //测试
-	// apiUrl: "https://iot.deepoil.cc", //正式
-	apiUrlSuffix: "/admin-api",
-	// 其他开发环境配置...
-	corpId: "dingbe7f9a7e8cffa2bd35c2f4657eb6378f", //钉钉微应用 企业的CorpID - 正式环境
-	clientId: "dingmr9ez0ecgbmscfeb", //钉钉微应用的Client ID - 正式环境(原企业内部应用的 AppKey。原第三方企业应用的 SuiteKey。)
-	AgentId: "3687646006", //钉钉微应用的AgentID - 正式环境
-	MiniAppId: "5000000006298501", //钉钉微应用的MiniAppID - 正式环境
-	AppKey: "dingmr9ez0ecgbmscfeb", //钉钉微应用的AppKey - 正式环境
-	AppSecret: "VhG_zMdTvIBwA_0Ef8FJ0foH3VYYo5T-kw0ukX_PBA8Ah1xl7AjDw5RVYCU0DTpe", //钉钉微应用的AppSecret - 正式环境
-};
+  // apiUrl: 'http://192.168.1.63:8888',
+  apiUrl: "https://aims.deepoil.cc", //测试
+  // apiUrl: "https://iot.deepoil.cc:5443", //正式
+  apiUrlSuffix: "/admin-api",
+  // 其他开发环境配置...
+  corpId: "dingbe7f9a7e8cffa2bd35c2f4657eb6378f", //钉钉微应用 企业的CorpID - 正式环境
+  clientId: "dingmr9ez0ecgbmscfeb", //钉钉微应用的Client ID - 正式环境(原企业内部应用的 AppKey。原第三方企业应用的 SuiteKey。)
+  AgentId: "3687646006", //钉钉微应用的AgentID - 正式环境
+  MiniAppId: "5000000006298501", //钉钉微应用的MiniAppID - 正式环境
+  AppKey: "dingmr9ez0ecgbmscfeb", //钉钉微应用的AppKey - 正式环境
+  AppSecret: "VhG_zMdTvIBwA_0Ef8FJ0foH3VYYo5T-kw0ukX_PBA8Ah1xl7AjDw5RVYCU0DTpe", //钉钉微应用的AppSecret - 正式环境
+};

+ 1 - 0
locale/en.json

@@ -250,6 +250,7 @@
 	"maintenanceWorkOrder.editMaintenanceWorkOrder": "Fill in maintenance work order",
 	"maintenanceWorkOrder.viewMaintenanceWorkOrder": "View maintenance work order",
 	"maintenanceWorkOrder.maintenanceType": "Maintenance type",
+	"maintenanceWorkOrder.applicant": "Applicant",
 	"maintenanceWorkOrder.maintenanceTypeIn": "Internal",
 	"maintenanceWorkOrder.maintenanceTypeOut": "Outsourced",
 	"maintenanceWorkOrder.maintenanceCost": "Maintenance cost",

+ 1 - 0
locale/ja.json

@@ -250,6 +250,7 @@
 	"maintenanceWorkOrder.editMaintenanceWorkOrder": "保養作業指示書を記入",
 	"maintenanceWorkOrder.viewMaintenanceWorkOrder": "保養作業指示書を表示",
 	"maintenanceWorkOrder.maintenanceType": "保養タイプ",
+	"maintenanceWorkOrder.applicant": "記入者",
 	"maintenanceWorkOrder.maintenanceTypeIn": "内部",
 	"maintenanceWorkOrder.maintenanceTypeOut": "外部委託",
 	"maintenanceWorkOrder.maintenanceCost": "保養費用",

+ 1 - 0
locale/ru.json

@@ -250,6 +250,7 @@
 	"maintenanceWorkOrder.editMaintenanceWorkOrder": "Заполнить рабочий заказ на обслуживание",
 	"maintenanceWorkOrder.viewMaintenanceWorkOrder": "Просмотреть рабочий заказ на обслуживание",
 	"maintenanceWorkOrder.maintenanceType": "Тип обслуживания",
+	"maintenanceWorkOrder.applicant": "Заявитель",
 	"maintenanceWorkOrder.maintenanceTypeIn": "Внутренний",
 	"maintenanceWorkOrder.maintenanceTypeOut": "Контрактный",
 	"maintenanceWorkOrder.maintenanceCost": "Стоимость обслуживания",

+ 1 - 0
locale/zh-Hans.json

@@ -328,6 +328,7 @@
   "maintenanceWorkOrder.editMaintenanceWorkOrder": "填报保养工单",
   "maintenanceWorkOrder.viewMaintenanceWorkOrder": "查看保养工单",
   "maintenanceWorkOrder.maintenanceType": "保养类型",
+  "maintenanceWorkOrder.applicant": "填报人",
   "maintenanceWorkOrder.maintenanceTypeIn": "内部",
   "maintenanceWorkOrder.maintenanceTypeOut": "委外",
   "maintenanceWorkOrder.maintenanceCost": "保养费用",

+ 1 - 0
locale/zh-Hant.json

@@ -238,6 +238,7 @@
   "maintenanceWorkOrder.editMaintenanceWorkOrder": "填报保养工单",
   "maintenanceWorkOrder.viewMaintenanceWorkOrder": "查看保养工单",
   "maintenanceWorkOrder.maintenanceType": "保养类型",
+  "maintenanceWorkOrder.applicant": "填报人",
   "maintenanceWorkOrder.maintenanceTypeIn": "内部",
   "maintenanceWorkOrder.maintenanceTypeOut": "委外",
   "maintenanceWorkOrder.maintenanceCost": "保养费用",

+ 27 - 0
pages/maintenance/components/work-order-form.vue

@@ -61,6 +61,24 @@
           </uni-data-select>
         </uni-forms-item>
 
+        <!-- 填报人 -->
+        <uni-forms-item
+          class="form-item"
+          :label="$t('maintenanceWorkOrder.applicant')"
+          name="applicant"
+          :required="formItemRequired"
+        >
+          <uni-easyinput
+            style="text-align: right"
+            :inputBorder="false"
+            :clearable="true"
+            :disabled="formDisabled"
+            :placeholder="fillInPlaceholder"
+            :styles="{ disableColor: '#fff' }"
+            v-model="formData.applicant"
+          />
+        </uni-forms-item>
+
         <!-- 实际保养开始时间 -->
         <uni-forms-item
           class="form-item"
@@ -234,6 +252,15 @@ const formDataRules = ref({
       },
     ],
   },
+  applicant: {
+    rules: [
+      {
+        required: true,
+        errorMessage:
+          t("operation.PleaseFillIn") + t("maintenanceWorkOrder.applicant"),
+      },
+    ],
+  },
   actualStartTime: {
     rules: [
       {

+ 27 - 0
pages/maintenance/create.vue

@@ -46,6 +46,23 @@
             </uni-data-select>
           </uni-forms-item>
 
+          <!-- 填报人 -->
+          <uni-forms-item
+            class="form-item"
+            :label="$t('maintenanceWorkOrder.applicant')"
+            name="applicant"
+            :required="true"
+          >
+            <uni-easyinput
+              style="text-align: right"
+              :inputBorder="false"
+              :clearable="true"
+              :styles="{ disableColor: '#fff' }"
+              v-model="mainWorkOrder.applicant"
+              :placeholder="$t('operation.PleaseFillIn')"
+            />
+          </uni-forms-item>
+
           <!-- 实际保养开始时间 -->
           <uni-forms-item
             class="form-item"
@@ -345,6 +362,7 @@ const mainWorkOrder = ref({
   name: "", // 工单名称
   orderNumber: "", // 工单编号
   outsourcingFlag: 0, // 保养类型(是否委外 0否 1是)
+  applicant: "", // 填报人
   actualStartTime: "", // 实际开始时间
   actualEndTime: "", // 实际结束时间
   remark: "", // 备注
@@ -525,6 +543,15 @@ const mainWorkOrderRules = ref({
       },
     ],
   },
+  applicant: {
+    rules: [
+      {
+        required: true,
+        errorMessage:
+          t("operation.PleaseFillIn") + t("maintenanceWorkOrder.applicant"),
+      },
+    ],
+  },
   actualStartTime: {
     rules: [
       {

+ 8 - 0
pages/maintenance/detail.vue

@@ -25,6 +25,14 @@
 						</uni-data-select>
 					</uni-forms-item>
 
+					<!-- 填报人 -->
+					<uni-forms-item class="form-item" :label="$t('maintenanceWorkOrder.applicant')" name="applicant"
+						:required="false">
+						<uni-easyinput style="text-align: right" :inputBorder="false" :clearable="false"
+							:disabled="true" :styles="{disableColor:'#fff'}" v-model="mainWorkOrder.applicant"
+							:placeholder="' '" />
+					</uni-forms-item>
+
 					<!-- 实际保养开始时间 -->
 					<uni-forms-item class="form-item" :label="$t('maintenanceWorkOrder.actualMaintenanceStartTime')"
 						name="actualStartTime" :required="false">

+ 1 - 0
pages/maintenance/edit.vue

@@ -238,6 +238,7 @@ const showMessage = (type, message) => {
 const mainWorkOrder = ref({
   name: "", // 工单名称
   outsourcingFlag: "0", // 保养类型(是否委外 0否 1是)
+  applicant: "", // 填报人
   actualStartTime: "", // 实际开始时间
   actualEndTime: "", // 实际结束时间
   remark: "", // 备注