Merge remote-tracking branch 'origin/develop' into develop

陈翱
2 parents 679c1926 50afade4
Showing 7 changed files with 10 additions and 10 deletions
ant-design-vue-jeecg/src/views/system/flow/FlowProcess.vue
ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue
ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue
ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue
ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue
@@ -85,7 +85,7 @@ export default {
     close() {
       this.$emit('close');
       this.visible = false;
-      this.$refs.form.clearValidate();
+      // this.$refs.form.clearValidate();
     },
     edit(record,type) {
       this.visible = true;
@@ -185,7 +185,7 @@
             <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
             <a-menu slot="overlay">
                <a-menu-item >
-                  <a v-if="record.firstStatus > 0 && flowOff=='1' " @click="openProcess(record)"><a-button type="primary">审核进度</a-button><a-divider type="vertical"/></a>
+                  <a v-if="record.firstStatus > 0 && flowOff=='1'" @click="openProcess(record)" type="primary">审核进度</a>
                </a-menu-item>
               <a-menu-item v-has="'receiptHeader:edit'">
                   <a @click="handleEdit(record)">编辑</a>
@@ -200,7 +200,7 @@
             <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
             <a-menu slot="overlay">
                 <a-menu-item >
-                  <a v-if="record.firstStatus > 0 &&flowOff=='1' " @click="openProcess(record)"><a-button type="primary">审核进度</a-button><a-divider type="vertical"/></a>
+                  <a v-if="record.firstStatus > 0 && flowOff=='1'" @click="openProcess(record)" type="primary">审核进度</a>
                </a-menu-item>
                <a-menu-item v-has="'shipmentHeader:edit'">
                   <a @click="handleEdit(record)">编辑</a>
@@ -261,8 +261,8 @@ export default {
       companyList: [],
       shipmentTypeList: [],
       customerList: [],
-      username:'',
-      flowStatus:'',
+      username: '',
+      flowStatus: '',
       flowOff:'',
       // 表头
       columns: [
@@ -438,7 +438,7 @@ export default {
       this.selectedMainId = selectedRowKeys[0].toString();
       this.selectedRowKeys = selectedRowKeys;
       this.selectionRows = selectionRows;
-      this.flowStatus=selectionRows[0].firstStatus;
+      this.flowStatus = selectionRows[0].firstStatus.toString();
     },
     hanleBack(record) {
       backErpShipment(record).then((res) => {
@@ -289,7 +289,7 @@ export default {
           dataIndex: 'updateTime'
         },
         {
-          title: '执行时间',
+          title: '下发时间',
           align: "center",
           dataIndex: 'executeTime'
         },
@@ -289,7 +289,7 @@ export default {
           dataIndex: 'updateTime'
         },
         {
-          title: '执行时间',
+          title: '下发时间',
           align: "center",
           dataIndex: 'executeTime'
         },
@@ -285,7 +285,7 @@ export default {
           dataIndex: 'updateTime'
         },
         {
-          title: '执行时间',
+          title: '下发时间',
           align: "center",
           dataIndex: 'executeTime'
         },
@@ -292,7 +292,7 @@ export default {
           dataIndex: 'updateTime'
         },
         {
-          title: '执行时间',
+          title: '下发时间',
           align: "center",
           dataIndex: 'executeTime'
         },