Merge branch 'master' of http://113.44.0.55:8014/jiaxiaoqiang/qingban-SPC into jg-master

src/views/unqualified/DetailCom.vue

@@ -68,8 +68,8 @@
               <div class="desc" v-if="index === 2 && saleModel.auditType === '1' ">分析单位:{{ item[`company`] }}</div>
               <div class="desc" v-if="index === 2 && saleModel.auditType === '2' ">责任部门:{{ item[`company`] }}</div>
 
-              <div class="desc" v-if="index === 3 && saleModel.auditType === '1' ">分析单位:{{ item[`users`]}}</div>
-              <div class="desc" v-if="index === 3 && saleModel.auditType === '2' ">责任部门:{{ item[`users`]}}</div>
+              <div class="desc" v-if="index === 3 && saleModel.auditType === '1' ">分析单位:{{ item[`user`] }}</div>
+              <div class="desc" v-if="index === 3 && saleModel.auditType === '2' ">责任部门:{{ item[`user`] }}</div>
 
               <div class="desc" v-if="index === 4 && saleModel.auditType === '1' ">分析单位:{{ item[`user`] }}</div>
               <div class="desc" v-if="index === 4 && saleModel.auditType === '2' ">责任部门:{{ item[`user`] }}</div>

src/views/unqualified/handle20.vue

@@ -239,8 +239,7 @@ const getUserInfo = async () => {
 
 const confirmClick = () => {
   const date = new Date();
-  const now =
-    date.getFullYear() + "年" + date.getMonth() + "月" + date.getDate() + "日";
+  const now = date.getFullYear() + "年" + (date.getMonth() + 1) + "月" + date.getDate() + "日";
   remark.user = userStore.user.username;
   remarkRef.value.validate((valid) => {
     if (valid) {

src/views/unqualified/handle21.vue

@@ -137,8 +137,7 @@ const getUserInfo = async () => {
 
 const confirmClick = () => {
   const date = new Date();
-  const now =
-    date.getFullYear() + "年" + date.getMonth() + "月" + date.getDate() + "日";
+  const now = date.getFullYear() + "年" + (date.getMonth() + 1) + "月" + date.getDate() + "日";
   remark.user = userStore.user.username;
   remarkRef.value.validate((valid) => {
     if (valid) {

src/views/unqualified/handle3.vue

@@ -138,8 +138,7 @@ const getUserInfo = async () => {
 
 const confirmClick = () => {
   const date = new Date();
-  const now =
-    date.getFullYear() + "年" + date.getMonth() + "月" + date.getDate() + "日";
+  const now = date.getFullYear() + "年" + (date.getMonth() + 1) + "月" + date.getDate() + "日";
   remark.user = userStore.user.username;
   remarkRef.value.validate((valid) => {
     if (valid) {

src/views/unqualified/handle4.vue

@@ -137,8 +137,7 @@ const getUserInfo = async () => {
 
 const confirmClick = () => {
   const date = new Date();
-  const now =
-    date.getFullYear() + "年" + date.getMonth() + "月" + date.getDate() + "日";
+  const now = date.getFullYear() + "年" + (date.getMonth() + 1) + "月" + date.getDate() + "日";
   remark.user = userStore.user.username;
   remarkRef.value.validate((valid) => {
     if (valid) {

src/views/unqualified/handle5.vue

@@ -137,8 +137,7 @@ const getUserInfo = async () => {
 
 const confirmClick = () => {
   const date = new Date();
-  const now =
-    date.getFullYear() + "年" + date.getMonth() + "月" + date.getDate() + "日";
+  const now = date.getFullYear() + "年" + (date.getMonth() + 1) + "月" + date.getDate() + "日";
   remark.user = userStore.user.username;
   remarkRef.value.validate((valid) => {
     if (valid) {

src/views/unqualified/handle6.vue

@@ -116,7 +116,7 @@ const getUserInfo = async () => {
 
 const confirmClick = () => {
   const date = new Date();
-  const now = date.getFullYear() + "年" + date.getMonth() + "月" + date.getDate() + "日"
+  const now = date.getFullYear() + "年" + (date.getMonth() + 1) + "月" + date.getDate() + "日";
   remark.user = userStore.user.username;
   remarkRef.value.validate((valid) => {
     if (valid) {

src/views/unqualified/handle7.vue

@@ -120,7 +120,7 @@ const getUserInfo = async () => {
 
 const confirmClick = () => {
   const date = new Date();
-  const now = date.getFullYear() + "年" + date.getMonth() + "月" + date.getDate() + "日"
+  const now = date.getFullYear() + "年" + (date.getMonth() + 1) + "月" + date.getDate() + "日";
   remark.user = userStore.user.username;
   remarkRef.value.validate((valid) => {
     if (valid) {

src/views/unqualified/index.vue

@@ -22,6 +22,7 @@
         >新增</el-button
       >
       <el-table :data="tableData" border>
+        <el-table-column prop="formNo" label="编号"/>
         <el-table-column prop="materialModel" label="产品型号" />
         <el-table-column prop="type" label="产品分类" />
         <el-table-column prop="workOrderCode" label="生产批号" />
@@ -141,6 +142,11 @@ const tableData = ref([]);
 const searchRef = ref(null);
 const searchForm = [
   {
+    label: "编号",
+    prop: "formNo",
+    type: "input",
+  },
+  {
     label: "工单号",
     prop: "workOrderCode",
     type: "input",