Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web

src/views/wf/dutywork.vue

@@ -1,4 +1,47 @@
 <template>
+	    <el-header>
+        <div class="left-panel">
+          <el-select
+            v-model="query.workflow"
+            placeholder="审批流"
+            @change="handleQuery"
+            clearable
+            style="margin-left: 2px"
+          >
+            <el-option
+              v-for="item in wfOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+          <el-select
+            v-model="query.script_run_last_result"
+            placeholder="任务执行状态"
+            @change="handleQuery"
+            clearable
+            style="margin-left: 2px"
+          >
+            <el-option
+              v-for="item in rsOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="创建时间始"
+            end-placeholder="创建时间止"
+            style="margin-left: 2px"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            @change="handleQuery"
+            clearable
+          />
+        </div>
+    </el-header>
 	<el-container>
 		<el-main class="nopadding">
 			<scTable
@@ -143,10 +186,34 @@ export default {
 			floeLogs: [],
 			ticketId: "",
 			limitedFlowLogs: false,
+			wfOptions: [],
+			rsOptions: [
+						{ value: true, label: "成功" },
+						{ value: false, label: "失败" },
+					],
+			query: {},
+			timeRange: [],
 		};
 	},
-	mounted() {},
+	mounted() {
+		this.getWfOptions();
+	},
 	methods: {
+		getWfOptions() {
+			this.$API.wf.workflow.list.req({ page: 0 }).then((res) => {
+				this.wfOptions = res;
+			});
+		},
+		handleQuery() {
+				if (this.timeRange) {
+					this.query.start_create = this.timeRange[0];
+					this.query.end_create = this.timeRange[1];
+				} else {
+					this.query.end_create = null;
+					this.query.start_create = null;
+				}
+				this.$refs.table.queryData(this.query);
+		},
 		//处理
 		handleDetail(row) {
 			let cateType = row.workflow_.key;

src/views/wf/ownerwork.vue

@@ -1,5 +1,48 @@
 <template>
   <el-container>
+    <el-header>
+        <div class="left-panel">
+          <el-select
+            v-model="query.workflow"
+            placeholder="审批流"
+            @change="handleQuery"
+            clearable
+            style="margin-left: 2px"
+          >
+            <el-option
+              v-for="item in wfOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+          <el-select
+            v-model="query.script_run_last_result"
+            placeholder="任务执行状态"
+            @change="handleQuery"
+            clearable
+            style="margin-left: 2px"
+          >
+            <el-option
+              v-for="item in rsOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="创建时间始"
+            end-placeholder="创建时间止"
+            style="margin-left: 2px"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            @change="handleQuery"
+            clearable
+          />
+        </div>
+    </el-header>
     <el-main class="nopadding">
       <scTable
         ref="table"
@@ -154,10 +197,34 @@ export default {
       handleTitle: "撤回工单",
       ticketId: null,
       limitedRetreat: false,
+      wfOptions: [],
+      rsOptions: [
+				{ value: true, label: "成功" },
+				{ value: false, label: "失败" },
+			],
+      query: {},
+      timeRange: [],
     };
   },
-  mounted() {},
+  mounted() {
+    this.getWfOptions();
+  },
   methods: {
+    getWfOptions() {
+			this.$API.wf.workflow.list.req({ page: 0 }).then((res) => {
+				this.wfOptions = res;
+			});
+		},
+    handleQuery() {
+			if (this.timeRange) {
+				this.query.start_create = this.timeRange[0];
+				this.query.end_create = this.timeRange[1];
+			} else {
+				this.query.end_create = null;
+				this.query.start_create = null;
+			}
+			this.$refs.table.queryData(this.query);
+		},
     handleShow(row) {
       let cateType = row.workflow_.key;
       let projectId = null;

src/views/wf/worked.vue

@@ -1,5 +1,48 @@
 <template>
 	<el-container>
+		<el-header>
+        <div class="left-panel">
+          <el-select
+            v-model="query.workflow"
+            placeholder="审批流"
+            @change="handleQuery"
+            clearable
+            style="margin-left: 2px"
+          >
+            <el-option
+              v-for="item in wfOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+          <el-select
+            v-model="query.script_run_last_result"
+            placeholder="任务执行状态"
+            @change="handleQuery"
+            clearable
+            style="margin-left: 2px"
+          >
+            <el-option
+              v-for="item in rsOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+          <el-date-picker
+            v-model="timeRange"
+            type="datetimerange"
+            range-separator="至"
+            start-placeholder="创建时间始"
+            end-placeholder="创建时间止"
+            style="margin-left: 2px"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            @change="handleQuery"
+            clearable
+          />
+        </div>
+    </el-header>
 		<el-main class="nopadding">
 			<scTable
 				ref="table"
@@ -116,10 +159,34 @@ export default {
 				1: "个人",
 				2: "多人",
 			},
+			wfOptions: [],
+			rsOptions: [
+						{ value: true, label: "成功" },
+						{ value: false, label: "失败" },
+					],
+			query: {},
+			timeRange: [],
 		};
 	},
-	mounted() {},
+	mounted() {
+		this.getWfOptions();
+	},
 	methods: {
+		getWfOptions() {
+			this.$API.wf.workflow.list.req({ page: 0 }).then((res) => {
+				this.wfOptions = res;
+			});
+		},
+		handleQuery() {
+				if (this.timeRange) {
+					this.query.start_create = this.timeRange[0];
+					this.query.end_create = this.timeRange[1];
+				} else {
+					this.query.end_create = null;
+					this.query.start_create = null;
+				}
+				this.$refs.table.queryData(this.query);
+		},
 		handleShow(row) {
 			let cateType = row.workflow_.key;
 			let projectId = null;

src/views/wf/workflow.vue

@@ -28,18 +28,28 @@
     <el-main class="nopadding">
       <scTable ref="table" :apiObj="apiObj" row-key="id">
         <el-table-column label="#" type="index"></el-table-column>
-        <el-table-column label="ID" prop="id" min-width="150"></el-table-column>
+        <el-table-column label="ID" prop="id" width="160"></el-table-column>
         <el-table-column
           label="工作流名称"
           prop="name"
-          min-width="200"
+          width="220"
         ></el-table-column>
         <el-table-column
           label="标识"
           prop="key"
-          min-width="100"
+          width="160"
         ></el-table-column>
         <el-table-column
+          label="流水前缀"
+          prop="sn_prefix"
+          width="80">
+        </el-table-column>
+        <el-table-column
+          label="页面路径"
+          prop="view_path"
+          min-width="150">
+        </el-table-column>
+        <!-- <el-table-column
           label="工单查看权限校验"
           prop="view_permission_check"
           min-width="120"
@@ -48,7 +58,7 @@
             <span v-if="scope.row.view_permission_check">是</span>
             <span v-else>否</span>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column
           label="工作流描述"
           prop="description"
@@ -57,7 +67,7 @@
         <el-table-column
           label="创建时间"
           prop="create_time"
-          min-width="150"
+          width="140"
         ></el-table-column>
         <el-table-column label="操作" fixed="right" align="center" width="250">
           <template #default="scope">
@@ -149,6 +159,9 @@
           :props="{ key: 'id', label: 'field_name' }"
         />
       </el-form-item>
+      <el-form-item label="页面地址">
+        <el-input v-model="addForm.view_path" clearable></el-input>
+      </el-form-item>
       <el-form-item label="标题模板">
         <el-input v-model="addForm.title_template" clearable></el-input>
       </el-form-item>