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

src/api/station/index.ts

@@ -15,6 +15,14 @@ export function updateStation(data: Station) {
     data: data,
   });
 }
+export function bindStation(data: Station) {
+  return request({
+    url: "/api/v1/base/station/bind",
+    method: "post",
+    data: data,
+  });
+}
+
 
 /**
  * 工位绑定设备

src/common/configs/dictDataUtil.ts

@@ -5,7 +5,7 @@ const DictDataUtil = {
     import.meta.env.VITE_APP_BASE_API + "/api/v1/sys/dictData/queryByType/",
   dept_tree_url: import.meta.env.VITE_APP_BASE_API + "/api/v1/sys/dept/orgTree",
   dept_list_url:
-    import.meta.env.VITE_APP_BASE_API + "/api/v1/sys/dept/parent/list",
+    import.meta.env.VITE_APP_BASE_API + "/api/v1/sys/dept/list",
   post_list_url: import.meta.env.VITE_APP_BASE_API + "/api/v1/sys/post/list",
 
   img_url: import.meta.env.VITE_APP_UPLOAD_URL,

src/components/CommonTable/configs/tableConfig.ts

@@ -552,12 +552,12 @@ export const tableConfig = {
       },
 
       {
-        label: "部门",
+        label: "所属机构",
         prop: "deptName",
         overHidden: true,
         disabled: true,
       },
-      {
+     /* {
         label: "所属机构",
         prop: "institution",
         search: true,
@@ -569,7 +569,7 @@ export const tableConfig = {
         dicMethod: "post",
         props: { label: "deptName", value: "id" },
         disabled: true,
-      },
+      },*/
     ],
   },
 

src/views/base/craftManagement/route/components/processComponent.vue

