From 43891957919c66cd5c9844b690bfcdf5ff67a8e4 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 17 Oct 2024 09:55:15 +0800
Subject: [PATCH 1/6] =?UTF-8?q?fix:=20base=20=E5=B2=97=E4=BD=8D=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E6=9D=83=E9=99=90=E6=A0=87=E8=AF=86=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/sys/post.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/sys/post.vue b/src/views/sys/post.vue
index a9f842d1..bd70cc63 100644
--- a/src/views/sys/post.vue
+++ b/src/views/sys/post.vue
@@ -117,7 +117,7 @@
                 link
                 size="small"
                 @click="postRoleDel(scope.row)"
-				 v-auth="'post.delete'"
+				 v-auth="'post.update'"
                 >删除
               </el-button>
             </template>

From 84524a8b71cd3c005d0c1a9c9ffdfe1c638a4f77 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 17 Oct 2024 10:37:32 +0800
Subject: [PATCH 2/6] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0cm=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=A3=B0=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/model/cm.js | 48 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 src/api/model/cm.js

diff --git a/src/api/model/cm.js b/src/api/model/cm.js
new file mode 100644
index 00000000..2373df5d
--- /dev/null
+++ b/src/api/model/cm.js
@@ -0,0 +1,48 @@
+import config from "@/config"
+import http from "@/utils/request"
+/*区域接口*/
+export default {
+	labelmat: {
+		list: {
+			name: "获取列表",
+			req: async function(data){
+				return await http.get(
+					`${config.API_URL}/cm/labelmat/`,
+					data
+				);
+			}
+		},
+		item: {
+			name: "获取详情",
+			req: async function(id){
+				return await http.get(
+					`${config.API_URL}/cm/labelmat/${id}/`
+				);
+			}
+		},
+        fromMb: {
+			name: "从仓库明细获取无聊标签",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/cm/get_from_mb/`,
+					data);
+			}
+		},
+		fromMioitem: {
+			name: "从出入库明细获取无聊标签",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/cm/get_from_mioitem/`,
+					data);
+			}
+		},
+		fromWm: {
+			name: "从车间库存明细获取无聊标签",
+			req: async function(data){
+				return await http.post(
+					`${config.API_URL}/cm/get_from_wm/`,
+					data);
+			}
+		},
+	},	
+}

From 0b72e2dcc1d025d6e96d00682b1d2be63ca7db64 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 17 Oct 2024 10:59:28 +0800
Subject: [PATCH 3/6] =?UTF-8?q?feat:=20remployee=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/rpm/remployee.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/rpm/remployee.vue b/src/views/rpm/remployee.vue
index ae9f9ec1..c0bb26e1 100644
--- a/src/views/rpm/remployee.vue
+++ b/src/views/rpm/remployee.vue
@@ -8,6 +8,7 @@
             :key="item.id"
             :label="item.name"
             :value="item.id"
+            v-auth="'remployee.create'"
           />
         </el-select>
         <el-button type="primary" icon="el-icon-plus" @click="add" style="margin-left:4px"></el-button>
@@ -55,11 +56,13 @@
               link
               type="warning"
               size="small"
+              v-auth="'remployee.update'"
               @click="table_edit(scope.row, scope.$index)"
               >编辑</el-button
             >
             <el-popconfirm
               title="确定删除吗？"
+              v-auth="'remployee.delete'"
               @confirm="table_del(scope.row, scope.$index)"
             >
               <template #reference>

From 6584b867d31220f26c01f5cc4158f7068a8ead05 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 17 Oct 2024 11:27:27 +0800
Subject: [PATCH 4/6] =?UTF-8?q?feat:=20remployee=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E6=A0=87=E8=AF=862?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/rpm/remployee.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/views/rpm/remployee.vue b/src/views/rpm/remployee.vue
index c0bb26e1..7f0a10de 100644
--- a/src/views/rpm/remployee.vue
+++ b/src/views/rpm/remployee.vue
@@ -8,10 +8,9 @@
             :key="item.id"
             :label="item.name"
             :value="item.id"
-            v-auth="'remployee.create'"
           />
         </el-select>
