|
|
@@ -14,19 +14,19 @@
|
|
|
@click="dialogApplication(1)"
|
|
|
style="width: 80px;margin-right: 20px;margin-bottom: 20px;"
|
|
|
v-if="(wo.provinceCity == 1 && wo.nextStep != 7 && wo.nextStep != 11) || (wo.provinceCity == 2 && wo.nextStep != 11)"
|
|
|
- >审批</el-button
|
|
|
+ >审批</el-button
|
|
|
>
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
@click="dialogApplication(2)"
|
|
|
style="margin-right: 20px;margin-bottom: 20px;"
|
|
|
- >审批轨迹</el-button
|
|
|
+ >审批轨迹</el-button
|
|
|
>
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
@click="dialogApplication(3)"
|
|
|
style="margin-right: 20px;margin-bottom: 20px;"
|
|
|
- >导出</el-button
|
|
|
+ >导出</el-button
|
|
|
>
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
@@ -36,7 +36,7 @@
|
|
|
(step.serialNum == 3 && step.provinceCity == 1) ||
|
|
|
(step.serialNum == 6 && step.provinceCity == 2)
|
|
|
"
|
|
|
- >供应商</el-button
|
|
|
+ >供应商</el-button
|
|
|
>
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
@@ -46,18 +46,14 @@
|
|
|
(step.serialNum == 7 && step.provinceCity == 1) ||
|
|
|
(step.serialNum == 10 && step.provinceCity == 2)
|
|
|
"
|
|
|
- >任务分发</el-button
|
|
|
+ >任务分发</el-button
|
|
|
>
|
|
|
-<<<<<<< HEAD
|
|
|
<a
|
|
|
style="margin-right:50px; color:#169BD5; cursor:pointer"
|
|
|
@click="attStatus = true"
|
|
|
v-if="wo.fileUrl != null"
|
|
|
- >下载附件</a
|
|
|
+ >下载附件</a
|
|
|
>
|
|
|
-=======
|
|
|
- <a style="margin-right:50px; color:#169BD5; cursor:pointer" @click="attStatus = true;">下载附件</a>
|
|
|
->>>>>>> 3467b0ae790b859d7d683f21ae7570080f5a5210
|
|
|
|
|
|
<h3>预计总金额:{{ amountsum }}</h3>
|
|
|
<h3>总数: {{ countsum }}</h3>
|
|
|
@@ -120,8 +116,8 @@
|
|
|
<div>
|
|
|
{{
|
|
|
scope.row.quantity *
|
|
|
- scope.row.price *
|
|
|
- scope.row.coefficient
|
|
|
+ scope.row.price *
|
|
|
+ scope.row.coefficient
|
|
|
}}
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -184,7 +180,7 @@
|
|
|
<div slot="footer" class="dialog-footer myfooter">
|
|
|
<el-button @click="closedia">取 消</el-button>
|
|
|
<el-button type="primary" @click="dialogCli(1)"
|
|
|
- >确 定</el-button
|
|
|
+ >确 定</el-button
|
|
|
>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -273,7 +269,7 @@
|
|
|
|
|
|
<div class="t-footer">
|
|
|
<el-button type="primary" @click="dialogCli(4)"
|
|
|
- >确 定</el-button
|
|
|
+ >确 定</el-button
|
|
|
>
|
|
|
<el-button @click="closedia">取 消</el-button>
|
|
|
</div>
|
|
|
@@ -303,7 +299,6 @@
|
|
|
v-model="infolist.distributionChoose"
|
|
|
placeholder="任务分发"
|
|
|
>
|
|
|
-<<<<<<< HEAD
|
|
|
<el-option
|
|
|
v-for="(items,
|
|
|
index) in distributionRegionOpt"
|
|
|
@@ -340,18 +335,10 @@
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
</el-form>
|
|
|
-=======
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
-
|
|
|
- </div>
|
|
|
- </el-form>
|
|
|
->>>>>>> 3467b0ae790b859d7d683f21ae7570080f5a5210
|
|
|
|
|
|
<div class="t-footer">
|
|
|
<el-button type="primary" @click="dialogCli(5)"
|
|
|
- >确 定</el-button
|
|
|
+ >确 定</el-button
|
|
|
>
|
|
|
<el-button @click="closedia">取 消</el-button>
|
|
|
</div>
|
|
|
@@ -397,10 +384,10 @@
|
|
|
|
|
|
<div class="t-footer">
|
|
|
<el-button type="primary" @click="dialogCli(6)"
|
|
|
- >确 定</el-button
|
|
|
+ >确 定</el-button
|
|
|
>
|
|
|
<el-button @click="fixedDialogStatus = false"
|
|
|
- >取 消</el-button
|
|
|
+ >取 消</el-button
|
|
|
>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -444,16 +431,12 @@
|
|
|
style="text-align: right;padding-bottom: 20px;"
|
|
|
>
|
|
|
<el-button type="primary" @click="dialogCli(7)"
|
|
|
- >确 定</el-button
|
|
|
+ >确 定</el-button
|
|
|
>
|
|
|
<el-button @click="closedia">取 消</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
-<<<<<<< HEAD
|
|
|
-=======
|
|
|
-
|
|
|
->>>>>>> 3467b0ae790b859d7d683f21ae7570080f5a5210
|
|
|
<el-dialog
|
|
|
title="附件"
|
|
|
:visible.sync="attStatus"
|
|
|
@@ -466,7 +449,6 @@
|
|
|
<div slot="title">
|
|
|
<div>
|
|
|
附件
|
|
|
-<<<<<<< HEAD
|
|
|
<i
|
|
|
class="el-icon-full-screen"
|
|
|
style="float: right; margin-right: 30px"
|
|
|
@@ -476,23 +458,11 @@
|
|
|
}
|
|
|
"
|
|
|
></i>
|
|
|
-=======
|
|
|
- <i class="el-icon-full-screen" style="float: right; margin-right: 30px" @click="
|
|
|
- () => {
|
|
|
- fullscreen = !fullscreen;
|
|
|
- }"></i>
|
|
|
->>>>>>> 3467b0ae790b859d7d683f21ae7570080f5a5210
|
|
|
</div>
|
|
|
</div>
|
|
|
<div v-loading="loadinged">
|
|
|
<div style="margin: 10px 0">
|
|
|
-<<<<<<< HEAD
|
|
|
<uploadDown :datalist="datalist"></uploadDown>
|
|
|
-=======
|
|
|
- <uploadDown
|
|
|
- :datalist="datalist"
|
|
|
- ></uploadDown>
|
|
|
->>>>>>> 3467b0ae790b859d7d683f21ae7570080f5a5210
|
|
|
</div>
|
|
|
<div class="dialog-footer myfooter">
|
|
|
<el-button @click="attStatus = false">取 消</el-button>
|
|
|
@@ -511,32 +481,21 @@
|
|
|
import mySearch from "../../../components/search.vue";
|
|
|
import myMessage from "../../../components/myMessage.vue";
|
|
|
import toolList from "../../../components/toolList";
|
|
|
-<<<<<<< HEAD
|
|
|
import myUpload from "../../../components/upload";
|
|
|
import deptTreeOnly from "../../../components/deptTreeOnly.vue";
|
|
|
import { MessageBox } from "element-ui";
|
|
|
import { Loading } from "element-ui";
|
|
|
-=======
|
|
|
-// import myUpload from "../../../components/upload";
|
|
|
-// import deptTreeOnly from "../../../components/deptTreeOnly.vue";
|
|
|
-// import { MessageBox } from "element-ui";
|
|
|
->>>>>>> 3467b0ae790b859d7d683f21ae7570080f5a5210
|
|
|
import uploadDown from "../../../components/uploadDown";
|
|
|
|
|
|
export default {
|
|
|
components: {
|
|
|
mySearch,
|
|
|
myMessage,
|
|
|
- // deptTreeOnly,
|
|
|
- // MessageBox,
|
|
|
+ deptTreeOnly,
|
|
|
+ MessageBox,
|
|
|
toolList,
|
|
|
-<<<<<<< HEAD
|
|
|
myUpload,
|
|
|
uploadDown
|
|
|
-=======
|
|
|
- // myUpload,
|
|
|
- uploadDown,
|
|
|
->>>>>>> 3467b0ae790b859d7d683f21ae7570080f5a5210
|
|
|
},
|
|
|
data() {
|
|
|
const regionName = (rule, value, callback) => {
|
|
|
@@ -647,7 +606,6 @@ export default {
|
|
|
userListOpt: [],
|
|
|
cMkAdvMetirialWoInfoSubmit: {},
|
|
|
stsArr: ["待审批", "审批通过", "打回"],
|
|
|
-<<<<<<< HEAD
|
|
|
// 分发
|
|
|
distributionDialogStatus: false,
|
|
|
distributionRegionOpt: [],
|
|
|
@@ -661,14 +619,6 @@ export default {
|
|
|
step: {},
|
|
|
passedList:[],
|
|
|
multipleSelection:[]
|
|
|
-=======
|
|
|
- wo:{},
|
|
|
- datalist: {
|
|
|
- url: "/market/cadvBusiMetirialWo/checkExport",
|
|
|
- type: 2,
|
|
|
- },
|
|
|
- attStatus: false,
|
|
|
->>>>>>> 3467b0ae790b859d7d683f21ae7570080f5a5210
|
|
|
};
|
|
|
},
|
|
|
computed: {
|
|
|
@@ -713,10 +663,7 @@ export default {
|
|
|
this.approvalinfolist = {};
|
|
|
this.supplierDialogStatus = false;
|
|
|
this.approvalStepDialogStatus = false;
|
|
|
-<<<<<<< HEAD
|
|
|
this.distributionDialogStatus = false;
|
|
|
-=======
|
|
|
->>>>>>> 3467b0ae790b859d7d683f21ae7570080f5a5210
|
|
|
this.attStatus = false;
|
|
|
},
|
|
|
//搜索数据
|
|
|
@@ -743,7 +690,6 @@ export default {
|
|
|
},
|
|
|
data: v
|
|
|
}).then(res => {
|
|
|
-<<<<<<< HEAD
|
|
|
// console.log(res.data.body);
|
|
|
// this.tableData = res.data.body.pageList.data;
|
|
|
res.data.body.pageList.data.forEach(item=>{
|
|
|
@@ -767,19 +713,11 @@ export default {
|
|
|
});
|
|
|
let map = new Map();
|
|
|
this.searchList[2].options = temp.filter((temp) => !map.has(temp.metirialType) && map.set(temp.metirialType, 1));
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-=======
|
|
|
- // console.log(res.data);
|
|
|
- this.tableData = res.data.body.pageList.data;
|
|
|
- this.userListOpt = res.data.body.queryCurrentAndNext.next.userList;
|
|
|
- this.total = res.data.totalRecord;
|
|
|
- this.wo = res.data.body.wo;
|
|
|
- this.datalist.attList = JSON.parse(this.wo.fileUrl);
|
|
|
->>>>>>> 3467b0ae790b859d7d683f21ae7570080f5a5210
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
this.loading = false;
|
|
|
-
|
|
|
+
|
|
|
});
|
|
|
},
|
|
|
// 分页
|
|
|
@@ -792,13 +730,13 @@ export default {
|
|
|
dialogApplication(v, n) {
|
|
|
var _this = this;
|
|
|
// if (!this.multipleSelection) this.multipleSelection = [];
|
|
|
-
|
|
|
+
|
|
|
if (v === 1) {
|
|
|
if (
|
|
|
this.multipleSelection == undefined ||
|
|
|
this.multipleSelection == ""
|
|
|
) {
|
|
|
-
|
|
|
+
|
|
|
MessageBox.alert("请至少选择一条进行审批", "温馨提示", {
|
|
|
confirmButtonText: "确定"
|
|
|
});
|
|
|
@@ -809,31 +747,31 @@ export default {
|
|
|
this.multipleSelection.forEach(item=>{
|
|
|
// console.log(item);
|
|
|
if(item.supplierName == null || item.supplierName == undefined){
|
|
|
-
|
|
|
+
|
|
|
n =1;
|
|
|
return;
|
|
|
}
|
|
|
})
|
|
|
if(n==1){
|
|
|
MessageBox.alert(
|
|
|
- "请先选择供应商再进行审批",
|
|
|
- "温馨提示",
|
|
|
- {
|
|
|
- confirmButtonText: "确定"
|
|
|
- }
|
|
|
- );
|
|
|
- return;
|
|
|
+ "请先选择供应商再进行审批",
|
|
|
+ "温馨提示",
|
|
|
+ {
|
|
|
+ confirmButtonText: "确定"
|
|
|
+ }
|
|
|
+ );
|
|
|
+ return;
|
|
|
}else{
|
|
|
this.titname = "审批";
|
|
|
this.approvalDialogStatus = true;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
}else{
|
|
|
- this.titname = "审批";
|
|
|
- this.approvalDialogStatus = true;
|
|
|
- }
|
|
|
-
|
|
|
+ this.titname = "审批";
|
|
|
+ this.approvalDialogStatus = true;
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
} else if (v === 2) {
|
|
|
// if (
|
|
|
@@ -848,23 +786,20 @@ export default {
|
|
|
// confirmButtonText: "确定"
|
|
|
// });
|
|
|
// } else {
|
|
|
- this.titname = "审批轨迹";
|
|
|
- this.approvalStepDialogStatus = true;
|
|
|
- this.$http({
|
|
|
- url: "market/advBusiMetirialWoStep/queryList",
|
|
|
- method: "post",
|
|
|
- headers: {
|
|
|
- "Content-Type": "application/json"
|
|
|
- },
|
|
|
- data: { mKAdvBusiMetirialWoStep: this.params.woId }
|
|
|
- }).then(res => {
|
|
|
- console.log(res);
|
|
|
- });
|
|
|
-<<<<<<< HEAD
|
|
|
+ this.titname = "审批轨迹";
|
|
|
+ this.approvalStepDialogStatus = true;
|
|
|
+ this.$http({
|
|
|
+ url: "market/advBusiMetirialWoStep/queryList",
|
|
|
+ method: "post",
|
|
|
+ headers: {
|
|
|
+ "Content-Type": "application/json"
|
|
|
+ },
|
|
|
+ data: { woId: this.params.woId }
|
|
|
+ }).then(res => {
|
|
|
+ // console.log(res);
|
|
|
+ this.rovaList = res.data;
|
|
|
+ });
|
|
|
// }
|
|
|
-=======
|
|
|
- }
|
|
|
->>>>>>> 3467b0ae790b859d7d683f21ae7570080f5a5210
|
|
|
} else if (v === 3) {
|
|
|
this.$http({
|
|
|
url: "/market/cadvBusiMetirialWo/export",
|
|
|
@@ -877,11 +812,7 @@ export default {
|
|
|
}).then(res => {
|
|
|
if (window.navigator && window.navigator.msSaveOrOpenBlob) {
|
|
|
let blob = new Blob([res.data], {
|
|
|
-<<<<<<< HEAD
|
|
|
type: "application/vnd.ms-excel"
|
|
|
-=======
|
|
|
- type: "application/vnd.ms-excel",
|
|
|
->>>>>>> 3467b0ae790b859d7d683f21ae7570080f5a5210
|
|
|
});
|
|
|
window.navigator.msSaveOrOpenBlob(
|
|
|
blob,
|
|
|
@@ -941,7 +872,7 @@ export default {
|
|
|
//添加
|
|
|
dialogCli(v) {
|
|
|
this.dialogStatus = false;
|
|
|
- // 1审批 2审批轨迹 3导出 4供应商 5任务分发 8附件
|
|
|
+ // 1审批 2审批轨迹 3导出 4供应商 5任务分发
|
|
|
if (v === 1) {
|
|
|
this.approvalDialogStatus = false;
|
|
|
// let list = {};
|
|
|
@@ -1046,7 +977,6 @@ export default {
|
|
|
// this.multipleSelection.supplierCode = supplierChoose[0].code;
|
|
|
// console.log(this.multipleSelection);
|
|
|
} else if (v === 5) {
|
|
|
-<<<<<<< HEAD
|
|
|
this.cWoInfoIssued.nextOpNo = this.treeListonly.leaderAuditNo;
|
|
|
this.cWoInfoIssued.nextOpName = this.treeListonly.leaderAuditName;
|
|
|
this.cWoInfoIssued.woId = this.params.woId;
|
|
|
@@ -1058,9 +988,6 @@ export default {
|
|
|
this.cWoInfoIssued
|
|
|
);
|
|
|
} else if (v === 6) {
|
|
|
-=======
|
|
|
- }else if (v === 6) {
|
|
|
->>>>>>> 3467b0ae790b859d7d683f21ae7570080f5a5210
|
|
|
let userListSingle = "";
|
|
|
userListSingle = this.userListOpt.filter(item => {
|
|
|
return item.loginNameStr == this.infolist.loginNameStr;
|
mqd