Merge branch 'qingban' of http://maven.jgiot.com:7012/jiaxiaoqiang/JG-ADMIN-TEMP into qingban

src/api/system/user/index.ts

@@ -81,6 +81,21 @@ export function updateUser(id: number, data: any) {
   });
 }
 
+export function updateBaseInfo(id: number, data: any) {
+  return request({
+    url: "/api/v1/sys/user/updateBaseInfo",
+    method: "post",
+    data: { id: id, ...data },
+  });
+}
+export function updateHeadImg(id: number, data: any) {
+  return request({
+    url: "/api/v1/sys/user/updateHeadImg",
+    method: "post",
+    data: { id: id, ...data },
+  });
+}
+
 /**
  * 修改用户密码
  *

src/views/login/userCenter.vue

@@ -57,7 +57,7 @@
 </template>
 
 <script setup lang="ts">
-import { getUserDetailApi, updateUser } from "@/api/system/user/index";
+import { getUserDetailApi,updateHeadImg,updateBaseInfo} from "@/api/system/user/index";
 import { useUserStoreHook } from "@/store/modules/user";
 import SingleUpload from "@/components/Upload/SingleUpload.vue";
 
@@ -78,7 +78,7 @@ const show = () => {
 defineExpose({ show });
 
 const uploadHeadFinish = () => {
-  updateUser(userStore.user.userId, { avatar: headUrl.value }).then(() => {
+  updateHeadImg(userStore.user.userId, { avatar: headUrl.value }).then(() => {
     ElMessage.success("头像上传成功");
   });
 };
@@ -109,8 +109,8 @@ const rules = reactive({
 const submitForm = () => {
   passwordFormRef.value.validate((valid: boolean) => {
     if (valid) {
-      updateUser(userStore.user.userId, {
-        password: passwordForm.value.password,
+      updateBaseInfo(userStore.user.userId, {
+        password: passwordForm.value.password,oldPassword: passwordForm.value.oldPassword
       }).then(() => {
         ElMessage.success("密码修改成功");
         visible.value = false;

src/views/quality/feedback/components/process.vue

@@ -50,7 +50,17 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <div class="stage" v-if="step > 0">
+      <el-divider v-if="step == 1 && showStatus == true" />
+      <div
+        v-if="step == 1 && showStatus == true"
+        style="font-size: 20px; margin: 0 auto"
+      >
+        暂无内容
+      </div>
+      <div
+        class="stage"
+        v-if="step > 0 && (step == 1 ? showStatus == false : true)"
+      >
         <el-form-item
           label="不合格现象（质量问题）描述："
           prop="remark1[content]"
@@ -116,7 +126,7 @@
           </el-col>
         </el-row>
       </div>
-      <div class="stage" v-if="step > 1">
+      <div class="stage" v-if="step > 1&& (step == 2 ? showStatus == false : true)">
         <el-form-item
           label="原因分析："
           prop="remark1[content]"
@@ -196,7 +206,7 @@
           </el-col>
         </el-row>
       </div>
-      <div class="stage" v-if="step > 2">
+      <div class="stage" v-if="step > 2 && (step == 3 ? showStatus == false : true)">
         <el-row>
           <el-col :span="8">
             <el-form-item
@@ -305,7 +315,7 @@
           </el-col>
         </el-row>
       </div>
-      <div class="stage" v-if="step > 3">
+      <div class="stage"  v-if="step > 3 && (step == 4 ? showStatus == false : true)">
         <el-form-item
           label="采取的措施："
           prop="remark1[content]"
@@ -385,7 +395,7 @@
           </el-col>
         </el-row>
       </div>
-      <div class="stage" v-if="step > 4">
+      <div class="stage" v-if="step > 4 && (step == 5 ? showStatus == false : true)">
         <el-form-item
           label="不合格品评审（审理）处置意见："
           prop="remark1[content]"
@@ -450,7 +460,8 @@
           </el-col>
         </el-row>
       </div>
-      <div class="stage" v-if="step > 5">
+      <div class="stage" 
+      v-if="step > 5 && (step == 6 ? showStatus == false : true)">
         <el-form-item
           label="组长（或分管领导）审批意见："
           prop="remark1[content]"
@@ -502,7 +513,7 @@
       </div>
     </el-form>
     <div class="btns">
-      <el-button type="primary" @click="submit" v-if="step">提交</el-button>
+      <el-button type="primary" @click="submit" v-if="step && !showStatus">提交</el-button>
       <el-button type="info" @click="toClose">返回</el-button>
     </div>
   </div>
@@ -600,67 +611,51 @@ const toClose = () => {
 };
 const userNameArray = ref([]);
 const step = ref(null);
+const showStatus = ref(false);
 const setShowStage = () => {
   step.value = null;
-  if (
-    userName.value == formData.value.remark2.user2 &&
-    formData.value.remark2.state == "-1" &&
-    step.value == null
-  ) {
-    userNameArray.value.push(true);
+  showStatus.value = false;
+  if (formData.value.remark2.state == "-1") {
     step.value = 1;
-  } else {
-    userNameArray.value.push(false);
+    if (formData.value.remark2.user2 != userName.value) {
+      showStatus.value = true;
+    }
+    return;
   }
-  if (
-    userName.value == formData.value.remark3.user3 &&
-    formData.value.remark3.state == "-1" &&
-    step.value == null
-  ) {
-    userNameArray.value.push(true);
+  if (formData.value.remark3.state == "-1") {
     step.value = 2;
-  } else {
-    userNameArray.value.push(false);
+    if (formData.value.remark3.user3 != userName.value) {
+      showStatus.value = true;
+    }
+    return;
   }
-  if (
-    userName.value == formData.value.remark4.user4 &&
-    formData.value.remark4.state == "-1" &&
-    step.value == null
-  ) {
-    userNameArray.value.push(true);
+  if (formData.value.remark4.state == "-1") {
     step.value = 3;
-  } else {
-    userNameArray.value.push(false);
+    if (formData.value.remark4.user4 != userName.value) {
+      showStatus.value = true;
+    }
+    return;
   }
-  if (
-    userName.value == formData.value.remark5.user5 &&
-    formData.value.remark5.state == "-1" &&
-    step.value == null
-  ) {
-    userNameArray.value.push(true);
+  if (formData.value.remark5.state == "-1") {
     step.value = 4;
-  } else {
-    userNameArray.value.push(false);
+    if (formData.value.remark5.user5 != userName.value) {
+      showStatus.value = true;
+    }
+    return;
   }
-  if (
-    userName.value == formData.value.remark6.user6 &&
-    formData.value.remark6.state == "-1" &&
-    step.value == null
-  ) {
-    userNameArray.value.push(true);
+  if (formData.value.remark6.state == "-1") {
     step.value = 5;
-  } else {
-    userNameArray.value.push(false);
+    if (formData.value.remark6.user6 != userName.value) {
+      showStatus.value = true;
+    }
+    return;
   }
-  if (
-    userName.value == formData.value.remark7.user7 &&
-    formData.value.remark7.state == "-1" &&
-    step.value == null
-  ) {
-    userNameArray.value.push(true);
+  if (formData.value.remark7.state == "-1") {
     step.value = 6;
-  } else {
-    userNameArray.value.push(false);
+    if (formData.value.remark7.user7 != userName.value) {
+      showStatus.value = true;
+    }
+    return;
   }
 };
 const setFormData = () => {

src/views/quality/reject/components/process.vue

@@ -50,7 +50,17 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <div class="stage" v-if="step > 0">
+      <el-divider v-if="step == 1 && showStatus == true" />
+      <div
+        v-if="step == 1 && showStatus == true"
+        style="font-size: 20px; margin: 0 auto"
+      >
+        暂无内容
+      </div>
+      <div
+        class="stage"
+        v-if="step > 0 && (step == 1 ? showStatus == false : true)"
+      >
         <el-form-item
           label="不合格现象（质量问题）描述："
           prop="remark1[content]"
@@ -116,7 +126,10 @@
           </el-col>
         </el-row>
       </div>
-      <div class="stage" v-if="step > 1">
+      <div
+        class="stage"
+        v-if="step > 1 && (step == 2 ? showStatus == false : true)"
+      >
         <el-form-item
           label="原因分析："
           prop="remark1[content]"
@@ -196,7 +209,10 @@
           </el-col>
         </el-row>
       </div>
-      <div class="stage" v-if="step > 2">
+      <div
+        class="stage"
+        v-if="step > 2 && (step == 3 ? showStatus == false : true)"
+      >
         <el-row>
           <el-col :span="8">
             <el-form-item
@@ -305,7 +321,10 @@
           </el-col>
         </el-row>
       </div>
-      <div class="stage" v-if="step > 3">
+      <div
+        class="stage"
+        v-if="step > 3 && (step == 4 ? showStatus == false : true)"
+      >
         <el-form-item
           label="采取的措施："
           prop="remark1[content]"
@@ -385,7 +404,10 @@
           </el-col>
         </el-row>
       </div>
-      <div class="stage" v-if="step > 4">
+      <div
+        class="stage"
+        v-if="step > 4 && (step == 5 ? showStatus == false : true)"
+      >
         <el-form-item
           label="不合格品评审（审理）处置意见："
           prop="remark1[content]"
@@ -450,7 +472,10 @@
           </el-col>
         </el-row>
       </div>
-      <div class="stage" v-if="step > 5">
+      <div
+        class="stage"
+        v-if="step > 5 && (step == 6 ? showStatus == false : true)"
+      >
         <el-form-item
           label="组长（或分管领导）审批意见："
           prop="remark1[content]"
@@ -502,7 +527,9 @@
       </div>
     </el-form>
     <div class="btns">
-      <el-button type="primary" @click="submit" v-if="step">提交</el-button>
+      <el-button type="primary" @click="submit" v-if="step && !showStatus"
+        >提交</el-button
+      >
       <el-button type="info" @click="toClose">返回</el-button>
     </div>
   </div>
@@ -598,69 +625,52 @@ const toClose = () => {
   examineStatus.value = false;
   emit("getList");
 };
-const userNameArray = ref([]);
 const step = ref(null);
+const showStatus = ref(false);
 const setShowStage = () => {
   step.value = null;
-  if (
-    userName.value == formData.value.remark2.user2 &&
-    formData.value.remark2.state == "-1" &&
-    step.value == null
-  ) {
-    userNameArray.value.push(true);
+  showStatus.value = false;
+  if (formData.value.remark2.state == "-1") {
     step.value = 1;
-  } else {
-    userNameArray.value.push(false);
+    if (formData.value.remark2.user2 != userName.value) {
+      showStatus.value = true;
+    }
+    return;
   }
-  if (
-    userName.value == formData.value.remark3.user3 &&
-    formData.value.remark3.state == "-1" &&
-    step.value == null
-  ) {
-    userNameArray.value.push(true);
+  if (formData.value.remark3.state == "-1") {
     step.value = 2;
-  } else {
-    userNameArray.value.push(false);
+    if (formData.value.remark3.user3 != userName.value) {
+      showStatus.value = true;
+    }
+    return;
   }
-  if (
-    userName.value == formData.value.remark4.user4 &&
-    formData.value.remark4.state == "-1" &&
-    step.value == null
-  ) {
-    userNameArray.value.push(true);
+  if (formData.value.remark4.state == "-1") {
     step.value = 3;
-  } else {
-    userNameArray.value.push(false);
+    if (formData.value.remark4.user4 != userName.value) {
+      showStatus.value = true;
+    }
+    return;
   }
-  if (
-    userName.value == formData.value.remark5.user5 &&
-    formData.value.remark5.state == "-1" &&
-    step.value == null
-  ) {
-    userNameArray.value.push(true);
+  if (formData.value.remark5.state == "-1") {
     step.value = 4;
-  } else {
-    userNameArray.value.push(false);
+    if (formData.value.remark5.user5 != userName.value) {
+      showStatus.value = true;
+    }
+    return;
   }
-  if (
-    userName.value == formData.value.remark6.user6 &&
-    formData.value.remark6.state == "-1" &&
-    step.value == null
-  ) {
-    userNameArray.value.push(true);
+  if (formData.value.remark6.state == "-1") {
     step.value = 5;
-  } else {
-    userNameArray.value.push(false);
+    if (formData.value.remark6.user6 != userName.value) {
+      showStatus.value = true;
+    }
+    return;
   }
-  if (
-    userName.value == formData.value.remark7.user7 &&
-    formData.value.remark7.state == "-1" &&
-    step.value == null
-  ) {
-    userNameArray.value.push(true);
+  if (formData.value.remark7.state == "-1") {
     step.value = 6;
-  } else {
-    userNameArray.value.push(false);
+    if (formData.value.remark7.user7 != userName.value) {
+      showStatus.value = true;
+    }
+    return;
   }
 };
 const setFormData = () => {

src/views/storage/semi/components/details.vue

@@ -30,6 +30,7 @@
     >
       <el-form-item
         label="流转卡号"
+        v-if="detailsData?.stockType != '2'"
         prop="workOrderSeqNos"
         :rules="[
           {
@@ -50,6 +51,7 @@
       </el-form-item>
       <el-form-item
         label="出库工单号"
+        v-if="detailsData?.stockType != '2'"
         prop="outWorkOrderCode"
         :rules="[
           {
@@ -68,7 +70,7 @@
     <el-button
       type="primary"
       @click="submit"
-      :disabled="detailsData?.stockType == '2'"
+      v-if="detailsData?.stockType != '2'"
       >出库</el-button
     >
     <el-dialog

src/views/storage/semi/index.vue

@@ -274,10 +274,10 @@ option.value = Object.assign(option.value, {
         return h(
           "p",
           row.stockType == "1"
-            ? row.outWorkOrderCode
+            ? "-"
+            : row?.outWorkOrderCode
               ? row.outWorkOrderCode
               : "-"
-            : ""
         );
       },
     },