-        <el-button type="primary" icon="el-icon-plus" @click="add" style="margin-left:4px"></el-button>
+        <el-button type="primary" icon="el-icon-plus" @click="add" style="margin-left:4px"   v-auth="'remployee.create'"></el-button>
         <!-- <el-button type="danger" plain icon="el-icon-delete" :disabled="selection.length==0" @click="batch_del"></el-button>
 				<el-button type="primary" plain :disabled="selection.length!=1" @click="permission">权限设置</el-button> -->
       </div>
@@ -62,11 +61,10 @@
             >
             <el-popconfirm
               title="确定删除吗？"
-              v-auth="'remployee.delete'"
               @confirm="table_del(scope.row, scope.$index)"
             >
               <template #reference>
-                <el-button link type="danger" size="small">删除</el-button>
+                <el-button link type="danger" size="small" v-auth="'remployee.delete'">删除</el-button>
               </template>
             </el-popconfirm>
           </template>

From ee12735ea1536ea773958e96524f6e113e4c57ab Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 17 Oct 2024 15:41:45 +0800
Subject: [PATCH 5/6] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0cm=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=A3=B0=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/model/cm.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/api/model/cm.js b/src/api/model/cm.js
index 2373df5d..bb3ed72a 100644
--- a/src/api/model/cm.js
+++ b/src/api/model/cm.js
@@ -24,7 +24,7 @@ export default {
 			name: "从仓库明细获取无聊标签",
 			req: async function(data){
 				return await http.post(
-					`${config.API_URL}/cm/get_from_mb/`,
+					`${config.API_URL}/cm/labelmat/get_from_mb/`,
 					data);
 			}
 		},
@@ -32,7 +32,7 @@ export default {
 			name: "从出入库明细获取无聊标签",
 			req: async function(data){
 				return await http.post(
-					`${config.API_URL}/cm/get_from_mioitem/`,
+					`${config.API_URL}/cm/labelmat/get_from_mioitem/`,
 					data);
 			}
 		},
@@ -40,7 +40,7 @@ export default {
 			name: "从车间库存明细获取无聊标签",
 			req: async function(data){
 				return await http.post(
-					`${config.API_URL}/cm/get_from_wm/`,
+					`${config.API_URL}/cm/labelmat/get_from_wm/`,
 					data);
 			}
 		},

From 67a481432632e23009bda96009989a06d81615d2 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 18 Oct 2024 17:10:13 +0800
Subject: [PATCH 6/6] =?UTF-8?q?feat:=E6=A3=80=E9=AA=8C=E8=A1=A8=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qm/first.vue    | 83 +++++++++++++++++++++++++++++++++------
 src/views/qm/income.vue   | 60 +++++++++++++++++++++++++++-
 src/views/qm/inm.vue      | 17 ++++----
 src/views/qm/process.vue  | 11 +++++-
 src/views/qm/process2.vue | 11 +++++-
 src/views/qm/product.vue  | 27 ++++++++++++-
 6 files changed, 185 insertions(+), 24 deletions(-)

diff --git a/src/views/qm/first.vue b/src/views/qm/first.vue
index 8332b5e6..5f92f98c 100644
--- a/src/views/qm/first.vue
+++ b/src/views/qm/first.vue
@@ -3,15 +3,16 @@
         <el-header>
             <div class="left-panel">
                 <el-button type="primary" icon="el-icon-plus" @click="add" v-auth="'ftest.create'">新增</el-button>
-                <el-button type="primary" icon="el-icon-download" @click="exportExcel">导出</el-button>
+                <el-button type="primary" icon="el-icon-download" v-loading="exportLoading" @click="exportExcel">导出</el-button>
+                <el-button type="primary" @click="handlePrint">打印</el-button>
             </div>
-            <div class="right-panel">
+            <!-- <div class="right-panel">
                 <el-date-picker v-model="query.date" type="date" value-format="YYYY-MM-DD" />
                 <el-button type="primary" icon="el-icon-search" @click="handleQuery">查询</el-button>
-            </div>
+            </div> -->
         </el-header>
         <el-main class="nopadding">
-            <scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="query">
+            <scTable ref="table" :apiObj="apiObj" row-key="id" stripe  :params="params">
                 <el-table-column type="index" width="50" />
                 <el-table-column label="日期" prop="test_date" show-overflow-tooltip>
                 </el-table-column>
