Merge remote-tracking branch 'origin/master'

src/api/business/specialDaywork.js

@@ -85,6 +85,13 @@ export function getNoFirstLotList(params) {
 	})
 }
 
+export function specialGetDeptList() {
+  return request({
+    url: baseUrl + '/business/specialDaywork/specialGetDeptList',
+    method: 'get'
+  })
+}
+
 //非首序查询批次炉号和报工信息
 export function getDayworkItemAndFurnace(params) {
 	return request({

src/views/business/specialDaywork/form.vue

@@ -58,6 +58,7 @@
             ><el-form-item label="选择产品："></el-form-item>
             <el-form-item label="生产计划单号：" prop="productionPlanNo">
               <el-input
+                :disabled="lotClick"
                 v-model="queryParams.productionPlanNo"
                 placeholder="请输入计划单号"
                 style="width: 144px"
@@ -66,6 +67,7 @@
             </el-form-item>
             <el-form-item label="产品描述：" prop="productDescription">
               <el-input
+                :disabled="lotClick"
                 v-model="queryParams.productDescription"
                 placeholder="请输入产品描述"
                 style="width: 144px"
@@ -74,7 +76,11 @@
             </el-form-item>
 
             <el-form-item>
-              <el-button type="primary" icon="Search" @click="handleQueryProuct"
+              <el-button
+                :disabled="lotClick"
+                type="primary"
+                icon="Search"
+                @click="handleQueryProuct"
                 >搜索</el-button
               >
             </el-form-item>
@@ -350,6 +356,7 @@
             ><el-form-item label="产品信息："></el-form-item>
             <el-form-item label="生产计划单号：" prop="productionPlanNo">
               <el-input
+                :disabled="lotClick"
                 v-model="queryParams.productionPlanNo"
                 placeholder="请输入计划单号"
                 style="width: 144px"
@@ -358,6 +365,7 @@
             </el-form-item>
             <el-form-item label="产品描述：" prop="productDescription">
               <el-input
+                :disabled="lotClick"
                 v-model="queryParams.productDescription"
                 placeholder="请输入产品描述"
                 style="width: 144px"
@@ -366,6 +374,7 @@
             </el-form-item>
             <el-form-item label="批号：" prop="productDescription">
               <el-input
+                :disabled="lotClick"
                 v-model="queryParams.lotCode"
                 placeholder="请输入产品描述"
                 style="width: 144px"
@@ -374,6 +383,7 @@
             </el-form-item>
             <el-form-item label="箱号：" prop="productDescription">
               <el-input
+                :disabled="lotClick"
                 v-model="queryParams.carrierCode"
                 placeholder="请输入箱号"
                 style="width: 144px"
@@ -383,6 +393,7 @@
 
             <el-form-item>
               <el-button
+                :disabled="lotClick"
                 type="primary"
                 icon="Search"
                 @click="handleNoFirstQuery"
@@ -991,7 +1002,6 @@ const cancel = () => {
   isEdit.value = false;
   reset();
   getList.value();
-
 };
 
 /** 切换首序非首序 */
@@ -1509,7 +1519,17 @@ function handleFirstTabAdd() {
 function handleFirstTabDelete() {
   console.log(daywork.value.itemStatus);
 
+  if (!lotClick.value) {
+    proxy.$modal.msgError("请先确定批次");
+    return;
+  }
+
   const delRows = dayworkItemTable.value.getSelectionRows();
+
+  if (delRows.length == 0) {
+    proxy.$modal.msgError("请选择需要删除的数据");
+    return;
+  }
   proxy.$modal.confirm("是否确认删除选中数据？").then(() => {
     dayworkItemList.value = dayworkItemList.value.filter(
       (item) => !delRows.includes(item)

src/views/business/standards/detail.vue

@@ -76,16 +76,16 @@
                                     <el-button-group
                                         style="display: flex;align-items: center; justify-content: center;  flex-wrap: nowrap;">
                                         <el-button v-if="!scope.row.editStatus" link type="primary"
-                                            v-hasPermi="['business:standards:examine']"
+                                            v-hasPermi="['business:standards:edit']"
                                             @click="handelEdit(scope.row, 'edit')">编辑
                                         </el-button>
                                         <el-button v-if="scope.row.editStatus" link type="success" plain
-                                            v-hasPermi="['business:standards:raift']"
+                                            v-hasPermi="['business:standards:add']"
                                             @click="handlePreview(scope.row)">保存</el-button>
 
 
                                         <el-button v-if="scope.row.editStatus" link type="warning"
-                                            v-hasPermi="['business:standards:replace']"
+                                            v-hasPermi="['business:standards:edit']"
                                             @click="handelEdit(scope.row, 'cancel')">取消
                                         </el-button>