diff --git a/src/api/systemFinished/systemFinished.js b/src/api/systemFinished/systemFinished.js
index 84c8957..eaf4bac 100644
--- a/src/api/systemFinished/systemFinished.js
+++ b/src/api/systemFinished/systemFinished.js
@@ -18,7 +18,26 @@ export function addOdsProductEmbryoInventory(data) {
contentType:'application/json',
});
}
+// 调整成品盘点单
+export function AdjustInventoryList(data) {
+ return request({
+ url: '/wms/systemFinished/AdjustInventoryList',
+ method: 'post',
+ data: data,
+ contentType:'application/json',
+ });
+}
+
+// 审核
+export function approve(data) {
+ return request({
+ url: '/wms/systemFinished/approve',
+ method: 'post',
+ data: data,
+ contentType:'application/json',
+ });
+}
// 查询成品盘点单详细
export function getSystemFinished(ID) {
return request({
@@ -27,6 +46,16 @@ export function getSystemFinished(ID) {
});
}
+// 获取盘点单的关联信息
+export function selectObtainTheAssociated(data) {
+ return request({
+ url: '/wms/systemFinished/selectObtainTheAssociated',
+ method: 'post',
+ data: data
+ });
+}
+
+
// 新增成品盘点单
export function addSystemFinished(data) {
return request({
diff --git a/src/views/quality/productReport/index.vue b/src/views/quality/productReport/index.vue
index 5d0b65f..679dcfe 100644
--- a/src/views/quality/productReport/index.vue
+++ b/src/views/quality/productReport/index.vue
@@ -138,134 +138,106 @@
成品检验报告
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ {{form.materialName}}
+ {{form.quality}}
+ {{form.checkNo}}
+
+ {{form.materialCode}}
+ {{form.checkLoc}}
+ {{form.createTime}}
+
+ {{form.incomeBatchNo}}
+ {{form.standardNo}}
+ {{form.checkTime}}
+
+
+
+ 包装检验项目
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
- {{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
-
-
-
-
-
-
- {{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
-
-
-
-
-
-
-
-
-
-
+
+
+ 内容物分析项目
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
- {{ getCodeValue(scope.row.defectCode) }}
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
- 合格
-
-
- 不合格
-
-
-
-
+
+
+
+
+
+ 合格
+ 不合格
+
+
+
+ 判定合格打“√”，不合格打“×”
+
+
+
+
+
+
+
-
+
-
+
-
-
-
+
+
+ {{form.checkManName}}
@@ -358,13 +330,27 @@ export default {
factoryCode: null,
},
// 表单参数
- form: {},
+ form: {checkedValues:[]},
checkTypes:[],
// 表单校验
rules: {
/* incomeBatchNo: [
{ required: true, message: "来料批次号不能为空", trigger: "blur" }
], */
+ },
+ content_style: {
+ 'text-align': 'center',
+ 'min-width': '200px',
+ 'word-break': 'break-all'
+ },
+ label_style: {
+ 'color': '#000',
+ 'text-align': 'center',
+ 'font-weight': '600',
+ 'height': '40px',
+ 'background-color': '#d6dbe1',
+ 'min-width': '100px',
+ 'word-break': 'keep-all'
}
};
},
@@ -481,6 +467,9 @@ export default {
this.queryParams.recordId = recordId;
getProduct(recordId).then(response => {
this.form = response.data;
+ let checkedValues0 =[];
+ checkedValues0.push(response.data.checkResult)
+ this.form.checkedValues = ['Y'];
this.form.printable = 'printFrom'; //打印时需要
this.form.ignore = ['no-print'];//打印时需要
this.open = true;
@@ -529,7 +518,18 @@ export default {
getCheckedProjectList(){
this.loading = true;
getCkeckProjectList(this.queryParams).then((response) => {
- this.checkProjectList = response.rows;
+ const itemType1s=[];
+ const itemType0s=[];
+ response.rows.forEach(item=>{
+ if (item.itemType == '1') {
+ itemType1s.push(item);
+ }else if(item.itemType == '0'){
+ itemType0s.push(item);
+ }
+ })
+
+ this.checkProjectList = itemType1s;
+ this.checkProjectList0 = itemType0s;
this.total = response.total;
this.loading = false;
this.form.standardNo = this.checkProjectList[0].standardNo;
@@ -576,4 +576,18 @@ export default {
margin-left: 15px;
height: 38px;
}
+.my-description-item1 {
+ width: 280px; /* 或者你想要的任何宽度 */
+}
+.my-description-item2 {
+ width: 120px; /* 或者你想要的任何宽度 */
+}
+.my-description-item3 {
+ width: 80px; /* 或者你想要的任何宽度 */
+}
+.border-row {
+ border: 1px solid #d3dce6; /* 边框颜色可以根据需要自定义 */
+ text-align:center;
+}
+
\ No newline at end of file
diff --git a/src/views/quality/qcWarehousing/index.vue b/src/views/quality/qcWarehousing/index.vue
index cf5dbb9..dd8ab06 100644
--- a/src/views/quality/qcWarehousing/index.vue
+++ b/src/views/quality/qcWarehousing/index.vue
@@ -458,9 +458,6 @@ export default {
form: {},
// 表单校验
rules: {
- incomeBatchNo: [
- { required: true, message: "批次号不能为空", trigger: "blur" }
- ],
orderNo: [
{ required: true, message: "订单号不能为空", trigger: "blur" }
],
diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue
index dd799af..d854ee3 100644
--- a/src/views/wms/equipment/index.vue
+++ b/src/views/wms/equipment/index.vue
@@ -189,7 +189,7 @@
label="设备编码"
align="center"
prop="equipmentCode"
- width="150"
+ width="100"
fixed="left"
>
@@ -205,7 +205,7 @@
label="设备名称"
align="center"
prop="equipmentName"
- width="300"
+ width="200"
/>
-
+
{{
form.workshopSection
}}
- {{
+ {{
form.unitWorkingHours
}}
{{
@@ -951,9 +951,12 @@
{{
form.sapName
}}
- {{
- form.equipmentCategory
- }}
+
+
+
{{
form.factoryWorkshop
}}
@@ -966,9 +969,12 @@
:contentStyle="CS"
:label-style="LS"
>
- {{
- form.status
- }}
+
+
+
{{
form.department
}}
diff --git a/src/views/wms/systemFinished/index.vue b/src/views/wms/systemFinished/index.vue
index 68d0c7a..0658d19 100644
--- a/src/views/wms/systemFinished/index.vue
+++ b/src/views/wms/systemFinished/index.vue
@@ -93,7 +93,7 @@
icon="el-icon-edit"
size="mini"
:disabled="single"
- @click="handleUpdate"
+ @click="handleUpdateTWO"
v-hasPermi="['systemFinished:systemFinished:edit']"
>审核
@@ -311,6 +311,146 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.locNumber > scope.row.realityNumber ? '盘亏' : (scope.row.locNumber < scope.row.realityNumber ? '盘盈' : '无') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.locNumber > scope.row.realityNumber ? '盘亏' : (scope.row.locNumber < scope.row.realityNumber ? '盘盈' : '无') }}
+
+
+
+
+
+
+
+
+
+
{
+ if (valid) {
+ // 创建一个新对象formData并将form属性赋值给它
+ const formData = Object.assign({}, this.form);
+
+ // // 将addoutorderList数组赋值给formData对象
+ // formData.odsProductEmbryoInventoryCorrelationList = this.associatedData;
+ formData.orderStatus = "3";
+ // 打印整合后的数据对象
+ console.log("Merged Data:", formData);
+ const jsonData = JSON.stringify(formData);
+ // 调用接口并传递整合后的数据对象
+ approve(jsonData).then(response => {
+ // 处理接口返回结果
+ }).catch(error => {
+ // 处理接口请求错误
+ });
+ }
+ });
+ },
+ submitFormTWO() {
+ this.$refs["form"].validate(valid => {
+ if (valid) {
+ // 创建一个新对象formData并将form属性赋值给它
+ const formData = Object.assign({}, this.form);
+
+ // 将addoutorderList数组赋值给formData对象
+ formData.odsProductEmbryoInventoryCorrelationList = this.associatedData;
+
+ // 打印整合后的数据对象
+ console.log("Merged Data:", formData);
+ const jsonData = JSON.stringify(formData);
+ // 调用接口并传递整合后的数据对象
+ AdjustInventoryList(jsonData).then(response => {
+ // 处理接口返回结果
+ }).catch(error => {
+ // 处理接口请求错误
+ });
+ }
+ });
+ },
+ submitFormBOH() {
+ this.$refs["form"].validate(valid => {
+ if (valid) {
+ // 创建一个新对象formData并将form属性赋值给它
+ const formData = Object.assign({}, this.form);
+
+ // // 将addoutorderList数组赋值给formData对象
+ // formData.odsProductEmbryoInventoryCorrelationList = this.associatedData;
+ formData.orderStatus = "2";
+ // 打印整合后的数据对象
+ console.log("Merged Data:", formData);
+ const jsonData = JSON.stringify(formData);
+ // 调用接口并传递整合后的数据对象
+ approve(jsonData).then(response => {
+ // 处理接口返回结果
+ }).catch(error => {
+ // 处理接口请求错误
+ });
+ }
+ });
+ },
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
@@ -599,7 +821,8 @@
this.open = true;
this.title = "盘点新增";
this.selectfactoryCodelist();
- this.form.siteCode = '1000';
+ let factoryCode = localStorage.getItem('USER_POOL_NAME_CURRENT').substring(3)
+ this.form.siteCode = factoryCode;
this.getselect();
},
getselect() {
@@ -627,10 +850,52 @@
row.id || this.ids
getSystemFinished(id).then(response => {
this.form = response.data;
- this.open = true;
- this.title = "修改成品盘点单";
+ this.openTWO = true;
+ this.title = "盘点单调整";
+ const tem = { orderCode: response.data.orderCode };
+ console.log("orderCodeorderCodeorderCodeorderCode---"+row.orderCode)
+ const data = JSON.stringify(tem);
+ this.getAssociatedData(data)
});
+ this.getselect();
},
+ handleUpdateTWO(row) {
+ this.reset();
+ const id =
+ row.id || this.ids
+ getSystemFinished(id).then(response => {
+ this.form = response.data;
+ this.openTEM = true;
+ this.title = "盘点单审核";
+ const tem = { orderCode: response.data.orderCode };
+ console.log("orderCodeorderCodeorderCodeorderCode---"+row.orderCode)
+ const data = JSON.stringify(tem);
+ this.getAssociatedData(data)
+ });
+ this.getselect();
+ },
+ getAssociatedData(data) {
+ selectObtainTheAssociated(data).then(response => {
+ this.associatedData = response.data;
+
+ }).catch(error => {
+ console.error('获取数据失败：', error);
+ });
+
+ },
+ handleAdjustment(row) {
+ // 在这里可以编写处理调整数量的逻辑
+ console.log('调整数量为:', row.adjustmentAmount);
+
+ // 例如，你可以在这里更新数据，发送请求等操作
+ // 例如：row.adjustmentAmount = 新的调整数量
+ // 更新数据：this.$set(row, 'adjustmentAmount', 新的调整数量)
+ row.adjustmentAmount = parseFloat(row.adjustmentAmount); // 将输入的值转换为数字类型保存
+ console.log('调整数量为:', row.adjustmentAmount);
+ // 如果需要发送请求，可以在这里调用接口
+ // 例如：this.$axios.post('/api/adjust', { id: row.id, amount: row.adjustmentAmount })
+ },
+
handleDeleteRW(row) {
console.log("Row Object:", row);