fix:优化弹窗

src/views/base/materials/index.vue

@@ -27,10 +27,10 @@
         ></template
       >
       <template #menu="{ row, index, type }">
-        <el-button @click="binding(row)" icon="el-icon-link" text type="primary"
+        <el-button @click="binding(row)" icon="el-icon-money" text type="primary"
           >BOM</el-button
         >
-        <el-button @click="drawing(row)" icon="el-icon-link" text type="primary"
+        <el-button @click="drawing(row)" icon="el-icon-notebook" text type="primary"
           >图纸</el-button
         >
       </template>

src/views/base/modeling/factory/index.vue

@@ -59,7 +59,12 @@
       tableType="STATION"
       @selected-sure="onSelectedStationFinish"
     />
-
+    <CommonTable
+      ref="userRef"
+      tableTitle="员工选择"
+      tableType="USERS"
+      @selected-sure="onUserSelectedFinish"
+    />
     <ExcelUpload ref="uploadRef" @finished="uploadFinished" />
   </div>
 </template>
@@ -90,6 +95,7 @@ const binding = (row) => {
     productionLineRef.value.startSelect();
   }
 };
+const userRef=ref(null);
 const openEdit = (row) =>{
   crudRef.value && crudRef.value.rowEdit(row,null);
 }
@@ -157,6 +163,10 @@ const importExcelData = () => {
     uploadRef.value.show("/api/v1/plan/order/import");
   }
 };