@@ -133,10 +133,20 @@ const save = async () => {
 const selectProComs = ref([]);
 const selectIndex = ref(-1);
 const currentCom = ref({});
-const handleCommand = (itme) => {
-  selectProComs.value.push(itme);
-  isChanged.value = true;
-  selectIndex.value = -1;
+const handleCommand = (item) => {
+  let status = true;
+  for (let i = 0; i < selectProComs.value.length; i++) {
+    if (selectProComs.value[i].compentName == item.compentName) {
+      status = false;
+    }
+  }
+  if (status == true) {
+    selectProComs.value.push(item);
+    isChanged.value = true;
+    selectIndex.value = -1;
+  } else {
+    ElMessage.error("请勿重复添加");
+  }
 };
 
 // 点击某一个改变下面的table

src/views/base/craftManagement/route/index.vue

@@ -267,9 +267,6 @@ option.value = Object.assign(option.value, {
         },
       ],
       readOnly: true,
-      click: () => {
-        startChooseProduct();
-      },
     },
     {
       label: "产品编号",

src/views/base/information/index.vue

@@ -311,6 +311,7 @@ option.value = Object.assign(option.value, {
       prop: "drawingVersion",
       type: "number",
       precision: 1,
+      min: 0,
       rules: [
         {
           required: true,

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

@@ -77,7 +77,7 @@ const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 import { updateWorkShop } from "@/api/workShop";
 
 import { updateProductionLine } from "@/api/productionLine";
-import { updateStation } from "@/api/station";
+import {bindStation, updateStation} from "@/api/station";
 // 公共弹窗相关
 const ctableRef = ref(null);
 const workShopRef = ref(null);
@@ -272,8 +272,8 @@ const onSelectedLineFinish = (selectedValue) => {
 const onSelectedStationFinish = (selectedValue) => {
   formData.value.code = selectedValue.code;
   formData.value.parentCode = factory.value.code;
-  formData.value.id = selectedValue.id;
-  updateStation(formData.value).then((data: any) => {
+  formData.value.ids = selectedValue.id;
+  bindStation(formData.value).then((data: any) => {
     ElMessage({
       message: data.msg,
       type: "success",

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

@@ -44,10 +44,8 @@
 <script setup>
 import {ref, getCurrentInstance} from "vue";
 import {useCrud} from "@/hooks/userCrud";
-import ButtonPermKeys from "@/common/configs/buttonPermission";
 import {useCommonStoreHook, useDictionaryStore} from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";
-import SingleUpload from "@/components/Upload/SingleUpload.vue";
 
 const {isShowTable, tableType} = toRefs(useCommonStoreHook());
 import {getPostSkill, addEmployeeSkill, getSkillDetail} from "@/api/system/skill";
@@ -181,7 +179,6 @@ option2.value = {
     {
       label: "id", prop: "id", width: 130, overHidden: true, search: true,
       filterable: true,
-      width: 100, overHidden: true,
       disabled: false,
       display: false,
 
@@ -190,7 +187,6 @@ option2.value = {
     {
       label: "用户id", prop: "userId", width: 130, overHidden: true, search: true,
       filterable: true,
-      width: 100, overHidden: true,
       disabled: true,
       display: false,
 
@@ -206,13 +202,13 @@ option2.value = {
         ctableRef.value.startSelect();
       },
     },
-    {
+   /* {
       label: "所属机构", prop: "institution", width: 130, overHidden: true, search: true,
       filterable: true,
       width: 100, overHidden: true,
       disabled: true,
 
-    },
+    },*/
     {
       label: "员工编号",
       prop: "employeeCode",
@@ -239,7 +235,7 @@ option2.value = {
 
     },
     {
-      label: "部门", prop: "deptName", overHidden: true,
+      label: "所属机构", prop: "deptName", overHidden: true,
       disabled: true,
     },
 
@@ -311,7 +307,7 @@ const onSelectedFinish = (selectedValue) => {
   form.value.userName = selectedValue.userName;
   form.value.deptName = selectedValue.deptName;
   form.value.employeeCode = selectedValue.employeeCode;
-  form.value.institution = selectedValue.institution;
+  //form.value.institution = selectedValue.institution;
 
 }
 const skillValue = ref(null);

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

@@ -63,10 +63,8 @@
 <script setup>
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
-import ButtonPermKeys from "@/common/configs/buttonPermission";
 import { useCommonStoreHook, useDictionaryStore } from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";
-import SingleUpload from "@/components/Upload/SingleUpload.vue";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
 import {getPostSkill,addEmployeeSkill} from "@/api/system/skill";
 // 数据字典相关
@@ -194,10 +192,8 @@ option2.value = {
 
     { label: "用户id", prop: "userId", width: 130,overHidden: true,search: true ,
       filterable: true,
-      width: 100,overHidden: true,
       disabled:true,
       display:false,
-
     },
     { label: "用户名", prop: "userName", width: 140,overHidden: true,search: true ,rules: [{
         required: true,
@@ -208,11 +204,9 @@ option2.value = {
       click: ({ value, column }) => {
         ctableRef.value.startSelect();
       },},
-    { label: "所属机构", prop: "institution", width: 130,overHidden: true,search: true ,
+    { label: "所属机构", prop: "deptName", width: 130,overHidden: true,search: true ,
       filterable: true,
-      width: 100,overHidden: true,
       disabled:true,
-
     },
     {
       label: "员工编号",
@@ -237,9 +231,8 @@ option2.value = {
       props: { label: "postName", value: "id" },
 
     },
-    { label: "部门", prop: "deptName", overHidden: true,
-      disabled:true, },
-
+  /*  { label: "部门", prop: "deptName", overHidden: true,
+      disabled:true, },*/
   ],
 };
 
@@ -258,7 +251,6 @@ option.value = Object.assign(option.value,{
   viewBtn: false,
   editBtn:false,
   saveBtn:false,
-
   cellBtn: true,
   column: [{
     label: "技能",
@@ -285,12 +277,10 @@ option.value = Object.assign(option.value,{
 });
 const onSelectedFinish=(selectedValue)=>{
   form.value.userId=selectedValue.id;
-
   form.value.userName=selectedValue.userName;
   form.value.deptName=selectedValue.deptName;
   form.value.employeeCode=selectedValue.employeeCode;
   form.value.institution=selectedValue.institution;
-
 }
 const skillValue=ref(null);
 const optionSkill=ref([]);

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

@@ -169,7 +169,6 @@ option2.value = {
   column: [
     { label: "id", prop: "id", width: 130,overHidden: true,search: true ,
       filterable: true,
-      width: 100,overHidden: true,
       disabled:false,
       display:false,
 
@@ -177,18 +176,17 @@ option2.value = {
 
     { label: "用户id", prop: "userId", width: 130,overHidden: true,search: true ,
       filterable: true,
-      width: 100,overHidden: true,
       disabled:true,
       display:false,
 
     },
     { label: "用户名", prop: "userName",disabled:true, width: 140,overHidden: true,search: true },
-    { label: "所属机构", prop: "institution", width: 130,overHidden: true,search: true ,
+   /* { label: "所属机构", prop: "institution", width: 130,overHidden: true,search: true ,
       filterable: true,
       width: 100,overHidden: true,
       disabled:true,
 
-    },
+    },*/
     {
       label: "员工编号",
       prop: "employeeCode",
@@ -213,7 +211,7 @@ option2.value = {
       props: { label: "postName", value: "id" },
 
     },
-    { label: "部门", prop: "deptName", overHidden: true,
+    { label: "所属机构", prop: "deptName", overHidden: true,
       disabled:true, },
 
   ],
@@ -251,7 +249,6 @@ option.value = Object.assign(option.value,{
   saveBtn:false,
   delBtn:false,
   menu:false,
-
   cellBtn: true,
   column: [{
     label: "技能",
@@ -282,12 +279,10 @@ option.value = Object.assign(option.value,{
 });
 const onSelectedFinish=(selectedValue)=>{
   form.value.userId=selectedValue.id;
-
   form.value.userName=selectedValue.userName;
   form.value.deptName=selectedValue.deptName;
   form.value.employeeCode=selectedValue.employeeCode;
   form.value.institution=selectedValue.institution;
-
 }
 const skillValue=ref(null);
 const optionSkill=ref([]);

src/views/base/skill/index.vue

@@ -84,11 +84,8 @@
 <script setup>
 import {ref, getCurrentInstance} from "vue";
 import {useCrud} from "@/hooks/userCrud";
-import ButtonPermKeys from "@/common/configs/buttonPermission";
 import {useCommonStoreHook, useDictionaryStore} from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";
-import editSkill from "@/views/base/skill/components/edit-skill.vue"
-import viewSkill from "@/views/base/skill/components/view-skill.vue"
 
 const {isShowTable, tableType} = toRefs(useCommonStoreHook());
 // 数据字典相关
@@ -182,19 +179,21 @@ option.value = Object.assign(option.value, {
   viewBtn: false,
   editBtn: false,
   column: [
-
-
     {
-      label: "所属机构", prop: "institution", width: 130,
+      label: "所属机构", prop: "deptId", width: 200,
       search: true,
+      hide: true,
       filterable: true,
       type: "select",
       overHidden: true,
       dicUrl: dictDataUtil.dept_list_url,
       dicMethod: "post",
       props: {label: "deptName", value: "id"},
+      display: true,
+    },
+    {
+      label: "所属机构", prop: "deptName", width: 200,
       disabled: true,
-
     },
     {
       label: "员工姓名", prop: "userName", width: 140, overHidden: true, search: true, rules: [{
@@ -221,10 +220,10 @@ option.value = Object.assign(option.value, {
       props: {label: "postName", value: "id"},
 
     },
-    {
+    /*{
       label: "部门", prop: "deptName", overHidden: true,
       disabled: true,
-    },
+    },*/
     {
       label: "分数",
       prop: "scopes",

src/views/plan/order/index.vue

@@ -9,7 +9,7 @@
       :table-loading="loading"
       :permission="permission"
       @search-change="handleQuery"
-      @search-reset="resetQuery"
+      @search-reset="resetChange"
       @size-change="handleQuery"
       @current-change="handleQuery"
       @row-save="rowSave"
@@ -259,6 +259,9 @@ const form = ref({});
 const page = ref({ total: 0, currentPage: 1, pageSize: 10 });
 const loading = ref(false);
 const uploadRef = ref<UploadInstance>(); // 上传组件
+const resetChange = () => {
+  handleQuery(null, null);
+};
 // 导入数据
 const importData = reactive({
   file: undefined,

src/views/plan/workOrder/index.vue

@@ -34,7 +34,7 @@
           @click="aps1"
           >批量排程
           <template #icon>
-            <svg-icon icon-class="paicheng"></svg-icon>
+            <svg-icon icon-class="paicheng" />
           </template>
         </el-button>
       </template>
@@ -65,7 +65,7 @@
           :size="size"
           >排程
           <template #icon>
-            <svg-icon icon-class="paicheng"></svg-icon>
+            <svg-icon icon-class="paicheng" />
           </template>
         </el-button>
         <el-button
@@ -77,7 +77,7 @@
           :size="size"
           >冻结
           <template #icon>
-            <svg-icon icon-class="dongjie"></svg-icon>
+            <svg-icon icon-class="dongjie" />
           </template>
         </el-button>
         <el-button
@@ -89,7 +89,7 @@
           :size="size"
           >解冻
           <template #icon>
-            <svg-icon icon-class="jiedong"></svg-icon>
+            <svg-icon icon-class="jiedong" />
           </template>
         </el-button>
         <el-button
@@ -105,7 +105,7 @@
         <el-button text @click="showSeqPage(row)" type="primary" :size="size"
           >流转卡号
           <template #icon>
-            <svg-icon icon-class="luozhuankahao"></svg-icon>
+            <svg-icon icon-class="luozhuankahao" />
           </template>
         </el-button>
         <el-button
@@ -124,7 +124,7 @@
           :size="size"
           >领用申请
           <template #icon>
-            <svg-icon icon-class="lingyongshenqing"></svg-icon>
+            <svg-icon icon-class="lingyongshenqing" />
           </template>
         </el-button>
         <el-button
@@ -134,7 +134,7 @@
           :size="size"
           >生产准备
           <template #icon>
-            <svg-icon icon-class="shengchanzhunbei"></svg-icon>
+            <svg-icon icon-class="shengchanzhunbei" />
           </template>
         </el-button>
         <el-button
@@ -165,7 +165,7 @@
       width="80%"
       @close="dialog.visible = false"
     >
-      <order-page queryType="1" @orderInfo="orderInfo" />
+      <order-page queryType="1" @order-info="orderInfo" />
     </el-dialog>
 
     <el-dialog
@@ -177,7 +177,7 @@
       <choice-route-page
         :processRouteType="processRouteType"
         :material-code="form.materialCode"
-        @routeInfo="routeInfo"
+        @route-info="routeInfo"
       />
     </el-dialog>
 
@@ -187,7 +187,7 @@
       width="80%"
       @close="dialog2.visible = false"
     >
-      <choice-workshop-page @workShopInfo="workShopInfo" />
+      <choice-workshop-page @work-shop-info="workShopInfo" />
     </el-dialog>
 
     <el-dialog
@@ -199,7 +199,7 @@
       <choice-line-page
         :parentCode="form.workshopCode"
         :materialCode="form.materialCode"
-        @lineInfo="lineInfo"
+        @line-info="lineInfo"
       />
     </el-dialog>
 
@@ -248,7 +248,7 @@
               :label="item.dictLabel"
               :value="item.dictValue"
               :key="item.dictValue"
-            ></el-option>
+            />
           </el-select>
         </el-form-item>
         <el-form-item label="排程类型" prop="apsModel">
@@ -262,7 +262,7 @@
               :label="item.dictLabel"
               :value="item.dictValue"
               :key="item.dictValue"
-            ></el-option>
+            />
           </el-select>
         </el-form-item>
       </el-form>
@@ -482,6 +482,8 @@ const workShopInfo = (value) => {
   form.value.workshopName = value.id;
   form.value.workshopCode = value.code;
   form.value.workshopName = value.name;
+  form.value.productLineId = ""
+  form.value.productLineName = "";
   dialog2.visible = false;
 };
 const routeInfo = (value) => {
@@ -665,6 +667,9 @@ option.value = Object.assign(option.value, {
         if (column.boxType) {
           dialog2.visible = true;
         }
+        if (column.boxType == "edit") {
+          form.value.productLineName = "";
+        }
       },
     },
     {

src/views/pro/traceability/index.vue

@@ -11,6 +11,9 @@
           v-model:page="page"
           @cell-click="handleCellClick"
           @search-change="searchChange"
+          @size-change="dataList"
+          @current-change="dataList"
+      
         >
           <template #seqNo="{ row }">
             <el-tag :type="chooseTagType(row.seqNo, 'css')">{{
@@ -56,11 +59,11 @@
             <el-tab-pane name="traceabilityComRef" label="生产履历">
               <template #label>
                 <span
-                >生产履历
+                  >生产履历
                   <el-badge
-                      :value="tabCount.traceability"
-                      class="item"
-                      type="primary"
+                    :value="tabCount.traceability"
+                    class="item"
+                    type="primary"
                   />
                 </span>
               </template>
@@ -131,19 +134,20 @@
               </template>
               <FaultCom ref="faultComRef" />
             </el-tab-pane>
-<!--            <el-tab-pane name="bugComRef" label="缺陷项">缺陷项</el-tab-pane>-->
+            <!--            <el-tab-pane name="bugComRef" label="缺陷项">缺陷项</el-tab-pane>-->
             <el-tab-pane name="mediaComRef" label="图片采集"
               ><template #label>
                 <span
-                >图片采集
+                  >图片采集
                   <el-badge
-                      :value="tabCount.medias"
-                      class="item"
-                      type="primary"
+                    :value="tabCount.medias"
+                    class="item"
+                    type="primary"
                   />
                 </span>
-            </template>
-            <media-com ref="mediaComRef"/></el-tab-pane>
+              </template>
+              <media-com ref="mediaComRef"
+            /></el-tab-pane>
           </el-tabs>
         </el-main>
       </el-container>