工序信息

mes-ui/mes-ui-admin-vue3/src/views/biz/procedure/ProcedureForm.vue

@@ -5,7 +5,7 @@
         <el-input v-model="formData.code" placeholder="系统自动生成" disabled class="!w-250px" />
       </el-form-item>
       <el-form-item label="工序名称" prop="name">
-        <el-input v-model="formData.name" class="!w-250px" />
+        <el-input v-model="formData.name" placeholder="工序名称"  class="!w-250px" />
       </el-form-item>
       <el-form-item label="所属车间" prop="wid">
         <el-select v-model="formData.wid" placeholder="请选择车间" clearable class="!w-250px">
@@ -14,30 +14,20 @@
       </el-form-item>
       <el-form-item label="默认工资类型" prop="salaryType">
         <el-select v-model="formData.salaryType" placeholder="请选择工资类型">
-          <el-option
+          <el-option v-for="dict in getStrDictOptions(DICT_TYPE.BIZ_SALARY_TYPE)" :key="dict.value" @change="onchangetype(val)" :label="dict.label" :value="dict.value" />
-            v-for="dict in getStrDictOptions(DICT_TYPE.BIZ_SALARY_TYPE)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
         </el-select>
       </el-form-item>
       <el-form-item label="额定工时" prop="standard1Time">
-        <el-input v-model="formData.standard1Time" placeholder="请输入额定工时1" oninput="value=value.replace(/[^0-9.]/g,'')" />
+        <el-input v-model="formData.standard1Time" class="!w-250px" placeholder="请输入额定工时1" oninput="value=value.replace(/[^0-9.]/g,'')" />
       </el-form-item>
       <el-form-item label="额定工价" prop="standardLabourPrice">
-        <el-input v-model="formData.standardLabourPrice" placeholder="请输入额定工价" oninput="value=value.replace(/[^0-9.]/g,'')" />
+        <el-input v-model="formData.standardLabourPrice" class="!w-250px" placeholder="请输入额定工价" oninput="value=value.replace(/[^0-9.]/g,'')" />
         <!-- 额定工价：新增字段，数字，保留两位小数 -->
       </el-form-item>
       <!-- 计件依据：新增字段，下拉框，字典值为：合格数量/报工数量，默认：报工数量 -->
-      <el-form-item label="计件依据">
+      <el-form-item label="计件依据" >
         <el-select v-model="formData.pieceworkBasis" placeholder="请选择计件依据">
-          <el-option
+          <el-option v-for="dict in getStrDictOptions(DICT_TYPE.BIZ_PIECEWORK_BASIS)" :key="dict.value" :label="dict.label" :value="dict.value" />
-            v-for="dict in getStrDictOptions(DICT_TYPE.BIZ_PIECEWORK_BASIS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
         </el-select>
       </el-form-item>
       <el-form-item label="是否需要报工" prop="isReport">
@@ -65,7 +55,6 @@
         </el-radio-group>
       </el-form-item>
 
-
     </el-form>
     <template #footer>
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
@@ -74,7 +63,7 @@
   </Dialog>
 </template>
 <script setup lang="ts">
-import {getIntDictOptions, DICT_TYPE, getStrDictOptions} from '@/utils/dict'
+import { getIntDictOptions, DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import * as ProcedureApi from '@/api/biz/procedure'
 import * as WorkshopApi from '@/api/biz/workshop'
 
@@ -97,10 +86,13 @@ const formData = ref({
   procedureType: undefined,
   standard1Time: undefined,
   standard2Time: undefined,
+  standardLabourPrice: undefined,
+  pieceworkBasis: undefined,
+  salaryType: 'HourWage',
 })
 const formRules = reactive({
   name: [{ required: true, message: '工序名称,不能为空', trigger: 'blur' }],
-  procedureType: [{ required: true, message: '工序类型不能为空', trigger: 'change' }],
+  procedureType: [{ required: true, message: '工序类型不能为空', trigger: 'change' }]
   // status: [{ required: true, message: '状态,1表示正常，2表示禁用不能为空', trigger: 'blur' }],
 })
 const formRef = ref() // 表单 Ref
@@ -108,7 +100,6 @@ const workshopList = ref([])
 
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
-
   const queryParamsWorkShop = reactive({
     pageNo: 1,
     pageSize: 100,
@@ -116,11 +107,11 @@ const open = async (type: string, id?: number) => {
   })
 
   const dataWorkShops = await WorkshopApi.getWorkshopPage(queryParamsWorkShop)
-  dataWorkShops.list.forEach(element => {
+  dataWorkShops.list.forEach((element) => {
     element.value = element.id
     element.label = element.name
-  });
+  })
-  workshopList.value =  dataWorkShops.list
+  workshopList.value = dataWorkShops.list
 
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
@@ -146,6 +137,8 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
+    console.log(formData.value)
+
     const data = formData.value as unknown as ProcedureApi.ProcedureVO
     // data.isReport = data.isReport?1:0
     if (formType.value === 'create') {
@@ -177,7 +170,22 @@ const resetForm = () => {
     procedureType: undefined,
     standard1Time: undefined,
     standard2Time: undefined,
+    standardLabourPrice: undefined,
+    pieceworkBasis: undefined,
+    salaryType: 'HourWage'
   }
   formRef.value?.resetFields()
 }
+
+watch(
+  formData,
+  (newFormData) => {
+    if (newFormData.salaryType=='HourWage') {
+      formData.value.pieceworkBasis = '02'
+    }else{
+      formData.value.pieceworkBasis = undefined
+    }
+  },
+  { deep: true }
+)
 </script>