2025-08-21 收货入库通知

src/api/qc/Inbound_notification.js

@@ -0,0 +1,26 @@
+import { createAPI } from "@/utils/httpRequest.js";
+
+// 查询收获入库单
+export const searchInboundNotification = data => createAPI('/inbound/searchInboundNotification','post',data)
+// 新增收获入库单
+export const saveInboundNotification = data => createAPI('/inbound/saveInboundNotification','post',data)
+// 删除收获入库单
+export const deleteInboundNotification = data => createAPI('/inbound/deleteInboundNotification','post',data)
+// 关闭收获入库单
+export const closeInboundNotification = data => createAPI('/inbound/closeInboundNotification','post',data)
+// 下达收获入库单
+export const issueInboundNotification = data => createAPI('/inbound/issueInboundNotification','post',data)
+
+// 查询收获入库单明细
+export const getInboundDetail = data => createAPI('/inbound/getInboundDetail','post',data)
+// 新增收获入库单明细
+export const saveInboundDetail = data => createAPI('/inbound/saveInboundDetail','post',data)
+// 查物料
+export const getInboundPartList = data => createAPI('/inbound/getInboundPartList','post',data)
+// 删除收获入库单明细
+export const deleteInboundDetail = data => createAPI('/inbound/deleteInboundDetail','post',data)
+// 批量编辑明细
+export const updateInboundDetail = data => createAPI('/inbound/updateInboundDetail','post',data)
+// 获取入库明细
+export const getInboundDetail2 = data => createAPI('/inbound/getInboundDetail2','post',data)
+

src/views/main-navbar.vue

@@ -32,14 +32,14 @@
             <icon-svg name="editTable"  style="width: 25px;height: 25px;margin-top: 5px"></icon-svg>
           </span>
         </el-menu-item>
-        <el-menu-item v-if="isAuth('review:show')" class="site-navbar__avatar" index="1">
-         <span class="el-dropdown-link">
-            <router-link :to="{path:'purchaseorder-procurementReview',query:{'': ''}}">
-              工具待审核
-            </router-link>
-            <el-badge isAuth :value="pending.pendingReview" class="item" style="margin-top: 10px"/>
-          </span>
-        </el-menu-item>
+<!--        <el-menu-item v-if="isAuth('review:show')" class="site-navbar__avatar" index="1">-->
+<!--         <span class="el-dropdown-link">-->
+<!--            <router-link :to="{path:'purchaseorder-procurementReview',query:{'': ''}}">-->
+<!--              工具待审核-->
+<!--            </router-link>-->
+<!--            <el-badge isAuth :value="pending.pendingReview" class="item" style="margin-top: 10px"/>-->
+<!--          </span>-->
+<!--        </el-menu-item>-->
         <el-menu-item class="site-navbar__avatar" index="2">
                       <span style="    color: #909399;" @click="helpFileList()">
                         帮助
@@ -61,9 +61,8 @@
             <el-menu-item index="2-2-2" @click.native="updateLanguageHandle()">{{ pageLanguage.updateDefaultLanguage }}
             </el-menu-item>
           </el-submenu>
-          <el-menu-item index="2-3" @click="$router.push({ name: 'theme' })">{{ pageLanguage.cssSetting }}
-          </el-menu-item>
-          <el-menu-item index="2-4" @click="printList()">{{ pageLanguage.printSetting }}</el-menu-item>
+          <el-menu-item index="2-3" @click="$router.push({ name: 'theme' })">{{ pageLanguage.cssSetting }}</el-menu-item>
+<!--          <el-menu-item index="2-4" @click="printList()">{{ pageLanguage.printSetting }}</el-menu-item>-->
         </el-submenu>
         <el-menu-item class="site-navbar__avatar" index="4">
           <el-dropdown :show-timeout="0" placement="bottom">
@@ -130,7 +129,7 @@ export default {
         userSetting: '用户设置',
         updatePassword: '修改密码',
         updateDefaultLanguage: '修改默认语言',
-        cssSetting: '主提设置',
+        cssSetting: '主题设置',
         printSetting: '打印设置',
       },
       // 导出 end

