Merge branch 'main' of https://git.ngsk.tech/linweidong/besure_web

src/components/UploadFile/src/UploadFile.vue

@@ -34,7 +34,10 @@
       </template>
       <template #file="row">
         <div class="flex items-center">
-          <span>{{ row.file.name }}</span>
+          <!-- <span>{{ row.file.name }}</span> -->
+          <el-tooltip :content="row.file.name" placement="top">
+  <span class="ellipsis-text">{{ row.file.name }}</span>
+</el-tooltip>
           <div class="ml-10px">
             <el-link
               :href="row.file.url"
@@ -57,7 +60,7 @@
   <!-- 上传操作禁用时 -->
   <div v-if="disabled" class="upload-file">
     <div v-for="(file, index) in fileList" :key="index" class="flex items-center file-list-item">
-      <span>{{ file.name }}</span>
+  <span>{{ file.name}}</span>
       <div class="ml-10px">
         <el-link :href="file.url" :underline="false" download target="_blank" type="primary">
           下载
@@ -227,4 +230,12 @@ const emitUpdateModelValue = () => {
   border: 1px dashed var(--el-border-color-darker);
   border-radius: 8px;
 }
+
+.ellipsis-text {
+  display: inline-block;
+  max-width: 100px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 </style>

src/views/erp/autocode/AutocodeRuleForm.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog :title="dialogTitle" v-model="dialogVisible"  width = "1200">
     <el-form
       ref="formRef"
       :model="formData"
@@ -8,7 +8,7 @@
       v-loading="formLoading"
     >
       <el-form-item label="规则编码" prop="ruleCode">
-        <el-input v-model="formData.ruleCode" placeholder="请输入规则编码" />
+        <el-input v-model="formData.ruleCode" placeholder="请输入规则编码" :disabled = "formType == 'update'"/>
       </el-form-item>
       <el-form-item label="规则名称" prop="ruleName">
         <el-input v-model="formData.ruleName" placeholder="请输入规则名称" />

src/views/erp/mold/components/MoldList.vue

@@ -16,7 +16,7 @@
           <dict-tag :type="DICT_TYPE.ERP_MOLD_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="使用设备" align="center" prop="machineId" />
+      <el-table-column label="使用设备" align="center" prop="machineName" />
       <!-- <el-table-column label="模具图片" align="center" prop="images" /> -->
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="是否启用" align="center" prop="isEnable">

src/views/mes/task/TaskForm.vue

@@ -8,16 +8,24 @@
       v-loading="formLoading"
     >
       <el-form-item prop="code">
-        <template #label>
-            <span>
-              编码
-              <el-tooltip content="生产任务单编码规则" placement="top">
-                <Icon icon="ep:question-filled" />
-              </el-tooltip>
-            </span>
-        </template>
-        <el-input disabled v-model="formData.code" placeholder="编码保存后自动生成"/>
-      </el-form-item>
+  <template #label>
+    <span>
+      编码
+      <el-tooltip content="生产任务单编码规则" placement="top">
+        <Icon icon="ep:question-filled" />
+      </el-tooltip>
+    </span>
+  </template>
+  <div style="display: flex; align-items: center; gap: 10px">
+    <el-input 
+      :disabled="formData.isCode == true" 
+      v-model="formData.code" 
+      placeholder="编码保存后自动生成"
+      style="min-width: 600px"
+    />
+    <el-switch v-model="formData.isCode"/>
+  </div>
+</el-form-item>
       <el-form-item label="交货日期" prop="deliveryDate">
         <el-date-picker
           v-model="formData.deliveryDate"
@@ -80,7 +88,8 @@ const formData = ref({
   taskType: undefined,
   processInstanceId: undefined,
   remark: undefined,
-  isEnable: undefined
+  isEnable: undefined,
+  isCode: undefined
 })
 const formRules = reactive({
   deliveryDate: [{ required: true, message: '交货日期不能为空', trigger: 'blur' }],
@@ -141,7 +150,8 @@ const resetForm = () => {
     status: undefined,
     processInstanceId: undefined,
     remark: undefined,
-    isEnable: true
+    isEnable: true,
+    isCode: true
   }
   formRef.value?.resetFields()
 }

src/views/mes/zjitem/index.vue

@@ -80,10 +80,14 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="检验类型" align="center" prop="zjType" />
+      <!-- <el-table-column label="ID" align="center" prop="id" /> -->
       <el-table-column label="名称" align="center" prop="name" />
       <el-table-column label="作业方式" align="center" prop="tool" />
+      <el-table-column label="检验类型" align="center" prop="zjTypeName" >
+      <template #default="scope">
+        <el-tag>{{scope.row.zjTypeName}}</el-tag>
+      </template>
+      </el-table-column>
       <el-table-column label="标准值" align="center" prop="standardVal" />
       <el-table-column label="上限值" align="center" prop="upperVal" />
       <el-table-column label="下限值" align="center" prop="lowerVal" />

src/views/mes/zjtype/ZjTypeForm.vue

@@ -8,7 +8,7 @@
       v-loading="formLoading"
     >
       <el-form-item label="编码" prop="code">
-        <el-input v-model="formData.code" placeholder="请输入编码" />
+        <el-input v-model="formData.code" placeholder="请输入编码" :disabled = "formType == 'update'"/>
       </el-form-item>
       <el-form-item label="名称" prop="name">
         <el-input v-model="formData.name" placeholder="请输入名称" />

src/views/mold/repairItems/MoldRepairItemsForm.vue

@@ -98,7 +98,7 @@ const validateDeviceId = (_: any, value: any, callback: any) => {
 const formRules = reactive({
   subjectCode: [{ required: true, message: '项目编码不能为空', trigger: 'blur' }],
   subjectName: [{ required: true, message: '项目名称不能为空', trigger: 'blur' }],
-  moldId: [{ validator: validateDeviceId, trigger: 'change' }],
+  moldId: [{ required: true, validator: validateDeviceId, trigger: 'change' }],
   isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'change' }]
 })
 

src/views/system/user/UserForm.vue

@@ -131,6 +131,7 @@ const formRules = reactive<FormRules>({
   username: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }],
   nickname: [{ required: true, message: '工号不能为空', trigger: 'blur' }],
   password: [{ required: true, message: '用户密码不能为空', trigger: 'blur' }],
+  deptId: [{ required: true, message: '部门不能为空', trigger: 'blur' }],
   email: [
     {
       type: 'email',