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

src/api/order/index.ts

@@ -188,6 +188,13 @@ export function queryWorkOrderList(params: any) {
   });
 }
 
+export function lockWorkOrder(params: any) {
+  return request({
+    url: "/api/v1/plan/workOrder/lockWorkOrder",
+    method: "post",
+    data: params
+  });
+}
 export function prepareCheckInfo(
     workOrderCode: string
 ): AxiosPromise<any> {

src/common/configs/buttonPermission.ts

@@ -57,6 +57,7 @@ const ButtonPermKeys = {
       work_order_edit: "plan:workOrder:edit",
       work_order_del: "plan:workOrder:del",
       work_order_aps: "plan:workOrder:aps",
+      work_order_lock: "plan:workOrder:lock",
     },
   },
   //设备管理

src/components/CommonTable/configs/tableConfig.ts

@@ -471,7 +471,7 @@ export const tableConfig = {
 			},
 		],
 	},
-	
+
 	ESOP: {
 		url: "/api/v1/base/drawing",
 		column: [
@@ -497,17 +497,16 @@ export const tableConfig = {
 			  span: 12,
 			  search: false,
 			},
-			{
+			/*{
 			  label: "图纸",
 			  prop: "drawingPath",
-			  type: "img",
 			  span: 24,
 			  display: false,
 			  slot: true,
 			  // formatter: (row, column, cellValue, index) => {
 			  //   return `${row.drawingPath}`;
 			  // },
-			}
+			}*/
 		],
 	},
 

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

@@ -26,7 +26,7 @@
             content-type="button"
             :is-link="true"
             :show-pdf-number="form.showAppointPageNum"
-            :pdf-source="getSourceUrl(form.filePath)"
+            :pdf-source="pdfPath"
           />
         </div>
       </template>
@@ -86,9 +86,7 @@ const { selectionChange, multipleUpdate } = Methords; //选中和批量删除事
 
 const crudRef = ref(null); //crudRef.value 获取avue-crud对象
 const bomVersion = ref(null);
-const getSourceUrl = (filePath) => {
-  return import.meta.env.VITE_APP_UPLOAD_URL + filePath;
-};
+const pdfPath = ref(null)
 const startCreat = () => {
   if (props.tableType === "wuliaocaiji") {
     if (data.value && data.value.length > 0) {
@@ -184,7 +182,8 @@ const onSelectedFinish = (itemValue) => {
     form.value.lower = itemValue.lower;
     form.value.unit = itemValue.unit;
   } else if (props.tableType === "ESOP") {
-    form.value.filePath = itemValue.drawingPath;
+    form.value.filePath = itemValue.pdfPath;
+    pdfPath.value = import.meta.env.VITE_APP_UPLOAD_URL + itemValue.pdfPath
     form.value.drawingCode = itemValue.drawingCode;
     form.value.recordVersion = itemValue.drawingVersion;
     form.value.sortNum = itemValue.sort;

src/views/base/craftManagement/route/components/configs.ts

@@ -241,12 +241,12 @@ export const comTypes : comType[] = [
 		compentName: "调试配对",
 		compentType: "tiaoshipipei",
 	},
-	{
+	/*{
 		compentName: "铭牌绑定",
 		compentType: "mingpai",
-	},
+	},*/
 	{
 		compentName: "多媒体采集",
 		compentType: "duomeiticaiji",
 	},
-];
+];

src/views/plan/workOrder/index.vue

@@ -55,11 +55,27 @@
           <el-button
               icon="el-icon-setting"
               text
-              v-if="row.workOrderState === '2'"
-              @click="distribute(row.id)"
+              v-hasPerm="[buttonPermission.PLAN.BTNS.work_order_lock]"
+              v-if="row.workOrderState === '4'"
+              @click="lockOrUnLockWorkOrder(row.id,5)"
               type="primary"
-              v-hasPerm="[buttonPermission.PLAN.BTNS.work_order_aps]"
-              :size="size">下发</el-button>
+              :size="size">冻结</el-button>
+        <el-button
+            icon="el-icon-setting"
+            text
+            v-if="row.workOrderState === '5'"
+            v-hasPerm="[buttonPermission.PLAN.BTNS.work_order_lock]"
+            @click="lockOrUnLockWorkOrder(row.id,4)"
+            type="primary"
+            :size="size">解冻</el-button>
+        <el-button
+            icon="el-icon-setting"
+            text
+            v-if="row.workOrderState === '2'"
+            @click="distribute(row.id)"
+            type="primary"
+            v-hasPerm="[buttonPermission.PLAN.BTNS.work_order_aps]"
+            :size="size">下发</el-button>
         <el-button
             icon="el-icon-setting"
             text
@@ -183,7 +199,7 @@
 import { ref, getCurrentInstance } from "vue";
 import { useCrud } from "@/hooks/userCrud";
 import buttonPermission from "@/common/configs/buttonPermission";
-import {apsWorkOrder,distributeWorkOrder,revokeWorkOrder} from "@/api/order"
+import {apsWorkOrder,distributeWorkOrder,revokeWorkOrder,lockWorkOrder} from "@/api/order"
 import { useCommonStoreHook } from "@/store";
 import dictDataUtil from "@/common/configs/dictDataUtil";
 import ChoiceRoutePage from "./components/choice-route-page.vue";
@@ -261,6 +277,19 @@ const distribute = (id)=>{
         // catch error
       });
 }
+const lockOrUnLockWorkOrder = (id,status)=>{
+  let message = status === "4" ? "解冻" : "冻结"
+  ElMessageBox.confirm("当前操作不可逆,确定"+message+"工单吗?")
+      .then(() => {
+        lockWorkOrder({id: id,workOrderState: status}).then((data)=>{
+          ElMessage.success(data.msg);
+          dataList()
+        })
+      })
+      .catch(() => {
+        // catch error
+      });
+}
 const revoke = (id)=>{
   ElMessageBox.confirm("当前操作不可逆,确定撤销工单吗?")
       .then(() => {

src/views/pro/traceability/index.vue

@@ -54,6 +54,16 @@
             v-model="defaultTabName"
           >
             <el-tab-pane name="traceabilityComRef" label="生产履历">
+              <template #label>
+                <span
+                >生产履历
+                  <el-badge
+                      :value="tabCount.traceability"
+                      class="item"
+                      type="primary"
+                  />
+                </span>
+              </template>
               <TraceabilityCom ref="traceabilityComRef" />
             </el-tab-pane>
             <el-tab-pane name="materialsComRef" label="已采物料">