|
@@ -127,15 +127,34 @@
|
|
|
:size="size"
|
|
|
>生产准备</el-button
|
|
|
>
|
|
|
+
|
|
|
<el-button
|
|
|
icon="el-icon-setting"
|
|
|
text
|
|
|
- @click="showProExcel(row.id)"
|
|
|
+ @click="showProExcel(row.id, '0')"
|
|
|
type="primary"
|
|
|
- v-if="row.workOrderState > 3"
|
|
|
+ v-if="row.workOrderState > 3 && row.filterNumber == '1'"
|
|
|
:size="size"
|
|
|
>生产随工单</el-button
|
|
|
>
|
|
|
+ <el-button
|
|
|
+ icon="el-icon-setting"
|
|
|
+ text
|
|
|
+ @click="showProExcel(row.id, '1')"
|
|
|
+ type="primary"
|
|
|
+ v-if="row.workOrderState > 3 && row.filterNumber == '2'"
|
|
|
+ :size="size"
|
|
|
+ >生产随工单(一筛)</el-button
|
|
|
+ >
|
|
|
+ <el-button
|
|
|
+ icon="el-icon-setting"
|
|
|
+ text
|
|
|
+ @click="showProExcel(row.id, '2')"
|
|
|
+ type="primary"
|
|
|
+ v-if="row.workOrderState > 3 && row.filterNumber == '2'"
|
|
|
+ :size="size"
|
|
|
+ >生产随工单(二筛)</el-button
|
|
|
+ >
|
|
|
<!-- <el-button
|
|
|
icon="el-icon-notebook"
|
|
|
text
|
|
@@ -294,7 +313,11 @@
|
|
|
width="950px"
|
|
|
@close="dialog7.visible = false"
|
|
|
>
|
|
|
- <work-order-page queryType="2" @order-info="workOrderInfoClick" multipleKey="workOrderCode"/>
|
|
|
+ <work-order-page
|
|
|
+ queryType="2"
|
|
|
+ @order-info="workOrderInfoClick"
|
|
|
+ multipleKey="workOrderCode"
|
|
|
+ />
|
|
|
</el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
@@ -327,8 +350,8 @@ const router = useRouter();
|
|
|
const workOderShow = ref(false);
|
|
|
const ExDataObj = ref({});
|
|
|
const excelData = ref([]);
|
|
|
-const showProExcel = async (id) => {
|
|
|
- const { data, code } = await getProExcel(id);
|
|
|
+const showProExcel = async (id, type) => {
|
|
|
+ const { data, code } = await getProExcel(id, type);
|
|
|
if (code == "200") {
|
|
|
ExDataObj.value = data;
|
|
|
workOderShow.value = true;
|
|
@@ -526,8 +549,8 @@ const handleSubmit = () => {
|
|
|
});
|
|
|
};
|
|
|
const workOrderInfoClick = (value) => {
|
|
|
- if(value){
|
|
|
- form.value.frontWorkOrderCode = value.join(',');
|
|
|
+ if (value) {
|
|
|
+ form.value.frontWorkOrderCode = value.join(",");
|
|
|
}
|
|
|
dialog7.visible = false;
|
|
|
};
|
|
@@ -574,15 +597,15 @@ const routeInfo = (value) => {
|
|
|
form.value.processRouteCode = value.processRouteCode;
|
|
|
form.value.processRouteName = value.processRouteName;
|
|
|
form.value.processRouteVersion = value.processRouteVersion;
|
|
|
- option.value.column.forEach(item=>{
|
|
|
- if(item.prop === 'opGroup'){
|
|
|
- item.dicData = value.opGroups;
|
|
|
- item.disabled = false;
|
|
|
+ option.value.column.forEach((item) => {
|
|
|
+ if (item.prop === "opGroup") {
|
|
|
+ item.dicData = value.opGroups;
|
|
|
+ item.disabled = false;
|
|
|
}
|
|
|
- if(item.prop === 'opType'){
|
|
|
+ if (item.prop === "opType") {
|
|
|
item.disabled = false;
|
|
|
}
|
|
|
- })
|
|
|
+ });
|
|
|
dialog1.visible = false;
|
|
|
};
|
|
|
// 传入一个url,后面不带/
|
|
@@ -694,7 +717,7 @@ option.value = Object.assign(option.value, {
|
|
|
label: "dictLabel",
|
|
|
value: "dictValue",
|
|
|
},
|
|
|
- value: '0',
|
|
|
+ value: "0",
|
|
|
},
|
|
|
{
|
|
|
label: "优先级",
|
|
@@ -768,44 +791,43 @@ option.value = Object.assign(option.value, {
|
|
|
value: "dictValue",
|
|
|
},
|
|
|
change: ({ value, column }) => {
|
|
|
- option.value.column.forEach(item=>{
|
|
|
- if(value){
|
|
|
+ option.value.column.forEach((item) => {
|
|
|
+ if (value) {
|
|
|
if (column.boxType === "edit") {
|
|
|
- if (item.prop === 'opGroup'){
|
|
|
+ if (item.prop === "opGroup") {
|
|
|
item.dicData = form.value.opGroups;
|
|
|
}
|
|
|
- if (item.prop === 'opType'){
|
|
|
- item.disabled =false
|
|
|
+ if (item.prop === "opType") {
|
|
|
+ item.disabled = false;
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
- if(item.prop === 'frontWorkOrderCode' || item.prop === 'opGroup'){
|
|
|
- if(value === '2'){
|
|
|
+ if (item.prop === "frontWorkOrderCode" || item.prop === "opGroup") {
|
|
|
+ if (value === "2") {
|
|
|
item.display = false;
|
|
|
}
|
|
|
- if(item.prop === 'opGroup'){
|
|
|
- if(value === '1'){
|
|
|
+ if (item.prop === "opGroup") {
|
|
|
+ if (value === "1") {
|
|
|
item.display = true;
|
|
|
- item.disabled = false
|
|
|
+ item.disabled = false;
|
|
|
}
|
|
|
- if(value === '0'){
|
|
|
+ if (value === "0") {
|
|
|
item.display = true;
|
|
|
- item.disabled = false
|
|
|
+ item.disabled = false;
|
|
|
}
|
|
|
}
|
|
|
- if(item.prop === 'frontWorkOrderCode'){
|
|
|
- if(value === '1'){
|
|
|
+ if (item.prop === "frontWorkOrderCode") {
|
|
|
+ if (value === "1") {
|
|
|
item.display = true;
|
|
|
- item.disabled = false
|
|
|
+ item.disabled = false;
|
|
|
}
|
|
|
- if(value === '0'){
|
|
|
+ if (value === "0") {
|
|
|
item.display = false;
|
|
|
- item.disabled = false
|
|
|
+ item.disabled = false;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- })
|
|
|
+ });
|
|
|
},
|
|
|
rules: [
|
|
|
{
|