+
+const onUserSelectedFinish=(selectedValue)=>{
+  form.value.manager=selectedValue.userName;
+}
 const formData = ref({});
 // 设置表格列或者其他自定义的option
 option.value = Object.assign(option.value, {
@@ -197,12 +207,8 @@ option.value = Object.assign(option.value, {
           trigger: "blur",
         },
       ],
-      type: "select",
-      dicUrl: import.meta.env.VITE_APP_BASE_API + "/api/v1/sys/user/list",
-      dicMethod: "post",
-      props: {
-        label: "userName", // 下拉菜单显示的字段
-        value: "userName", // 下拉菜单值的字段
+      click: ({ value, column }) => {
+        userRef.value.startSelect();
       },
     },
     {

src/views/base/modeling/production-line/index.vue

@@ -44,6 +44,12 @@
       <capacity-page  :productionLineId="productionLine.id"/>
     </el-dialog>
   </div>
+  <CommonTable
+    ref="ctableRef"
+    tableTitle="员工选择"
+    tableType="USERS"
+    @selected-sure="onSelectedFinish"
+  />
 </template>
 <script setup>
   import { ref, getCurrentInstance } from "vue";
@@ -76,7 +82,7 @@
   //   editBtn: checkPerm(buttonPermission.PLAN.BTNS.order_edit),
   //   menu: true,
   // });
-
+  const ctableRef=ref(null);
   const crudRef = ref(null); //crudRef.value 获取avue-crud对象
 
   onMounted(() => {
@@ -103,6 +109,10 @@
     productionLine.value=row;
     dialog.visible=true;
   }
+
+  const onSelectedFinish=(selectedValue)=>{
+    form.value.manager=selectedValue.userName;
+  }
   // 设置表格列或者其他自定义的option
   option.value = Object.assign(option.value, {
     selection: true,
@@ -112,6 +122,7 @@
         prop: "name",
         search: true,
         overHidden:true,
+        span:24,
         rules: [{
           required: true,
           message: "请填写产线名称",
@@ -121,22 +132,20 @@
       {
         label: "负责人",
         prop: "manager",
+        span:24,
         rules: [{
           required: true,
           message: "请选择产线负责人",
           trigger: "blur"
         }],
-        type: 'select',
-        dicUrl:import.meta.env.VITE_APP_BASE_API+"/api/v1/sys/user/list",
-        dicMethod:"post",
-        props: {
-          label: "userName", // 下拉菜单显示的字段
-          value: "userName" // 下拉菜单值的字段
+        click: ({ value, column }) => {
+          ctableRef.value.startSelect();
         },
       },
       {
         label: "产线位置",
         prop: "position",
+        span:24,
         overHidden:true,
       },
       {
@@ -149,7 +158,8 @@
         label: "产线描述",
         overHidden:true,
         prop: "remark",
-        overHidden:true,
+        type:"textarea",
+        span:24,
       },
       {
         label: "创建人",
@@ -159,6 +169,7 @@
       {
         label: "创建时间",
         prop: "created",
+        overHidden:true,
         display:false
       },
     ],

src/views/base/modeling/station/index.vue

@@ -41,7 +41,7 @@
       </template>
       <template #menu="{row,index,type}">
         <el-button @click="binding(row)"
-                   icon="el-icon-link"
+                   icon="el-icon-ticket"
                    text
                    type="primary"
         >设备</el-button>

src/views/base/modeling/work-shop/index.vue

@@ -30,6 +30,12 @@
     </avue-crud>
 
   </div>
+  <CommonTable
+    ref="ctableRef"
+    tableTitle="员工选择"
+    tableType="USERS"
+    @selected-sure="onSelectedFinish"
+  />
 </template>
 <script setup>
   import { ref, getCurrentInstance } from "vue";
@@ -66,7 +72,10 @@
     // console.log("crudRef", crudRef)
     dataList();
   });
-
+  const ctableRef=ref(null);
+  const onSelectedFinish=(selectedValue)=>{
+    form.value.manager=selectedValue.userName;
+  }
   /**
    * 上传excel相关
    */
@@ -90,26 +99,36 @@
         label: "车间名称",
         prop: "name",
         search: true,
+        span:24,
+        rules: [{
+          required: true,
+          message: "请输入车间名称",
+          trigger: "blur"
+        }],
+
       },
       {
-        label: "车间负责人",
+        label: "负责人",
         prop: "manager",
+        span:24,
         rules: [{
           required: true,
           message: "请选择厂区负责人",
           trigger: "blur"
         }],
-        type: 'select',
-        dicUrl:import.meta.env.VITE_APP_BASE_API+"/api/v1/sys/user/list",
-        dicMethod:"post",
-        props: {
-          label: "userName", // 下拉菜单显示的字段
-          value: "userName" // 下拉菜单值的字段
+        click: ({ value, column }) => {
+          ctableRef.value.startSelect();
         },
       },
       {
         label: "车间位置",
         prop: "position",
+        span:24,
+        rules: [{
+          required: true,
+          message: "请输入车间位置",
+          trigger: "blur"
+        }],
       },
       {
         label: "所属工厂",
@@ -119,6 +138,8 @@
       {
         label: "车间描述",
         prop: "remark",
+        span:24,
+        type:"textarea"
       },
       {
         label: "创建人",
@@ -128,6 +149,7 @@
       {
         label: "创建时间",
         prop: "created",
+        overHidden:true,
         display:false
       },
     ],

src/views/quality/faultHandle/components/fault-detail.vue

@@ -45,8 +45,8 @@
   <div class="fault" v-if="faultDetails1!=null">
     <div class="fault-detail" v-if="faultDetails1.trackingNumber!=null">不合格审理单号 :&nbsp;&nbsp;{{faultDetails1.trackingNumber}}</div>
     <div class="fault-detail" >序列号 :&nbsp;&nbsp;{{faultDetails1.seqNo}}</div>
-    <div class="fault-detail">故障描述 :&nbsp;&nbsp;{{faultDetails1.remark}}</div>
-    <div class="fault-detail" v-if="faultDetails1.opinion!=null">线长意见 :&nbsp;&nbsp;{{faultDetails1.opinion}}</div>
+    <div class="fault-detail" v-if="faultDetails1.remark!=''">故障描述 :&nbsp;&nbsp;{{faultDetails1.remark}}</div>
+    <div class="fault-detail" v-if="faultDetails1.opinion!=''">线长意见 :&nbsp;&nbsp;{{faultDetails1.opinion}}</div>
 
     <div class="title-fault" style="margin-top: 10px">
       报故人:&nbsp;&nbsp;{{faultDetails1.creator}}