src/views/modules/qc/FQCResultEntry.vue

@@ -179,7 +179,7 @@
           <el-input v-else v-model="modalData.rollNo" @keyup.native.enter="rollNoEnter" clearable style="width: 221px"></el-input>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px">
         <el-form-item v-if="this.modalData.specialTaskFlag !== 'Y' && (this.modalData.rollNo === '' || this.modalData.rollNo == null)" prop="orderNo" :rules="rules.seqNoType">
           <span style="cursor: pointer" slot="label" @click="getBaseList(1052)"><a herf="#">派工单号</a></span>
           <el-input v-model="modalData.seqNo" style="width: 221px"></el-input>
@@ -196,7 +196,7 @@
           <el-input v-model="modalData.orderNo" style="width: 221px" disabled></el-input>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px">
         <el-form-item label="工序" prop="operationDesc" :rules="rules.operationDescType">
           <el-select v-model="modalData.operationDesc" placeholder="请选择" style="width: 221px">
             <el-option
@@ -215,7 +215,7 @@
           <el-input v-model="modalData.resourceDesc" style="width: 221px"></el-input>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
+      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px">
         <el-form-item v-if="this.modalData.specialTaskFlag === 'Y'" :model="modalData">
           <span style="cursor: pointer" slot="label" @click="queryPartList"><a herf="#">物料编码</a></span>
           <el-input v-model="modalData.partNo" style="width: 221px"></el-input>
@@ -227,7 +227,7 @@
           <el-input v-model="modalData.partDesc" readonly style="width: 221px"></el-input>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
+      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px">
         <el-form-item label="物料类别">
           <el-input v-model="modalData.invdefinetype" readonly style="width: 221px"></el-input>
         </el-form-item>
@@ -235,7 +235,7 @@
           <el-input v-model="modalData.sku" readonly style="width: 221px"></el-input>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px">
         <el-form-item prop="templateId" :rules="rules.templateId">
           <span style="cursor: pointer" v-if="this.controlData.baseData === '控制'" slot="label" @click="queryTemplateList"><a>检验模板</a></span>
           <span v-else slot="label">检验模板</span>
@@ -255,7 +255,7 @@
           </el-select>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
+      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px">
         <el-form-item label="老卷号">
           <el-input v-model="modalData.batchRollNo" style="width: 221px"></el-input>
         </el-form-item>
@@ -266,7 +266,7 @@
           <input type="checkbox" id="specialTask" name="specialTask" v-model="checked" @click="changeSpecialTask"/> <label for="specialTask">无工单检验</label>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
+      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px">
         <el-form-item label="特殊要求">
           <el-input type="textarea" v-model="modalData.specialRequirements" :rows="3" resize='none' show-word-limit style="width: 456px;height: 30px"></el-input>
         </el-form-item>

src/views/modules/qc/IPQCResultEntry.vue

@@ -183,7 +183,7 @@
           <el-input v-else v-model="modalData.rollNo" @keyup.native.enter="rollNoEnter" clearable style="width: 221px"></el-input>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px">
         <el-form-item v-if="this.modalData.specialTaskFlag !== 'Y' && (this.modalData.rollNo === '' || this.modalData.rollNo == null)" prop="orderNo" :rules="rules.seqNoType">
           <span style="cursor: pointer" slot="label" @click="getBaseList(1052)"><a herf="#">派工单号</a></span>
           <el-input v-model="modalData.seqNo" style="width: 221px"></el-input>
@@ -200,7 +200,7 @@
           <el-input v-model="modalData.orderNo" style="width: 221px" disabled></el-input>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px">
         <el-form-item label="工序" prop="operationDesc" :rules="rules.operationDescType">
           <el-select v-model="modalData.operationDesc" placeholder="请选择" style="width: 221px">
             <el-option
