diff --git a/src/api/fixedCarrier/fixedCarrier.js b/src/api/fixedCarrier/fixedCarrier.js
new file mode 100644
index 0000000..21d7c7f
--- /dev/null
+++ b/src/api/fixedCarrier/fixedCarrier.js
@@ -0,0 +1,37 @@
+import { createAPI } from '@/utils/httpRequest.js'
+
+/**
+ * 固定载具查询
+ * @param data
+ * @returns {*}
+ */
+export const fixedCarrierSearch = data => createAPI('fixedCarrier/list', 'POST', data)
+
+/**
+ * 固定载具新增
+ * @param data
+ * @returns {*}
+ */
+export const fixedCarrierSave = data => createAPI('fixedCarrier/save', 'POST', data)
+
+/**
+ * 固定载具修改
+ * @param data
+ * @returns {*}
+ */
+export const fixedCarrierUpdate = data => createAPI('fixedCarrier/update', 'POST', data)
+
+/**
+ * 固定载具删除
+ * @param data
+ * @returns {*}
+ */
+export const fixedCarrierDelete = data => createAPI('fixedCarrier/delete', 'POST', data)
+
+/**
+ * 获取用户站点和BU
+ * @param data
+ * @returns {*}
+ */
+export const getSiteAndBuByUserName = data => createAPI('qc/getSiteAndBuByUserName', 'POST', data)
+
diff --git a/src/views/modules/fixedCarrier/fixedCarrier.vue b/src/views/modules/fixedCarrier/fixedCarrier.vue
new file mode 100644
index 0000000..c9b48d1
--- /dev/null
+++ b/src/views/modules/fixedCarrier/fixedCarrier.vue
@@ -0,0 +1,446 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 新增
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ i.sitename }}
+ {{ i.buDesc }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+ 关闭
+
+
+
+
+
+
+
+
+
diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue
index 76b8935..64c6510 100644
--- a/src/views/modules/yieldReport/com_produce_report_normal.vue
+++ b/src/views/modules/yieldReport/com_produce_report_normal.vue
@@ -4237,7 +4237,7 @@ export default {
this.$message.error('请先选择派工单!');
return false;
}
-
+
// 如果操作员信息还未设置，先设置为当前登录人
if (!this.operatorData.operatorId || !this.operatorData.operatorName) {
this.operatorData.operatorId = this.$store.state.user.name;
@@ -4248,7 +4248,7 @@ export default {
this.titleCon = '机台工作台' + ' - ' + this.scheduleData.workCenterDesc + ' '
+ this.scheduleData.resourceDesc + ' （' + this.operatorData.operatorName + '）';
}
-
+
//打开操作员切换功能，用于管理上下岗人员
this.showOperatorFlag = true;
this.$nextTick(() => {
@@ -4656,7 +4656,8 @@ export default {
site: this.scheduleData.site,
//buNo: this.scheduleData.buNo,
orderNo: this.scheduleData.orderNo,
- resourceId: this.scheduleData.resourceId
+ resourceId: this.scheduleData.resourceId,
+ seqNo: this.scheduleData.seqNo
};
checkProcessInspectionPendingCount(params).then(({data}) => {