@@ -62,7 +63,7 @@
                     </template>
                 </el-table-column>
             </scTable>
-            <scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="query" id="myTable" style="display: none;">
+            <scTable ref="table" :apiObj="apiObj" row-key="id" stripe  :params="params" id="myTable" style="display: none;">
                 <el-table-column type="index" width="50" />
                 <el-table-column label="日期" prop="test_date" show-overflow-tooltip>
                 </el-table-column>
@@ -114,6 +115,60 @@
         </el-main>
         <check-dialog v-if="dialog.check" ref="checkDialog" @success="handleCheckSuccess" @closed="dialog.check = false">
         </check-dialog>
+        <el-dialog v-model="printVisible" width="850px" title="首件检验">
+            <div id="exportDiv">
+                <scTable  :apiObj="apiObj" 
+                    row-key="id" stripe 
+                    :params="params" 
+                    hidePagination
+                    hideDo
+                    style="width: 800px;"
+                    >
+                    <el-table-column label="日期" prop="test_date" >
+                    </el-table-column>
+                    <el-table-column label="工序" prop="number">
+                    </el-table-column>
+                    <el-table-column label="检测内容">
+                        <template #default="scope">
+                            <div v-for="item in scope.row.ftestitems" :key="item.id">
+                                {{ item.testitem_description }}
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="检测标准">
+                        <template #default="scope">
+                            <div v-for="item in scope.row.ftestitems" :key="item.id">
+                                {{ item.testitem_name }}
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="操作人测量值" prop="production_date">
+                        <template #default="scope">
+                            <div v-for="item in scope.row.ftestitems" :key="item.id">
+                                {{ item.test_val }}
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="操作人" prop="test_user_name">
+                    </el-table-column>
+                    <el-table-column label="专检人测量值" prop="buy_date">
+                        <template #default="scope">
+                            <div v-for="item in scope.row.ftestitems" :key="item.id">
+                                {{ item.check_val }}
+                            </div>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="专检人" prop="check_user_name">
+                    </el-table-column>
+                    <el-table-column label="结论">
+                        <template #default="scope">
+                            <span v-if="scope.row.is_ok" type="success">合格</span>
+                            <span v-else type="warning">不合格</span>
+                        </template>
+                    </el-table-column>
+                </scTable>
+            </div>
+        </el-dialog>
     </el-container>
 </template>
 <script>
@@ -129,14 +184,12 @@ export default {
                 check: false
             },
             excelName: '首件确认',
-            // apiObj: this.$API.qm.list,
             apiObj: this.$API.qm.ftest.list,
-            query: {
-                page: 1,
-                page_size: 20,
-                type: 'first'
+            params: {
+                 type: 'first'
             },
-            selection: []
+            selection: [],
+            printVisible:false
         };
     },
     methods: {
@@ -182,9 +235,15 @@ export default {
         },
         exportExcel() {
             this.exportLoading = true;
-            this.$XLSX('#myTable', this.excelName)
+            this.$XLSX('#myTable', "首件检验表")
             this.exportLoading = false;
         },
+        handlePrint(){
+            this.printVisible = true;
+            setTimeout(() => {
+                this.$PRINT("#exportDiv");
+            }, 1000);
+        },
     },
 };
 </script>
\ No newline at end of file
diff --git a/src/views/qm/income.vue b/src/views/qm/income.vue
index e9ceb77b..63ddfcfa 100644
--- a/src/views/qm/income.vue
+++ b/src/views/qm/income.vue
@@ -2,6 +2,8 @@
     <el-container>
         <el-header>
             <div class="left-panel">
+                <el-button type="primary" icon="el-icon-download" v-loading="exportLoading" @click="exportExcel">导出</el-button>
+                <el-button type="primary" @click="handlePrint">打印</el-button>
             </div>
             <div class="right-panel">
                 <el-date-picker v-model="query.test_date" type="date" value-format="YYYY-MM-DD" />
@@ -9,7 +11,7 @@
             </div>
         </el-header>
         <el-main class="nopadding">
-            <scTable ref="table" :apiObj="apiObj" row-key="id" stripe :params="params" :query="query">
+            <scTable ref="table" :apiObj="apiObj" row-key="id"  id="myTable" stripe :params="params" :query="query">
                 <el-table-column type="index" width="50" />
                 <el-table-column label="产品名称" prop="material_name" show-overflow-tooltip>
                 </el-table-column>
