fix:单次任务查询项添加

src/api/business/production/onceWorkOrder.js

@@ -90,4 +90,12 @@ export function continueHandleApi(data){
     method: 'post',
     data: data
   })
+}
+export function entrustSourceApi(query) {
+  request.defaults.baseURL = '/ezhizao-yzbh-production'
+  return request({
+    url: '/business/onceWorkOrder/entrustSource',
+    method: 'get',
+    params: query
+  })
 }

src/views/business/production/onceWork/index.vue

@@ -35,11 +35,31 @@
         <el-input v-model="queryParams.taskTypeName" style="width: 150px" placeholder="请输入项目" clearable
           @keyup.enter="handleQuery" />
       </el-form-item>
-      <el-form-item label="结果情况：" prop="resultStatus">
-        <el-select v-model="queryParams.resultStatus" placeholder="请选择结果情况" clearable @change="handleQuery">
+      <el-form-item label="交接单状态：" prop="resultStatus">
+        <el-select v-model="queryParams.resultStatus" placeholder="请选择交接单状态" clearable @change="handleQuery">
           <el-option v-for="item in resultStatus" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
+      <el-form-item label="来源：" prop="formTenantId">
+        <el-select v-model="queryParams.formTenantId" placeholder="请选择来源" clearable @change="handleQuery">
+          <el-option v-for="(value,key) in entrustSource" :key="key" :label="value == null?'数据缺失':value" :value="key" />
+        </el-select>
+      </el-form-item>
+      <el-form-item  label="委托时间：" prop="entrustTimeFilter">
+        <el-date-picker v-model="queryParams.entrustTimeFilter" size="small" type="daterange" clearable
+                        format="YYYY - MM - DD " value-format="YYYY-MM-DD" range-separator="至" start-placeholder="委托时间"
+                        end-placeholder="委托时间" style="width: 100%;"></el-date-picker>
+      </el-form-item>
+      <el-form-item  label="领取时间：" prop="handlerTimeFilter">
+        <el-date-picker v-model="queryParams.handlerTimeFilter" size="small" type="daterange" clearable
+                        format="YYYY - MM - DD " value-format="YYYY-MM-DD" range-separator="至" start-placeholder="领取时间"
+                        end-placeholder="领取时间" style="width: 100%;"></el-date-picker>
+      </el-form-item>
+      <el-form-item  label="完成时间：" prop="finishTimeFilter">
+        <el-date-picker v-model="queryParams.finishTimeFilter" size="small" type="daterange" clearable
+                        format="YYYY - MM - DD " value-format="YYYY-MM-DD" range-separator="至" start-placeholder="完成时间"
+                        end-placeholder="完成时间" style="width: 100%;"></el-date-picker>
+      </el-form-item>
       <!-- <el-form-item v-if="tenant.versionId !== '4'" label="是否自己负责:" v-hasPermi="['business:once:person']">
         <el-switch v-model="oneself" @change="handleOneself" />
       </el-form-item> -->
@@ -61,7 +81,7 @@
       @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="工单号" align="center" prop="workOrderNo" width="200" /> -->
-      <el-table-column label="客户名称" align="center" min-width="250" prop="companyName" />
+      <el-table-column fixed  label="客户名称" align="center" min-width="250" prop="companyName" />
       <!-- <el-table-column
         label="税号"
         align="center"
@@ -82,95 +102,24 @@
           }}
         </template>
       </el-table-column>
-      <el-table-column label="说明" align="center" prop="explain" min-width="180" />
-      <el-table-column label="合同" align="center" min-width="50" >
-        <template #default="scope">
-          <el-button link type="primary" size="small" @click="viewContract(scope.row)">查看</el-button>
-        </template>
-      </el-table-column>
-      <el-table-column label="委托时间" align="center" min-width="140">
-        <template #default="scope">
-          {{
-          scope.row.record != undefined
-          ? scope.row.record.entrustTime
-          : ""
-          }}
-        </template>
-      </el-table-column>
-      <el-table-column label="执行人" align="center" width="100" :show-overflow-tooltip="true">
-        <template #default="scope">
-          {{
-          scope.row.entrust != null
-          ? scope.row.entrust.toAccountName
-          : scope.row.serviceName
-          }}
-        </template>
-      </el-table-column>
       <el-table-column label="领取人" align="center" min-width="100" :show-overflow-tooltip="true">
         <template #default="scope">
           {{
-          scope.row.record != undefined
-          ? scope.row.record.handlerName
-          : ""
+            scope.row.record != undefined
+                ? scope.row.record.handlerName
+                : ""
           }}
         </template>
       </el-table-column>
       <el-table-column label="领取时间" align="center" min-width="140">
         <template #default="scope">
           {{
-          scope.row.record != undefined
-          ? scope.row.record.handlerTime
-          : ""
+            scope.row.record != undefined
+                ? scope.row.record.handlerTime
+                : ""
           }}
         </template>
       </el-table-column>
