fix:销售反馈增加

src/api/sales/index.ts

@@ -17,6 +17,14 @@ export function getOrderList(data: object) {
   });
 }
 
+export function getCheckList(data: object) {
+  return request({
+    url: "/api/v1/sales/checkCode/list",
+    method: "post",
+    data,
+  });
+}
+
 // 用户列表
 export function getUserList(data: object) {
   return request({

src/views/sales/add.vue

@@ -28,26 +28,26 @@
 <!--          <el-form-item label="阶段" prop="stage">
             <el-input v-model="saleForm.stage" />
           </el-form-item>-->
-          <el-form-item label="订单信息">
+          <el-form-item label="检验批号">
             <el-select
-              v-model="selectOrderCode"
-              value-key="orderNo"
-              placeholder="请选择订单信息"
+              v-model="selectCheckCode"
+              value-key="checkCode"
+              placeholder="请选择检验批号"
               style="width: 100%"
               @change="orderSelect"
             >
               <el-option
                 v-for="item in orders"
-                :key="item.orderNo"
-                :label="item.orderName + `(批号: ${item.workOrderCode})`"
+                :key="item.checkCode"
+                :label="item.checkCode"
                 :value="item"
               />
             </el-select>
           </el-form-item>
 
-          <el-form-item label="检验批号">
+<!--          <el-form-item label="检验批号">
             <div>{{ selectedOrder.workOrderCode }}</div>
-          </el-form-item>
+          </el-form-item>-->
 
           <el-form-item label="流转卡号" prop="seqs">
             <el-select
@@ -55,6 +55,7 @@
               value-key="orderCode"
               placeholder="请选择流转卡号"
               style="width: 100%"
+              filterable
               multiple
             >
               <el-option
@@ -143,7 +144,7 @@
 </template>
 
 <script setup>
-import { addFeedback, getOrderList, getUserList } from "@/api/sales/index";
+import {addFeedback, getCheckList, getOrderList, getUserList} from "@/api/sales/index";
 import { getUserTree } from "@/api/user/index";
 import { useDictionaryStore } from "@/store";
 const drawerVisible = ref(false);
@@ -211,22 +212,20 @@ const rules1 = {
 // 订单相关信息
 const orders = ref([]);
 const typeList = dicts.sales_info_type
-const selectedOrder = ref({});
-const selectOrderCode = ref("");
+const selectedCheckCode = ref({});
+const selectCheckCode = ref("");
 const getOrders = async () => {
-  const res = await getOrderList({
-    pageNo: 0,
-    pageSize: 200,
+  const res = await getCheckList({
   });
-  orders.value = res.data.records;
+  orders.value = res.data;
   if (orders.value.length > 0) {
-    // selectOrderCode.value = orders.value[0].orderCode;
+    // selectCheckCode.value = orders.value[0].orderCode;
     // selectedOrder.value = orders.value[0];
   }
 };
 const orderSelect = (value) => {
-  selectedOrder.value = value;
-  seqList.value = selectedOrder.value.seqs.map((item, index) => ({ value: item, label: item }));
+  selectedCheckCode.value = value;
+  seqList.value = selectedCheckCode.value.seqs.map((item, index) => ({ value: item, label: item }));
   saleForm.seqs = [];
 };
 
@@ -247,8 +246,8 @@ const getUserInfo = async () => {
 };
 
 const showDrawer = () => {
-  selectedOrder.value = {};
-  selectOrderCode.value = {};
+  selectedCheckCode.value = {};
+  selectCheckCode.value = {};
   getOrders();
   getUserInfo();
   drawerVisible.value = true;
@@ -260,7 +259,7 @@ const cancelClick = () => {
   drawerVisible.value = false;
   baseInfoRef.value.resetFields();
   remark1Ref.value.resetFields();
-  selectedOrder.value = {};
+  selectedCheckCode.value = {};
 };
 
 const feedBackEmit = defineEmits(["finish"]);
@@ -268,7 +267,6 @@ const feedBackEmit = defineEmits(["finish"]);
 const confirmClick = () => {
   console.log(saleForm);
   console.log(remark1);
-  console.log(selectedOrder.value);
 
   // drawerVisible.value = false;
 
@@ -297,7 +295,7 @@ const confirmClick = () => {
 
       let p = {
         ...saleForm,
-        ...selectedOrder.value,
+        ...selectedCheckCode.value,
         currentUserName: remark1.nextRemarkUser,
         remark1: JSON.stringify(remark1Copy),
         remark2: JSON.stringify(remark2),

src/views/statistic/firstPassYield/index.vue

@@ -105,6 +105,7 @@
             <el-table-column prop="workshopName" label="车间名称" />
             <el-table-column prop="materialName" label="产品名称" />
             <el-table-column prop="materialCode" label="产品编码" />
+              <el-table-column prop="materialModel" label="产品规格" />
             <el-table-column prop="workOrderCode" label="产品批次" />
             <el-table-column prop="qualified" label="良率" />
             <el-table-column prop="noQualified" label="不良率" />

src/views/statistic/statistic/index.vue

@@ -90,6 +90,7 @@
             />
             <el-table-column prop="materialName" label="产品名称" />
             <el-table-column prop="materialCode" label="产品编号" />
+              <el-table-column prop="materialModel" label="产品规格" />
             <el-table-column  prop="produceNum" label="生产数量"  />
             <el-table-column v-if="queryIndexs.includes('pass')" prop="qualified" label="合格率"  />
             <el-table-column v-if="queryIndexs.includes('oneTimePassRate')" prop="oneTimePassRate" label="一次性合格率" />