Merge branch 'master' of http://192.168.101.4:3000/jiaxiaoqiang/JG-ADMIN-TEMP

src/components/CommonTable/configs/tableConfig.ts

@@ -5,24 +5,13 @@ export const tableConfig = {
 	MARTERIAL: {
 		url: "/api/v1/base/material",
 		column: [
-			{ label: "客户型号", prop: "customervodel", search: true },
-			{ label: "生产厂家", prop: "manufacturer", search: true },
+
 			{ label: "物料编码", prop: "materialCode", search: true },
 			{ label: "物料名称", prop: "materialName", search: true },
 			{ label: "保质期", prop: "qualityGuaranteePeriod", search: true },
 
-			{ label: "筛选规范", prop: "selectionSpec", search: true },
 			{ label: "物料规格", prop: "spec", search: true },
-			{
-				label: "适用平台",
-				prop: "applicablePlatformsDictValue",
-				// search: true,
-				// filterable: true,
-				// type: "select",
-				// dataType: "string",
-				// dicData: dicts.applicable_platforms,
-				// props: { label: "dictLabel", value: "dictValue" },
-			},
+
 			{
 				label: "物料属性",
 				prop: "attributeDictValue",
@@ -354,7 +343,6 @@ export const tableConfig = {
 				label: "设备编号",
 				prop: "deviceNo",
 				search: true,
-				width: '120',
 				rules: [
 					{
 						required: true,
@@ -367,7 +355,6 @@ export const tableConfig = {
 				label: "设备名称",
 				prop: "deviceName",
 				search: true,
-				width: '120',
 				rules: [
 					{
 						required: true,
@@ -381,7 +368,6 @@ export const tableConfig = {
 				prop: "deviceType",
 				type: "select",
 				search: true,
-				width: '100',
 				dicData:
 					dicts.device_type,
 				props: {
@@ -391,22 +377,18 @@ export const tableConfig = {
 			},
 			{
 				label: "负责人",
-				width: '100',
 				prop: "head",
 			},
 			{
 				label: "设备位置",
-				width: '150',
 				prop: "devicePosition",
 			},
 			{
 				label: "规格",
-				width: '150',
 				prop: "specifications",
 			},
 			{
 				label: "品牌",
-				width: '150',
 				prop: "brand",
 			},
 		],

src/hooks/userCrud.ts

@@ -154,7 +154,6 @@ export const useCrud = (config?: UseCrudConfig) => {
                 }
               }
             }
-            console.info(data.value);
             page.value.total = res?.data?.totalCount || 0;
           }
 
@@ -176,6 +175,7 @@ export const useCrud = (config?: UseCrudConfig) => {
             ...search.value,
           },
         });
+
         if (res?.data) {
           data.value = res?.data || [];
         }

src/views/base/information/index.vue

@@ -91,7 +91,8 @@ option.value = Object.assign(option.value, {
   selection: false,
   viewBtn:false,
   editBtn:false,
-
+  delBtn:false,
+  menu:false,
   column: columns,
 });
 

src/views/base/materials/columns.ts

@@ -125,7 +125,7 @@ export const columns = [
     props: { label: "dictLabel", value: "dictValue" },
   },
   { label: "客户型号", prop: "customerModel",width: 100,overHidden: true,  },
-  { label: "保质期(天)", prop: "qualityGuaranteePeriod",width: 100,overHidden: true, },
+  { label: "保质期(天)", prop: "qualityGuaranteePeriod",width: 100,overHidden: true,type:"number" ,min:0 },
   {
     label: "封装方法",
     prop: "packageDictValue",

src/views/base/materials/components/drawing-page.vue

@@ -74,6 +74,7 @@ const { checkBtnPerm, downloadTemplate, exportData } = Utils; //按钮权限等
 function rowSave(form2, done) {
   form.value.associationCode = props.materialCode;
   createRow(form, done, done);
+  dataList();
 }
 
 const crudRef = ref(null); //crudRef.value 获取avue-crud对象
@@ -173,17 +174,15 @@ option.value = Object.assign(option.value, {
         }
 */
     },
-    {
-      label: "图纸",
+    { label: "图纸",
       prop: "drawing",
-      type: "img",
+      type: 'img',
       span: 24,
-      display: false,
+      display:false,
       slot: true,
       formatter: (row, column, cellValue, index) => {
-        return `${row.drawingPath}`;
-      },
-    },
+        return import.meta.env.VITE_APP_UPLOAD_URL+`${row.drawingPath}`;} },
+
   ],
   delBtn: false,
   editBtn: false,

src/views/base/materials/index.vue

@@ -68,6 +68,7 @@
       :title="dialog.title"
       width="900px"
       @close="dialog.visible = false"
+      :destroy-on-close="true"
     >
       <drawing-page  :materialCode="drawingDetail.materialCode" :dialog="dialog"/>
     </el-dialog>

src/views/base/modeling/station/components/station-page.vue

@@ -75,7 +75,6 @@
   //   menu: true,
   // });
   function rowSave(form,done,loading) {
-    console.info(form);
     createRow(form,done,loading);
 
   }
@@ -83,23 +82,11 @@
 
   onMounted(() => {
     // console.log("crudRef", crudRef)
+    search.value.stationId = props.stationId;
     dataList();
   });
 
-  /**
-   * 上传excel相关
-   */
-  const uploadRef = ref(null);
-  const uploadFinished = () => {
-    // 上传完成后的刷新操作
-    page.currentPage = 1;
-    dataList();
-  };
-  const importExcelData = () => {
-    if (uploadRef.value) {
-      uploadRef.value.show("/api/v1/base/stationDevice");
-    }
-  };
+
   const ctableRef=ref(null);
   const deviceList=()=>{
     ctableRef.value.startSelect();
@@ -139,9 +126,16 @@
           message: "设备已绑定过，无需再次绑定",
           type: "error",
         });
-        return;
+        return false;
       }
     }
+    if(selectedValue.deviceNo==undefined||selectedValue.deviceNo==null){
+      ElMessage({
+        message: "没有选择设备",
+        type: "error",
+      });
+      return false;
+    }
     const selectDevice=ref({
       deviceNo: selectedValue.deviceNo,
       stationId:props.stationId,

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

@@ -39,6 +39,7 @@
       :title="dialog.title"
       width="900px"
       @close="dialog.visible = false"
+      :destroy-on-close="true"
     >
       <station-page  :stationId="stationDevice.id"/>
     </el-dialog>
@@ -58,6 +59,7 @@
 
   const { isShowTable, tableType } = toRefs(useCommonStoreHook());
   import { useDictionaryStoreHook } from "@/store";
+  const { dicts } = useDictionaryStoreHook();
   const test = () => {
     isShowTable.value = true;
     tableType.value = tableType.value == 1 ? 2 : 1;
@@ -114,6 +116,10 @@
     dialog.visible=true;
     stationDevice.value=row;
   }
+  const onSelectedFinish=(selectedValue)=>{
+    form.value.manager=selectedValue.userName;
+    form.value.managerId=selectedValue.userId;
+  }
   // 设置表格列或者其他自定义的option
   option.value = Object.assign(option.value, {
     selection: true,

src/views/base/skill/components/edit-skill.vue

@@ -82,9 +82,11 @@ onMounted(() => {
   // console.log("crudRef", crudRef)
   getSkillDetail(props.skillId).then(
     (data)=>{
-      data2.value=data.data;
+      form.value=data.data;
+      console.info("222",data2.value);
     }
   )
+  search.value.employeeSkillId=props.skillId;
   dataNoPageList();
 
 
@@ -205,18 +207,19 @@ option2.value = {
       search: true,
       disabled:true,
     },
-    { label: "岗位", prop: "postId",
+    { label: "岗位", prop: "postName",
       search: true,
       filterable: true,
-      type: "select",
       overHidden: true,
+      disabled:true,
       dicUrl:dictDataUtil.post_list_url,
       dicMethod:"post",
       change:({ value, column })=>{
        if(value!==undefined) {
-         postIdValue.value = value;
+         props.postId = value;
          skillValue.value=null;
          optionSkill.value=null;
+         dataNoPageList();
        }
       },
       props: { label: "postName", value: "id" },
@@ -227,6 +230,7 @@ option2.value = {
 
   ],
 };
+const postIdValue=ref({});
 
 const props = defineProps({
   editDialog:{
@@ -265,11 +269,12 @@ option.value = Object.assign(option.value,{
     align: 'center',
     headerAlign: 'center',
     span:24,
+    cell: true,
     type: 'select',
     dicUrl: import.meta.env.VITE_APP_BASE_API + "/api/v1/sys/postSkill/list/"+props.postId,
     props: {
-      label: "userName", // 下拉菜单显示的字段
-      value: "userName", // 下拉菜单值的字段
+      label: "skillDictLabel", // 下拉菜单显示的字段
+      value: "skillDictValue", // 下拉菜单值的字段
     },
   },
     {

src/views/plan/order/index.vue

@@ -520,17 +520,6 @@ const handleQuery = (params, done) => {
 const resetQuery = () => {};
 const rowSave = (form, done, loading) => {
   loading();
-  if(form.value.orderType==2||form.value.orderType=="2"){
-    if(form.value.trackingNumber==undefined||form.value.trackingNumber==null){
-      ElMessage({
-        message: "未选择报故单",
-        type: "error",
-      });
-    }
-    done();
-    return false;
-  }
-
   addOrder(form).then((data: any) => {
     ElMessage({
       message: data.msg,