Merge branch 'master' of http://dev.ccwin-in.com:6090/Win.Sfs.SmartSettlementSystem.PG

# Conflicts:
#	vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue

vue/src/views/ux/billManage/InvoiceSettledDetailDiff/index.vue

@@ -958,13 +958,13 @@ export default {
     },
     //出库单
     handleCreateBills(row) {
-      if (this.multipleSelection.length == 0) {
-        this.$message({
-          message: "至少选择一行！",
-          type: "warning",
-        });
-        return;
-      }
+      // if (this.multipleSelection.length == 0) {
+      //   this.$message({
+      //     message: "至少选择一行！",
+      //     type: "warning",
+      //   });
+      //   return;
+      // }
       var params = [];
       let myalert = ""; //声明变量，其变量必须在此声明后使用
       if (row) {
@@ -995,6 +995,7 @@ export default {
               this.listBillQuery
             )
             .then((response) => {
+               console.log("检查柱护板-hostCheckQuery"+JSON.stringify(response));
               const index = this.list.indexOf(row);
               this.$notify({
                 title: "成功",
@@ -1002,11 +1003,12 @@ export default {
                 type: "success",
                 duration: 2000,
               });
-              console.log(response);
+             
               this.getList();
             });
         })
         .catch(() => {
+
           this.$message({
             type: "info",
             message: "已取消操作",

vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue

@@ -989,7 +989,7 @@ export default {
     getList() {
       this.listLoading = true;
       //导入界面中超链接过来的参数
-      this.listQuery.name = "大众发票与结算核对汇总表";
+      this.listQuery.name = "发票与结算核对汇总";
       this.listQuery.type = this.JobversionValue;
       this.$axios
         .posts("/api/settleaccount/Job/list", this.listQuery)

vue/src/views/ux/billManage/UnInvoiceSettledDetailDiff/index.vue

@@ -1177,7 +1177,7 @@ export default {
     getList() {
       this.listLoading = true;
       //导入界面中超链接过来的参数
-      this.listQuery.name = "大众准时化结算数量差异比对表";
+      this.listQuery.name = "准时化量差输出";
       this.listQuery.type = this.JobversionValue;
       this.$axios
         .posts("/api/settleaccount/Job/list", this.listQuery)

vue/src/views/ux/billManage/UnSettleDiffExport/index.vue

@@ -1121,7 +1121,7 @@ export default {
     getList() {
       this.listLoading = true;
       //导入界面中超链接过来的参数
-      this.listQuery.name = "大众准时化未结差异比对表";
+      this.listQuery.name = "准时化未结差异比对输出";
       this.listQuery.type = this.JobversionValue;
       this.$axios
         .posts("/api/settleaccount/Job/list", this.listQuery)

vue/src/views/ux/billManage/kanBanWithCode/index.vue

@@ -737,7 +737,7 @@ export default {
       tempsTabs.push({
         label: "单据流水号",
         prop: "taskId",
-        width: 85,
+        width: 120,
       });
       tempsTabs.push({
         label: "模块名称",
@@ -766,8 +766,8 @@ export default {
       // });
       tempsTabs.push({
         label: "状态",
-        prop: "FileName",
-        width: 100,
+        prop: "fileName",
+        width: 150,
       });
       return tempsTabs;
     },
@@ -1209,7 +1209,7 @@ export default {
     getList() {
       this.listLoading = true;
       //导入界面中超链接过来的参数
-      this.listQuery.name = "大众看板结算与交货核对明细表";
+      this.listQuery.name = "看板结算数量差异输出";
       this.$axios
         .posts("/api/settleaccount/Job/list", this.listQuery)
         .then((response) => {

vue/src/views/ux/billManage/sparePart/index.vue

@@ -719,7 +719,7 @@ export default {
       tempsTabs.push({
         label: "版本号",
         prop: "type",
-        width: 85,
+        width: 120,
       });
       tempsTabs.push({
         label: "单据流水号",
@@ -753,8 +753,8 @@ export default {
       // });
       tempsTabs.push({
         label: "状态",
-        prop: "FileName",
-        width: 100,
+        prop: "fileName",
+        width: 150,
       });
       return tempsTabs;
     },
@@ -841,7 +841,7 @@ export default {
       })
         .then(() => {
           this.$axios
-            .posts("/api/settleaccount/wms/WmsJitOutPut", params)
+            .posts("/api/settleaccounWmsJitOutPutt/wms/", params)
             .then((response) => {
               const index = this.list.indexOf(row);
               this.$notify({
@@ -1210,7 +1210,7 @@ export default {
     getList() {
       this.listLoading = true;
       //导入界面中超链接过来的参数
-      this.listQuery.name = "大众准时化结算门板价格差异比对报表";
+      this.listQuery.name = "备件结算数量差异输出";
       this.$axios
         .posts("/api/settleaccount/Job/list", this.listQuery)
         .then((response) => {

vue/static/config.js

@@ -2,8 +2,8 @@ let configJSON
 if (process.env.NODE_ENV === 'development') {
   configJSON = {
     base: {
-			ip: 'http://192.168.0.63',
-      //ip: 'http://192.168.0.140',
+			//ip: 'http://192.168.0.63',
+      ip: 'http://192.168.0.140',
       //ip: 'http://149.223.116.5',
       auth_port: '8066',
       public_port: '8092',
@@ -37,7 +37,7 @@ if (process.env.NODE_ENV === 'development') {
   configJSON = {
     base: {
       
-      ip: 'http://192.168.0.63',
+      ip: 'http://192.168.0.67',
       //ip: 'http://192.168.0.140',
       //ip: 'http://149.223.116.5',
       //ip: 'http://114.116.225.148',