-
+
-
-
+
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -185,7 +190,7 @@
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
-
+
@@ -198,8 +203,10 @@
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
-
- {{ item.lableRuleObj[scope.row[item.columnName]] }}
+
+ {{
+ item.lableRuleObj[scope.row[item.columnName]]
+ }}
-
-
- {{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}
+
+
+ {{
+ item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
+ }}
@@ -248,40 +258,42 @@
:key="item.columnName"
>
- {{ scope.row[item.columnName] }}
+ {{
+ scope.row[item.columnName]
+ }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{
let dQuery = {
- id: rowId,
+ id: row.id,
};
deleteCompanyProductRelevance(dQuery)
.then((response) => {
@@ -684,7 +696,7 @@ export default {
selectData.forEach((row) => {
postQuery.ids.push(row.rlId);
});
- if(postQuery.ids.length<=0){
+ if (postQuery.ids.length <= 0) {
this.$message.error("请先选择产品！");
return
}
@@ -727,7 +739,7 @@ export default {
this.sysList = [];
});
},
- getSysFilter(_this,query) {
+ getSysFilter(_this, query) {
sysFilterOptimize()
.then((response) => {
_this.loading = false;
@@ -832,7 +844,7 @@ export default {
});
},
- findMethod(_this,query) {
+ findMethod(_this, query) {
let cQuery = {
key: query,
corpType: 2,
@@ -849,11 +861,11 @@ export default {
_this.options.findMethod = [];
});
},
- executeFuc(row,type,clickFuc,value){
- return executeFuc(this,row,type,clickFuc,value);
+ executeFuc(row, type, clickFuc, value) {
+ return executeFuc(this, row, type, clickFuc, value);
},
- executeEval(row,expression,defaultRet){
- if(expression){
+ executeEval(row, expression, defaultRet) {
+ if (expression) {
return eval(expression);
}
return defaultRet;
@@ -872,7 +884,7 @@ export default {
}
,
created() {
- getHead("udiInfoManageSp","1").then((re) => {
+ getHead("udiInfoManageSp", "1").then((re) => {
// 处理返回的数据
this.tableObj = re.data;
this.tableHeader = re.data.tableList;
@@ -881,8 +893,8 @@ export default {
this.getList()
});
this.selectSysParam();
- this.getSysFilter(this,"");
- this.findMethod(this,"");
+ this.getSysFilter(this, "");
+ this.findMethod(this, "");
}
,
}
diff --git a/src/views/inout/DialogSelectInvProduct.vue b/src/views/inout/DialogSelectInvProduct.vue
index 6728839c..1c15ad99 100644
--- a/src/views/inout/DialogSelectInvProduct.vue
+++ b/src/views/inout/DialogSelectInvProduct.vue
@@ -68,7 +68,7 @@
-
+
@@ -190,7 +190,6 @@ export default {
supId: null,
page: 1,
limit: 10,
- invCode: this.invQueryData.targetInvCode,
};
this.getList();
},
@@ -213,9 +212,11 @@ export default {
getList() {
this.loading = true;
- this.filterQuery.invCode = this.invQueryData.invCode;
+ if (this.type == 1) {
+ this.filterQuery.invCode = this.invQueryData.targetInvCode;
+ } else
+ this.filterQuery.invCode = this.invQueryData.invCode;
this.filterQuery.filterNoInv = 1;
-
//寄售
if (this.invQueryData.advanceType == 3) {
getInvPreProductStock(this.filterQuery)
@@ -388,7 +389,6 @@ export default {
,
created() {
this.findBasicProductSet();
- this.filterQuery.invCode = this.invQueryData.targetInvCode;
// 加载表格数据
this.getList();
}
diff --git a/src/views/thirdSys/api/DialogEditBusDown.vue b/src/views/thirdSys/api/DialogEditBusDown.vue
index 4b0d441c..828f6008 100644
--- a/src/views/thirdSys/api/DialogEditBusDown.vue
+++ b/src/views/thirdSys/api/DialogEditBusDown.vue
@@ -4,7 +4,7 @@
-
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
@@ -54,6 +82,7 @@
+
@@ -71,15 +100,16 @@
@@ -90,6 +120,7 @@ import {getOriginBusType} from "@/api/basic/busOriginType";
import {filterForThirdSys} from "@/api/basic/busType";
import {isBlank} from "@/utils/strUtil";
import {saveBusTypes} from "@/api/thrsys/basicThirdSys";
+import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
export default {
name: "DialogEditBusDown",
@@ -102,11 +133,18 @@ export default {
type: Function,
required: true,
},
+ type: {
+ type: Object,
+ required: true,
+ }
},
data() {
return {
bussinessTypeList: [],
thridBusFilter: [],
+ loading: false,
+ fromOptions: [],
+ curAction: {},
}
},
@@ -134,10 +172,10 @@ export default {
this.$message.error("单据类型不能为空！")
return;
}
- if (isBlank(this.thirdBuyForm.thirdBuyCode)) {
- this.$message.error("第三方单据类型不能为空！");
- return;
- }
+ // if (isBlank(this.thirdBuyForm.thirdBuyCode)) {
+ // this.$message.error("第三方单据类型不能为空！");
+ // return;
+ // }
if (!isBlank(this.thirdBuyForm.remark)) {
if (this.thirdBuyForm.remark.length > 200) {
@@ -148,8 +186,6 @@ export default {
if (this.getOrdersEditBtnVisible) {
this.editGeOrderParamVisible = false;
- } else {
- this.bussinessTypeFormVisible = false;
}
//匹配编码
@@ -169,12 +205,45 @@ export default {
}).catch((error) => {
this.$message.error(error.message);
})
+
},
+
+
+ actionChange(item) {
+ for (let i = 0; i < this.bussinessTypeList.length; i++) {
+ if (this.bussinessTypeList[i].name == item) {
+ this.curAction = this.bussinessTypeList[i]
+ }
+ }
+ },
+
+
+ //获取往来单位候选列表
+ findMethod(query) {
+ this.fromOptions = []
+ let cQuery = {
+ key: query,
+ corpType: this.curAction.corpType,
+ outType: null,
+ page: 1,
+ limit: 20
+ }
+ getBasicUnitMaintains(cQuery)
+ .then((response) => {
+ this.loading = false
+ this.fromOptions = response.data.list || []
+ })
+ .catch(() => {
+ this.loading = false
+ })
+ }
+
},
created() {
this.getBussinessType();
this.remoteMethod();
+ this.findMethod(this.thirdBuyForm.name);
}
}
diff --git a/src/views/thirdSys/api/index.vue b/src/views/thirdSys/api/index.vue
index 5fd31a52..9faddcb1 100644
--- a/src/views/thirdSys/api/index.vue
+++ b/src/views/thirdSys/api/index.vue
@@ -154,7 +154,6 @@
-
@@ -321,7 +321,9 @@ export default {
thridBusFilter: [],
thirdSysDetailList: [],
selectInterfaceList: [],
- currentRow: null
+ currentRow: null,
+ orderType: 1,//设置下载单据类型,
+ typeId: null,
};
},
@@ -374,6 +376,25 @@ export default {
this.addBussinessTypeBtnVisible = true;
this.getOrdersEditBtnVisible = true;
this.submitOrderVisible = false;
+ this.orderType = 1;
+ } else if (row.key === "invSfOrderUrl") {
+ this.addBussinessTypeBtnVisible = true;
+ this.getOrdersEditBtnVisible = true;
+ this.submitOrderVisible = false;
+ this.orderType = 2;
+ this.typeId = 3;
+ } else if (row.key === "invPhOrderUrl") {
+ this.addBussinessTypeBtnVisible = true;
+ this.getOrdersEditBtnVisible = true;
+ this.submitOrderVisible = false;
+ this.orderType = 2;
+ this.typeId = 4;
+ } else if (row.key === "invGhOrderUrl") {
+ this.addBussinessTypeBtnVisible = true;
+ this.getOrdersEditBtnVisible = true;
+ this.submitOrderVisible = false;
+ this.orderType = 2;
+ this.typeId = 5;
} else {
this.addBussinessTypeBtnVisible = false;
}
@@ -425,6 +446,12 @@ export default {
query.type = 1;
} else if (row.key == "orderSubmitUrl") {
query.type = 2;
+ } else if (row.key == "invSfOrderUrl") {
+ query.type = 3;
+ } else if (row.key == "invPhOrderUrl") {
+ query.type = 4;
+ } else if (row.key == "invGhOrderUrl") {
+ query.type = 5;
} else {
this.busTypeList = [];
return;
@@ -547,7 +574,7 @@ export default {
id: null,
code: null,
name: null,
- type: 1,
+ type: this.typeId,
url: null,
thirdSys: this.thirdSysFk,
remark: null
diff --git a/src/views/thirdSys/invOrder/thrInvOrder.vue b/src/views/thirdSys/invOrder/thrInvOrder.vue
index f94467ca..d4cf088c 100644
--- a/src/views/thirdSys/invOrder/thrInvOrder.vue
+++ b/src/views/thirdSys/invOrder/thrInvOrder.vue
@@ -66,7 +66,7 @@
显示/隐藏搜索栏
重置
查询
- 下载
+ 下载
@@ -76,8 +76,8 @@
-
-
+
+
-
+
- 删除
-
+
生成单据
@@ -118,6 +116,9 @@
@click.native.stop="refreshBill(scope.row)"
>更新
+ 删除
+
@@ -153,14 +154,15 @@
-
+
+ 处理
+
删除
- 处理
-
+
@@ -517,11 +519,11 @@ export default {
this.getList();
}
},
- jump() {
+ jump(row) {
if (this.jumpSkProject == 1) {
- this.$router.push('/thirdSys/destiny/skProject')
+ this.$router.push('/thirdSys/destiny/skProject?cpmctymc=' + row.cpmctymc)
} else {
- this.$router.push('/basic/product/maintain?vueRouteSource=1')
+ this.$router.push('/basic/product/maintain?vueRouteSource=1&cpmctymc=' + row.cpmctymc)
}
},
changRed({row}) {
@@ -535,6 +537,11 @@ export default {
* 手动下载第三方收费出入库明细
*/
dlThrInvOrder() {
+
+ if (this.actDateRange != null) {
+ this.filterQuery.startDate = this.actDateRange[0];
+ this.filterQuery.endDate = this.actDateRange[1];
+ }
this.$confirm("是否确定下载日期范围为：[" + this.filterQuery.startDate + "---" + this.filterQuery.endDate + "]的出入库明细？", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
diff --git a/src/views/thirdSys/invOrder/thrInvOrderGenerate.vue b/src/views/thirdSys/invOrder/thrInvOrderGenerate.vue
index 56aa3c5f..72039763 100644
--- a/src/views/thirdSys/invOrder/thrInvOrderGenerate.vue
+++ b/src/views/thirdSys/invOrder/thrInvOrderGenerate.vue
@@ -59,32 +59,34 @@