|
|
@@ -2105,6 +2105,9 @@
|
|
|
<div style="width: 100%; height: 60px; padding: 0px; display: flex; align-items: center;">
|
|
|
<el-form-item label="工单编号" prop="currentProcess" style="margin-right: 20px; padding: 0px">
|
|
|
<el-input v-model="gxclhcformData['gdbh']" @keyup.enter="gxclhcProductValue" />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="印件号" prop="currentProcess" style="margin-right: 20px; padding: 0px">
|
|
|
+ <el-input v-model="gxclhcformData['yjno']" @keyup.enter="gxclhcProductValue" />
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -2449,6 +2452,7 @@ const JPmachineDetails = async (jt, riqi) => {
|
|
|
const JPmachineDetail_data = await JPmachineDetail({machine: jt, date: riqi});
|
|
|
console.log(JPmachineDetail_data)
|
|
|
_rclsb_gdbh.value = JPmachineDetail_data.data[0]['工单编号']
|
|
|
+ _rclsb_yjno.value = JPmachineDetail_data.data[0]['yjno']
|
|
|
if (JPmachineDetail_data.code === 0) {
|
|
|
let totalA = JPmachineDetail_data.data.totalA
|
|
|
let totalB = JPmachineDetail_data.data.totalB
|
|
|
@@ -6096,15 +6100,18 @@ const gxclhc_Columns = ref(
|
|
|
const gxclhcformData = reactive({
|
|
|
gdbh: '',
|
|
|
gdmc: '',
|
|
|
+ yjno: '',
|
|
|
});
|
|
|
// 工序产量核查按钮
|
|
|
const gd_gxclhconClick = async () => {
|
|
|
console.log(_rclsb_gdbh.value)
|
|
|
+ console.log(_rclsb_yjno.value)
|
|
|
if(_rclsb_gdbh.value === '' || _rclsb_gdbh.value === null){
|
|
|
ElMessage({type: 'warning',message: '请选择具体的工单,在进行操作'})
|
|
|
return false;
|
|
|
}
|
|
|
gxclhcformData['gdbh'] = _rclsb_gdbh.value;
|
|
|
+ gxclhcformData['yjno'] = _rclsb_yjno.value;
|
|
|
gd_gxclhclist.value = true;
|
|
|
_getOrderProcessCount();
|
|
|
};
|
|
|
@@ -6119,7 +6126,8 @@ const gxclhcCancel = async () => {
|
|
|
//工序产量核查方法接口
|
|
|
const _getOrderProcessCount = async () => {
|
|
|
const order = gxclhcformData['gdbh'];
|
|
|
- const getOrderProcessCount_list = await getOrderProcessCount({order:order});
|
|
|
+ const yjno = gxclhcformData['yjno'];
|
|
|
+ const getOrderProcessCount_list = await getOrderProcessCount({order:order,yjno:yjno});
|
|
|
const concatenatedData = getOrderProcessCount_list.data.map(item => {
|
|
|
// 优化后的代码,使用模板字符串连接字段值并在单个数字前添加零
|
|
|
const formattedYjno = item.Gy0_yjno.length === 1 ? `0${item.Gy0_yjno}` : item.Gy0_yjno;
|
|
|
@@ -6388,11 +6396,13 @@ const FacilityInspect = async () => {
|
|
|
}
|
|
|
|
|
|
const _rclsb_gdbh = ref('')
|
|
|
+const _rclsb_yjno = ref('')
|
|
|
// 当日上报产量数据
|
|
|
const FacilitychanLiang = async () => {
|
|
|
const response = await facilitychanLiang({machine:JTMC,date:date});
|
|
|
console.log(response.data)
|
|
|
_rclsb_gdbh.value = response.data[0]['工单编号']
|
|
|
+ _rclsb_yjno.value = response.data[0]['yjno']
|
|
|
console.log(12)
|
|
|
if(response.code==0){
|
|
|
let totalA = response.data['totalA']
|