合并冲突

licp

2024-05-28 52e18000ace434b2acdebce5e118c45c337a3fe7

合并冲突

 src/api/quality/attachment.js

@@ -17,8 +17,8 @@

  export function downloadProcessConfigFile(data) {
    return request({
      url: '/mes/attachment/processConfig/'+data.bucket+'/'+data.fileName,
      method: 'post',
      url: '/mes/attachment/processConfig/'+data.fileName+'/'+data.bucket,
      method: 'get',
      responseType: 'blob'
    }).then((response) => {
      // 处理返回的文件流

 src/views/accounting/jmreport/index.vue

@@ -60,6 +60,7 @@
                        isTrue: true,
                        isSearch: true,
                        searchInfoType: 'date',
                        formatter: this.formatDutyDate,
                    },
                    {
                        minWidth: '100',
@@ -91,6 +92,14 @@
                        minWidth: '100',
                        prop: 'staffName',
                        label: '生产人员',
                        isTrue: true,
                        isSearch: true,
                        searchInfoType: 'text',
                    },
                    {
                        minWidth: '100',
                        prop: 'operation',
                        label: '工序',
                        isTrue: true,
                        isSearch: true,
                        searchInfoType: 'text',
@@ -145,8 +154,17 @@
                this.workShopList = []
            }
            })
        },
        formatDutyDate(row, column, cellValue) {
            if (cellValue) {
                const dutyDateList = /\d{4}-\d{1,2}-\d{1,2}/g.exec(cellValue)
                if (dutyDateList && dutyDateList.length > 0) {
                    return dutyDateList[0]
        }
    }
            return ''
        },
    }
}
</script>


 src/views/plan/customerorder/index.vue

@@ -603,7 +603,7 @@
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'date',
            searchInfoType: 'datetimerange',
            formatter: this.formatDutyDate,
          },
          {

 vue.config.js

@@ -6,8 +6,8 @@



const url = 'https://ztms-mes.chinaztt.cn/'
// const url = 'http://localhost:9999'
// const url = 'https://ztms-mes.ztt.cn/'
const url = 'http://localhost:9999'
//const url = 'http://192.168.32.45:9999'