qukaidi 3 vuotta sitten
vanhempi
commit
7eb40d3ab1

+ 1 - 1
src/views/statisticAnalysis/salesReconciliationDetails/index.vue

@@ -278,7 +278,7 @@ export default {
         .then(() => {
           window.open(
             `/api/blade-purchase-sales/exportOrder/orderDetailedExport?${this.website.tokenHeader
-            }=${getToken()}&corpId=${this.search.corpId}&chargeMember=${this.search.chargeMember}&cname=${this.search.cname}&sysNo=${this.search.sysNo
+            }=${getToken()}&id=${this.$route.query.id}&corpId=${this.search.corpId}&chargeMember=${this.search.chargeMember}&cname=${this.search.cname}&sysNo=${this.search.sysNo
             }&beginCreateTime=${this.search.beginCreateTime}&endCreateTime =${this.search.endCreateTime
             }`
           );

+ 11 - 10
src/views/statisticAnalysis/taskStatistics/index.vue

@@ -98,16 +98,12 @@ export default {
             search: true,
             type: "select",
             overHidden: true,
-            dicData: [{
-              label: '暂存',
-              value: 10,
-            }, {
-              label: '进行中',
-              value: 20,
-            }, {
-              label: '完成',
-              value: 30,
-            }]
+            dataType:'number',
+            dicData: [],
+            props: {
+              label: "dictValue",
+              value: "dictKey"
+            }
           }
         ]
       }
@@ -115,6 +111,11 @@ export default {
   },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(183), this.optionBack);
+    this.getWorkDicts("task_status").then(res => {
+      this.findObject(this.option.column, "taskStatus").dicData =
+        res.data.data;
+    });
+
   },
   methods: {
     cellStyle() {