@@ -219,7 +219,7 @@
           <el-input v-model="modalData.resourceDesc" style="width: 221px"></el-input>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
+      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px">
         <el-form-item v-if="this.modalData.specialTaskFlag === 'Y'" :model="modalData">
           <span style="cursor: pointer" slot="label" @click="queryPartList"><a herf="#">物料编码</a></span>
           <el-input v-model="modalData.partNo" style="width: 221px"></el-input>
@@ -231,7 +231,7 @@
           <el-input v-model="modalData.partDesc" readonly style="width: 221px"></el-input>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
+      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px">
         <el-form-item label="物料类别">
           <el-input v-model="modalData.invdefinetype" readonly style="width: 221px"></el-input>
         </el-form-item>
@@ -239,7 +239,7 @@
           <el-input v-model="modalData.sku" readonly style="width: 221px"></el-input>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px">
         <el-form-item label="检验类型" prop="inspectionTypeNo" :rules="rules.inspectionTypeNoType">
           <el-select v-model="modalData.inspectionTypeNo" style="width: 221px">
             <el-option label="首件检" value="首件检"></el-option>
@@ -262,7 +262,7 @@
           </el-select>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
+      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px">
         <el-form-item prop="templateId" :rules="rules.templateId">
           <span style="cursor: pointer" v-if="this.controlData.baseData === '控制'" slot="label" @click="queryTemplateList"><a>检验模板</a></span>
           <span v-else slot="label">检验模板</span>
@@ -275,12 +275,12 @@
           <input type="checkbox" id="specialTask" name="specialTask" v-model="checked" @click="changeSpecialTask"/> <label for="specialTask">无工单检验</label>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
+      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px">
         <el-form-item label="老卷号">
           <el-input v-model="modalData.batchRollNo" style="width: 456px"></el-input>
         </el-form-item>
       </el-form>
-      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
+      <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px">
         <el-form-item label="特殊要求">
           <el-input type="textarea" v-model="modalData.specialRequirements" :rows="3" resize='none' show-word-limit style="width: 456px;height: 30px"></el-input>
         </el-form-item>
@@ -3323,7 +3323,6 @@
           type: 'warning'
         }).then(() => {
           let tempData = {
-            site: this.$store.state.user.site,
             submitList: this.IPQCSelections
           }
           ipqcRecordDelete(tempData).then(({data}) => {

src/views/modules/qc/OQCResultEntry.vue

@@ -173,6 +173,7 @@
 
     <!-- 分页-->
     <el-pagination
+      style="margin-top: 0px"
       @size-change="sizeChangeHandle"
       @current-change="currentChangeHandle"
       :current-page="pageIndex"

src/views/modules/qc/qcPartAttribute.vue

@@ -28,7 +28,7 @@
         <el-input v-model="searchData.familyName" clearable style="width: 120px"></el-input>
       </el-form-item>
       <el-form-item :label="' '">
-        <el-button v-if="!authSearch" type="primary" :loading="searchLoading" @click="getDataList()">查询</el-button>
+        <el-button type="primary" :loading="searchLoading" @click="getDataList()">查询</el-button>
       </el-form-item>
       <el-form-item :label="' '">
         <el-button @click="exportExcel()" type="primary" style="margin-left: 2px">{{'导出'}}</el-button>
@@ -73,8 +73,8 @@
         width="100"
         label="操作">
         <template slot-scope="scope">
-          <el-link v-if="!authUpdate" style="cursor: pointer" @click="updateModal(scope.row)">编辑</el-link>
-          <el-link v-if="!authUpdate" style="cursor: pointer" @click="updateModal2(scope.row)">详情</el-link>
+          <el-link style="cursor: pointer" @click="updateModal(scope.row)">编辑</el-link>
+          <el-link style="cursor: pointer" @click="updateModal2(scope.row)">详情</el-link>
 <!--          <el-link v-if="!authFile" style="cursor: pointer" @click="sopFileList(scope.row)">SOP文件</el-link>-->
         </template>
       </el-table-column>