Merge branch 'dev' of http://39.105.222.208:1024/leihd/factory-web into dev

@@ -112,6 +112,14 @@ export function yanshouList(url,parameter){
     params:parameter
     params:parameter
   })
   })
 }
 }
+//修改验收
+export function updateYan(url,parameter){
+  return axios({
+    url:url,
+    method:'put',
+    data:parameter
+  })
+}
 //工序查询
 //工序查询
 export function querygx(url,parameter){
 export function querygx(url,parameter){
   return axios({
   return axios({

@@ -24,7 +24,7 @@
     data () {
     data () {
       return {
       return {
         title:"操作",
         title:"操作",
-        width:670,
+        width:800,
         visible: false,
         visible: false,
         disableSubmit: false
         disableSubmit: false
       }
       }

@@ -20,10 +20,11 @@
 </template>
 </template>
 
 
 <script>
 <script>
-import { httpAction, getAction,yanshouList } from '@/api/manage'
+import { httpAction, getAction, yanshouList } from '@/api/manage'
 import { validateDuplicateValue } from '@/utils/util'
 import { validateDuplicateValue } from '@/utils/util'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import { yanshou } from '../../../api/manage'
+import { updateYan, yanshou } from '../../../api/manage'
+import { mapGetters } from 'vuex'
 export default {
 export default {
   name: 'TblProductionYansForm',
   name: 'TblProductionYansForm',
   mixins: [JeecgListMixin],
   mixins: [JeecgListMixin],
@@ -44,11 +45,13 @@ export default {
         {
         {
           title: '工序',
           title: '工序',
           align: 'center',
           align: 'center',
+          width: 220,
           dataIndex: 'workingProcedure',
           dataIndex: 'workingProcedure',
         },
         },
         {
         {
           title: '承接人',
           title: '承接人',
           align: 'center',
           align: 'center',
+          width: 150,
           dataIndex: 'undertaker',
           dataIndex: 'undertaker',
         },
         },
         {
         {
@@ -59,12 +62,31 @@ export default {
         {
         {
           title: '验收结果',
           title: '验收结果',
           align: 'center',
           align: 'center',
+          width: 100,
+          modified: false,
           dataIndex: 'yanResult',
           dataIndex: 'yanResult',
+          customRender: (text, record, index) => {
+            return (
+              <a-select
+                v-model={record.yanResult}
+                style="width: 100%;"
+                onChange={() => this.handleYanResultChange(record)}
+              >
+                <a-select-option value="合格入库">合格入库</a-select-option>
+                <a-select-option value="不合格">不合格</a-select-option>
+              </a-select>
+            )
+          },
         },
         },
         {
         {
           title: '备注',
           title: '备注',
           align: 'center',
           align: 'center',
+          width: 150,
+          modified2: false,
           dataIndex: 'notes',
           dataIndex: 'notes',
+          customRender: (text, record, index) => {
+            return <a-input v-model={record.notes} style="text-align: center" v-on:input={() => this.handleInputChange(record)} />
+          },
         },
         },
       ],
       ],
       labelCol: {
       labelCol: {
@@ -84,9 +106,10 @@ export default {
         zongPrice: [{ required: true, message: '请输入总工资算法!' }],
         zongPrice: [{ required: true, message: '请输入总工资算法!' }],
       },
       },
       url: {
       url: {
-        list:'/production/tblProductionGongxu/list',
+        list: '/production/tblProductionGongxu/list',
         edit: '/production/tblProductionGongxu/edit',
         edit: '/production/tblProductionGongxu/edit',
-        queryByNumber:'/production/tblProductionGongxu/queryByNumber'
+        queryByNumber: '/production/tblProductionGongxu/queryByNumber',
+        updateYan: '/production/tblProductionGongxu/updateYan',
       },
       },
     }
     }
   },
   },
@@ -100,13 +123,55 @@ export default {
     this.modelDefault = JSON.parse(JSON.stringify(this.model))
     this.modelDefault = JSON.parse(JSON.stringify(this.model))
   },
   },
   methods: {
   methods: {
-    yanshouList(record){
+    handleInputChange(record){
+       // 找到当前更改行的索引
+      const index = this.res.findIndex((item) => item.id === record.id)
+      console.log("index：",index)
+      // 如果找到了该行
+      if (index !== -1) {
+        this.res[index].modified2 = true
+      }
+      console.log("modified2：",this.res[index].modified2)
+    },
+    handleYanResultChange(record) {
+      console.log('当前更改的行的ID：', record.id)
+      console.log('当前选中的值：', record.yanResult)
+
+      // 找到当前更改行的索引
+      const index = this.res.findIndex((item) => item.id === record.id)
+
+      // 如果找到了该行
+      if (index !== -1) {
+        console.log('页面加载时显示的值：', this.res[index].originalYanResult)
+
+        // 比较当前选中的值和页面加载时显示的值
+        if (record.yanResult !== this.res[index].originalYanResult) {
+          // 如果不相同，则将 modified 属性设置为 true
+          this.res[index].modified = true
+        } else {
+          // 如果相同，则将 modified 属性设置为 false
+          this.res[index].modified = false
+        }
+      }
+    },
+    ...mapGetters(['nickname', 'avatar', 'userInfo']),
+    yanshouList(record) {
       console.log(record.orderId)
       console.log(record.orderId)
-        yanshouList(this.url.queryByNumber,{orderNumber:record.orderId}).then((res) =>{
-            if(res){
-                this.res=res.result
-            }
-        })
+      yanshouList(this.url.queryByNumber, { orderId: record.orderId }).then((ress) => {
+        if (ress) {
+          this.res = ress.result.map((item) => ({
+            id: item.id,
+            workingProcedure: item.workingProcedure,
+            undertaker: item.undertaker,
+            workHours: item.workHours,
+            yanResult: item.yanResult,
+            notes: item.notes,
+            yanRen: this.userInfo().realname,
+            yanTime: new Date(),
+            originalYanResult: item.yanResult, // 添加一个 originalYanResult 属性保存页面加载时的值
+          }))
+        }
+      })
     },
     },
     edit(record) {
     edit(record) {
       this.model = Object.assign({}, record)
       this.model = Object.assign({}, record)
@@ -118,10 +183,26 @@ export default {
       this.$refs.form.validate((valid) => {
       this.$refs.form.validate((valid) => {
         if (valid) {
         if (valid) {
           that.confirmLoading = true
           that.confirmLoading = true
-          let httpurl = ''
-          let method = ''
-          
-          httpAction(this.url, this.model, method)
+
+          // 对记录进行分组，根据不同字段的修改情况进行更新
+          const recordsToUpdate = this.res.reduce((acc, record) => {
+            console.log("是否修改2：",record.modified2)
+            console.log("是否修改：",record.modified)
+            // 判断是否有字段被修改
+            if (record.modified) {
+              // 若 yanResult 字段被修改，则整条记录更新
+              if (record.yanResult !== record.originalYanResult) {
+                acc.push(record)
+              } 
+            }else if(record.modified2){
+                // 若只有 notes 字段被修改，则只更新 notes 字段
+                const updatedRecord = Object.assign({}, record, { notes: record.notes })
+                console.log("备注：",updatedRecord)
+                acc.push(updatedRecord)
+            }
+            return acc
+          }, [])
+          updateYan(this.url.updateYan, recordsToUpdate)
             .then((res) => {
             .then((res) => {
               if (res.success) {
               if (res.success) {
                 that.$message.success(res.message)
                 that.$message.success(res.message)