-      <el-table-column label="已收款" prop="arriveAmount" align="center" min-width="60">
-        <template #default="scope">
-          {{rowNum(scope.row.arriveAmount)}}
-        </template>
-      </el-table-column>
-
-      <el-table-column label="任务进度" align="center" prop="onWorkDetail" min-width="250">
-        <template #default="scope">
-          <el-button link type="primary" size="small" @click="viewOnWorkDetail(scope.row,true)"
-                     >{{textFormat(scope.row.onWorkDetail)}}</el-button>
-          <el-button v-if="scope.row.record != null&&scope.row.record.status !== 3&&scope.row.record.status !== 4&&scope.row.record.handlerId  ===  useUserStore().user.userId" style="margin: 0" link type="primary" icon="Edit"
-                     @click="viewOnWorkDetail(scope.row,false)" />
-        </template>
-      </el-table-column>
-
-      <el-table-column label="完成人" align="center" min-width="100">
-        <template #default="scope">
-          {{
-          scope.row.record != undefined
-          ? scope.row.record.recorderName
-          : ""
-          }}
-        </template>
-      </el-table-column>
-      <el-table-column label="完成时间" align="center" min-width="140">
-        <template #default="scope">
-          {{
-          scope.row.record != undefined
-          ? scope.row.record.finishTime
-          : ""
-          }}
-        </template>
-      </el-table-column>
-      <el-table-column label="结果情况" align="center" min-width="140">
-        <template #default="scope">
-          <div v-if="scope.row.record == null || scope.row.record.status===0">
-            {{}}
-          </div>
-          <div v-else>
-            <el-button link type="primary" size="small" @click="viewResult(scope.row,true)"
-            >{{resultLable(scope.row)}}</el-button>
-            <el-button v-if="scope.row.record.handlerId  ===  useUserStore().user.userId"  link type="primary" icon="Edit" size="small" style="margin: 0"
-                       @click="viewResult(scope.row,false)" />
-          </div>
-
-        </template>
-      </el-table-column>
       <el-table-column label="状态" align="center" width="100">
         <template #default="scope">
           <div :style="getStatusStyle(scope.row)">
@@ -215,7 +164,69 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="130" align="center" prop="">
+      <el-table-column label="完成时间" align="center" min-width="140">
+        <template #default="scope">
+          {{
+            scope.row.record != undefined
+                ? scope.row.record.finishTime
+                : ""
+          }}
+        </template>
+      </el-table-column>
+      <el-table-column label="委托时间" align="center" min-width="140">
+        <template #default="scope">
+          {{
+            scope.row.record != undefined
+                ? scope.row.record.entrustTime
+                : ""
+          }}
+        </template>
+      </el-table-column>
+      <el-table-column label="任务进度" align="center" prop="onWorkDetail" min-width="250">
+        <template #default="scope">
+          <el-button link type="primary" size="small" @click="viewOnWorkDetail(scope.row,true)"
+          >{{textFormat(scope.row.onWorkDetail)}}</el-button>
+          <el-button v-if="scope.row.record != null&&scope.row.record.status !== 3&&scope.row.record.status !== 4&&scope.row.record.handlerId  ===  useUserStore().user.userId" style="margin: 0" link type="primary" icon="Edit"
+                     @click="viewOnWorkDetail(scope.row,false)" />
+        </template>
+      </el-table-column>
+      <el-table-column label="合同" align="center" min-width="50" >
+        <template #default="scope">
+          <el-button link type="primary" size="small" @click="viewContract(scope.row)">查看</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="执行人" align="center" width="100" :show-overflow-tooltip="true">
+        <template #default="scope">
+          {{
+            scope.row.entrust != null
+                ? scope.row.entrust.toAccountName
+                : scope.row.serviceName
+          }}
+        </template>
+      </el-table-column>
+      <el-table-column label="已收款" prop="arriveAmount" align="center" min-width="60">
+        <template #default="scope">
+          {{rowNum(scope.row.arriveAmount)}}
+        </template>
+      </el-table-column>
+      <el-table-column label="交接单" align="center" min-width="140">
+        <template #default="scope">
+          <div v-if="scope.row.record == null || scope.row.record.status===0">
+            {{}}
+          </div>
+          <div v-else>
+            <el-button link type="primary" size="small" @click="viewResult(scope.row,true)"
+            >{{resultLable(scope.row)}}</el-button>
+            <el-button v-if="(scope.row.record !== null || scope.row.record.status!==3) && scope.row.record.handlerId  ===  useUserStore().user.userId"  link type="primary" icon="Edit" size="small" style="margin: 0"
+                       @click="viewResult(scope.row,false)" />
+            <el-button v-hasPermi="['business:production:onceWork:perEdit']"  link type="primary" icon="Edit" size="small" style="margin: 0"
+                       @click="viewResult(scope.row,false)" />
+          </div>
+
+        </template>
+      </el-table-column>
+      <el-table-column label="说明" align="center" prop="explain" min-width="180" />
+      <el-table-column fixed="right"  label="操作" width="130" align="center" prop="">
         <template #default="scope">
 
           <el-button v-if="scope.row.record != null && scope.row.record.status === 4" size="small" type="primary" link
@@ -231,7 +242,7 @@
             领取
           </el-button>
           <el-button
-            v-if="scope.row.record !== undefined && scope.row.record.status == 1 && scope.row.record.handlerId  ===  useUserStore().user.userId"
+            v-if="scope.row.record !== undefined && scope.row.record.status === 1 && scope.row.record.handlerId  ===  useUserStore().user.userId"
             size="small" type="primary" link v-hasPermi="['business:production:onceWork:finished']"
             @click="finishedHandle3(scope.row)">
             取消领取
@@ -255,7 +266,7 @@
   import {
     listOnceWorkOrder,
     saveDetail,
-    exportOnceWork,receive,continueHandleApi
+    exportOnceWork,receive,continueHandleApi,entrustSourceApi
   } from "@/api/business/production/onceWorkOrder";
   import { toRefs } from "vue";
   import useUserStore from "@/store/modules/user";
@@ -315,6 +326,7 @@
   const tenant = useUserStore().tenant;
   const list = ref([]);
   const loading = ref(true);
+  const entrustSource = ref();
   const ids = ref([]);
   const selections = ref([]);
   const oneself = ref(false);
@@ -357,6 +369,10 @@
       total.value = response.total;
       loading.value = false;
     });
+    entrustSourceApi().then((res)=>{
+      entrustSource.value = res.data;
+      console.log(res.data)
+    })
   }
 
   /** 是否为自己负责 */