@@ -44,9 +46,42 @@
                 </el-table-column>
             </scTable>
         </el-main>
+        <el-dialog v-model="printVisible" width="850px" title="入司检验">
+            <div id="exportDiv">
+                <scTable  :apiObj="apiObj" 
+                    row-key="id" stripe 
+                    :params="params" 
+                    hidePagination
+                    hideDo
+                    style="width: 800px;"
+                    :query="query">
+                    <el-table-column label="产品名称" prop="material_name">
+                    </el-table-column>
+                    <el-table-column label="批次号" prop="batch">
+                    </el-table-column>
+                    <el-table-column label="总数" prop="count">
+                    </el-table-column>
+                    <el-table-column label="抽样数量" prop="count_sampling" width="80">
+                    </el-table-column>
+                    <el-table-column label="检验结论" width="80">
+                        <template #default="scope">
+                            <span v-if="scope.row.is_testok">合格</span>
+                            <span v-else>不合格</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column label="检验员" prop="test_user_name" width="90">
+                    </el-table-column>
+                    <el-table-column label="检验日期" prop="test_date" width="100">
+                    </el-table-column>
+                </scTable>
+            </div>
+            <!-- <el-button type="primary" @click="handleExport">导出</el-button>
+            <el-button type="primary" @click="handlePrint">打印</el-button> -->
+        </el-dialog>
     </el-container>
 </template>
 <script>
+import PdfLoader from '@/utils/html2pdf';
 export default {
     name: "rparty",
     data() {
@@ -61,6 +96,7 @@ export default {
                 10: '',
                 20: '',
             },
+            printVisible:false,
         };
     },
     methods: {
@@ -89,6 +125,28 @@ export default {
         resetQuery() {
             this.query = {};
         },
+        exportExcel() {
+            this.exportLoading = true;
+            this.$XLSX('#myTable', "入司检验表")
+            this.exportLoading = false;
+        },
+        handlePrint(){
+            this.printVisible = true;
+            setTimeout(() => {
+                this.$PRINT("#exportDiv");
+            }, 1000);
+        },
+        // clickExport(){
+        //     this.printVisible = true;
+        // },
+        // handleExport() {
+        //     let exportDiv = document.getElementById('exportDiv')  // 需要导出部分页面的id名
+        //     this.pdfDownLoader = new PdfLoader(exportDiv, '作业许可证', 'exportDiv')  // fileName -->导出文件名,  question-table -->防止被截断的class名
+        //     this.pdfDownLoader.outPutPdfFn('test');
+        // },
+        // handlePrint(){
+        //     this.$PRINT("#exportDiv");
+        // },
     },
 };
 </script>
\ No newline at end of file
diff --git a/src/views/qm/inm.vue b/src/views/qm/inm.vue
index e1d72be0..da83859f 100644
--- a/src/views/qm/inm.vue
+++ b/src/views/qm/inm.vue
@@ -1,7 +1,15 @@
 <template>
 	<el-container>
 		<el-header>
-			<div class="left-panel"></div>
+			<div class="left-panel">
+				<el-button
+					type="primary"
+					icon="el-icon-download"
+					@click="tableExport"
+					v-loading="exportLoading"
+					>导出</el-button
+				>
+			</div>
 			<div class="right-panel">
 				<el-date-picker
 					v-model="query.test_date"
@@ -15,13 +23,6 @@
 					@click="handleQuery"
 					>查询</el-button
 				>
-				<el-button
-					type="primary"
-					icon="el-icon-download"
-					@click="tableExport"
-					v-loading="exportLoading"
-					>导出</el-button
-				>
 			</div>
 		</el-header>
 		<el-main class="nopadding">
diff --git a/src/views/qm/process.vue b/src/views/qm/process.vue
index 7a51b071..8e1c7cb9 100644
--- a/src/views/qm/process.vue
+++ b/src/views/qm/process.vue
@@ -1,7 +1,9 @@
 <template>
 	<el-container>
 		<el-header>
