Merge branch 'master' of http://222.71.165.188:3000/yunxi/mes-heli

mes-ui/mes-ui-admin-vue3/src/views/heli/customer/CustomerForm.vue

@@ -80,7 +80,6 @@
           </el-row>
         </template>
       </el-card>
-
       <el-card class="hl-card-info">
         <template #header>
           <div class="hl-card-info-icona"></div><span class="hl-card-info-text">联系方式</span>
@@ -188,21 +187,21 @@
           <el-row>
             <el-col :span="24">
               <el-form-item label="客户地址1" prop="contact1Addr">
-                <el-input v-model="formData.contact1Addr" />
+                <el-input v-model="formData.contact1Addr" class="!w-1220px" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
               <el-form-item label="客户地址2" prop="contact2Addr">
-                <el-input v-model="formData.contact2Addr" />
+                <el-input v-model="formData.contact2Addr" class="!w-1220px" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
               <el-form-item label="客户地址3" prop="contact3Addr">
-                <el-input v-model="formData.contact3Addr" />
+                <el-input v-model="formData.contact3Addr" class="!w-1220px" />
               </el-form-item>
             </el-col>
           </el-row>

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

@@ -1,6 +1,6 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible">
-    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="100px" v-loading="formLoading">
+    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="120px" v-loading="formLoading">
       <el-form-item label="工序编号" prop="code">
         <el-input v-model="formData.code" placeholder="请输入工序编号" disabled class="!w-250px" />
       </el-form-item>
@@ -11,6 +11,13 @@
         <el-select v-model="formData.wid" placeholder="请选择车间" clearable class="!w-250px">
           <el-option v-for="dict in workshopList" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
+      </el-form-item>
+        <el-form-item label="是否需要报工" prop="isReport">
+        <el-radio-group v-model="formData.isReport">
+          <el-radio v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)" :key="dict.value" :label="dict.value">
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
       </el-form-item>
       <el-form-item label="描述" prop="description">
         <el-input v-model="formData.description" height="150px" type="textarea" />
@@ -22,13 +29,7 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="是否报工" prop="isReport">
+    
-        <el-radio-group v-model="formData.isReport">
-          <el-radio v-for="dict in getIntDictOptions(DICT_TYPE.HELI_COMMON_IS_OR_NOT)" :key="dict.value" :label="dict.value">
-            {{ dict.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
 
     </el-form>
     <template #footer>