-			<div class="left-panel"></div>
+			<div class="left-panel">
+				<el-button type="primary" icon="el-icon-download" v-loading="exportLoading" @click="exportExcel">导出</el-button>
+			</div>
 			<div class="right-panel">
 				<el-select
 					v-model="query.mgroup"
@@ -46,6 +48,7 @@
 				:apiObj="apiObj"
 				row-key="id"
 				stripe
+				 id="myTable"
 				:query="query"
 			>
 				<el-table-column type="index" width="50" />
@@ -155,6 +158,7 @@ export default {
 				20: "",
 			},
 			mgroupOption: [],
+			exportLoading:false,
 			materialsVisible: false,
 		};
 	},
@@ -181,6 +185,11 @@ export default {
 		resetQuery() {
 			this.query = {};
 		},
+		exportExcel() {
+            this.exportLoading = true;
+            this.$XLSX('#myTable',"过程自检记录表")
+            this.exportLoading = false;
+        },
 	},
 };
 </script>
diff --git a/src/views/qm/process2.vue b/src/views/qm/process2.vue
index ebff0358..41551372 100644
--- a/src/views/qm/process2.vue
+++ b/src/views/qm/process2.vue
@@ -1,7 +1,9 @@
 <template>
 	<el-container>
 		<el-header>
-			<div class="left-panel"></div>
+			<div class="left-panel">
+				<el-button type="primary" v-loading="exportLoading" icon="el-icon-download" @click="exportExcel">导出</el-button>
+			</div>
 			<div class="right-panel">
 				<el-select
 					v-model="query.mgroup"
@@ -47,6 +49,7 @@
 				row-key="id"
 				:params = "params"
 				stripe
+				id="myTable"
 				:query="query"
 			>
 				<!-- <el-table-column type="index" width="50" /> -->
@@ -135,6 +138,7 @@ export default {
 				20: "",
 			},
 			mgroupOption: [],
+			exportLoading:false,
 			materialsVisible: false,
 		};
 	},
@@ -161,6 +165,11 @@ export default {
 		resetQuery() {
 			this.query = {};
 		},
+		exportExcel() {
+            this.exportLoading = true;
+            this.$XLSX('#myTable',"过程抽检表")
+            this.exportLoading = false;
+        },
 	},
 };
 </script>
diff --git a/src/views/qm/product.vue b/src/views/qm/product.vue
index a582afaf..9ebbb4f9 100644
--- a/src/views/qm/product.vue
+++ b/src/views/qm/product.vue
@@ -6,7 +6,9 @@
 					type="primary"
 					icon="el-icon-plus"
 					@click="add"
-				></el-button>
+				>新增</el-button>
+				<el-button type="primary" icon="el-icon-download" v-loading="exportLoading" @click="exportExcel">导出</el-button>
+                <!-- <el-button type="primary" @click="handlePrint">打印</el-button> -->
 			</div>
 			<div class="right-panel">
 				<el-date-picker
@@ -54,6 +56,23 @@
 					</template>
 				</el-table-column>
 			</scTable>
+			<scTable
+				ref="table"
+				:apiObj="apiObj"
+				row-key="id"
+				stripe
+				:params="query"
+				 id="myTable" 
+				 style="display: none;"
+			>
+				<el-table-column label="日期" prop="test_date"></el-table-column>
+				<el-table-column label="批次号" prop="batch"> </el-table-column>
+				<el-table-column label="物料名" prop="material_name"> </el-table-column>
+				<el-table-column label="总数" prop="count"> </el-table-column>
+				<el-table-column label="抽检数" prop="count_sampling"> </el-table-column>
+				<el-table-column label="合格数" prop="count_ok"> </el-table-column>
+				<el-table-column label="不合格数" prop="count_notok"> </el-table-column>
+			</scTable>
 		</el-main>
 		<save-dialog
 			v-if="dialog.save"
@@ -97,6 +116,7 @@ export default {
 			ftestWork:'',
 			materialCate:'',
 			selection: [],
+			exportLoading:false,
 		};
 	},
 	methods: {
@@ -159,6 +179,11 @@ export default {
 		handleCheckSuccess() {
 			this.dialog.check = false;
 		},
+		exportExcel() {
+            this.exportLoading = true;
+            this.$XLSX('#myTable', "成品检验表")
+            this.exportLoading = false;
+        },
 	},
 };
 </script>