Merge remote-tracking branch 'origin/master'

src/views/home/task/components/purch-request.vue

@@ -0,0 +1,92 @@
+<!--  -->
+<template>
+  <div >
+    <el-form ref="formRef" :model="otherInfo"  label-position="top" disabled>
+        <el-form-item label="申请事由：">
+            <el-input type="textarea" v-model="otherInfo.purDesc" :autosize="{ minRows: 2, maxRows: 3 }"/>
+        </el-form-item>
+        <div class="hc-form-item">
+            <!--prop="purType"-->
+            <el-form-item label="采购类型：">
+                <el-select block v-model="otherInfo.purType">
+                    <el-option v-for="item in purTypeData" :label="item.dictName" :value="item.dictValue"/>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="使用单位：" prop="useOrgName">
+                <el-input v-model="otherInfo.useOrgName" placeholder="部门使用或者项目使用"/>
+            </el-form-item>
+            <el-form-item label="期望交付日期：" prop="expectedDeliveryDate">
+                <el-date-picker type="date" class="block" v-model="otherInfo.expectedDeliveryDate" format="YYYY-MM-DD" value-format="YYYY-MM-DD"/>
+            </el-form-item>
+        </div>
+        <HcCardItem :title="'采购明细'" ui="hac-bg-grey" style="background: #f7f7f7;">
+            <el-form-item label="名称：" prop="purName">
+             <el-input v-model="otherInfo.purName"/>
+            </el-form-item>
+            <div class="hc-form-item">
+                <el-form-item label="规格：" prop="purSpecification">
+                    <el-input v-model="otherInfo.purSpecification"/>
+                </el-form-item>
+                <el-form-item label="数量：" prop="purCount">
+                    <el-input v-model="otherInfo.purCount"/>
+                </el-form-item>
+                <el-form-item label="单位：" prop="purOrgName">
+                    <el-input v-model="otherInfo.purOrgName"/>
+                </el-form-item>
+                <el-form-item label="价格：" prop="purPrice">
+                    <el-input v-model="otherInfo.purPrice">
+                        <template slot="append">元</template>
+                    </el-input>
+                </el-form-item>
+            </div>
+        </HcCardItem>
+        <el-form-item label="总价格">
+            <el-input v-model="otherInfo.purDesc"/>
+        </el-form-item>
+  
+        <el-form-item label="备注：">
+            <el-input type="textarea" v-model="otherInfo.remarks" :autosize="{ minRows: 3, maxRows: 5 }"/>
+        </el-form-item>
+    
+      
+                            
+    </el-form>
+  </div>
+</template>
+
+<script setup>
+import { ref, watch,onActivated } from 'vue'
+import {getProjectList} from "~api/other";
+import {getArrValue} from "js-fast-way";
+
+//参数
+const props = defineProps({
+  otherInfo: {
+    type: Object,
+    default: {}
+  }
+})
+
+const projectType=ref([])
+const purTypeData=ref([])//采购类型
+//监听
+watch(() => [
+  props.otherInfo,
+], ([otherInfo]) => {
+  console.log(otherInfo, 'otherInfo');
+  getProjectData()
+
+})
+const getProjectData = async () => {
+    const {error, code, data} = await getProjectList()
+    //判断状态
+    if (!error && code === 200) {
+      projectType.value = getArrValue(data)
+    } else {
+      projectType.value = []
+    }
+}
+
+</script>
+<style lang='scss' scoped>
+</style>

src/views/home/task/components/vehicle-request.vue

@@ -0,0 +1,76 @@
+<!--  -->
+<template>
+  <div >
+    <el-form ref="formRef" :model="otherInfo" label-position="top" disabled>
+        <el-form-item label="用车事由：">
+            <el-input type="textarea" v-model="otherInfo.ucDesc" :autosize="{ minRows: 2, maxRows: 3 }"/>
+        </el-form-item>
+        <div class="hc-form-item">
+            <el-form-item label="始发地点：">
+                <el-input v-model="otherInfo.startLocations"/>
+            </el-form-item>
+            <el-form-item label="返回地点：">
+                <el-input v-model="otherInfo.endLocations"/>
+            </el-form-item>
+        </div>
+        <div class="hc-form-item">
+            <el-form-item label="用车日期：" prop="useStartDate">
+                <el-date-picker type="date" class="block" v-model="otherInfo.useStartDate" format="YYYY-MM-DD" value-format="YYYY-MM-DD"/>
+            </el-form-item>
+            <el-form-item label="返回日期：" prop="useEndDate">
+                <el-date-picker type="date" class="block" v-model="otherInfo.useEndDate" format="YYYY-MM-DD" value-format="YYYY-MM-DD"/>
+            </el-form-item>
+        </div>
+        <HcCardItem :title="'车辆明细'" ui="hac-bg-grey" style="background: #f7f7f7;" class="mt-4">
+                  <div class="hc-form-item">
+                    <el-form-item label="车辆类型：" prop="carType">
+                        <el-input v-model="otherInfo.carType"/>
+                    </el-form-item>
+                    <el-form-item label="数量：" prop="carCount">
+                        <el-input v-model="otherInfo.carCount">
+                            <template slot="append">辆</template>
+                        </el-input>
+                    </el-form-item>
+                    <el-form-item label="其它要求：">
+                        <el-input v-model="otherInfo.otherRequirements"/>
+                    </el-form-item>
+                </div>
+          
+        </HcCardItem>
+        <el-form-item label="备注：" class="mt-4">
+            <el-input type="textarea" v-model="otherInfo.remarks" :autosize="{ minRows: 3, maxRows: 5 }"/>
+        </el-form-item>
+        <el-form-item label="图片：">
+            <HcFormUpload type="preview" :src="otherInfo.photoUrl" v-if="otherInfo.photoUrl" />
+        </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+<script setup>
+import { ref, watch,onActivated } from 'vue'
+import {getProjectList} from "~api/other";
+import {getArrValue} from "js-fast-way";
+onActivated(()=>{
+
+ })
+//参数
+const props = defineProps({
+  otherInfo: {
+    type: Object,
+    default: {}
+  }
+})
+
+//监听
+watch(() => [
+  props.otherInfo,
+], ([otherInfo]) => {
+  console.log(otherInfo, 'otherInfo');
+
+})
+
+
+</script>
+<style lang='scss' scoped>
+</style>

src/views/home/task/task-details.vue

@@ -84,13 +84,21 @@
                 <tripInfo :other-info="otherInfo"/>
             </div>
              <!-- 支付申请 -->
-            <div class="hc-info-list" v-if="dataType==='支付申请'">
+            <div class="hc-info-list" v-if="dataType==='支付审批'">
                 <paymentRequest :other-info="otherInfo"/>
             </div>
               <!-- 借款申请 -->
              <div class="hc-info-list" v-if="dataType==='借款审批'">
                 <loanRequest :other-info="otherInfo"/>
             </div>
+             <!-- 采购申请 -->
+            <div class="hc-info-list" v-if="dataType==='采购审批'">
+                <purchaseRequest :other-info="otherInfo"/>
+            </div>
+            <!-- 用车申请 -->
+            <div class="hc-info-list" v-if="dataType==='用车审批'">
+                <vehicleRequest :other-info="otherInfo"/>
+            </div>
           
         </HcCardItem>
   
@@ -123,11 +131,12 @@
                 <el-select v-model="dataType" block placeholder="选择模拟类型" size="large">
                     <el-option label="任务详情" value="任务审批"/>
                     <el-option label="财务报销" value="报销审批"/>
-                    <el-option label="采购" value="3"/>
+                    <el-option label="采购审批" value="采购审批"/>
                     <el-option label="外包支付" value="4"/>
                     <el-option label="借款审批" value="借款审批"/>
                     <el-option label="出差审批" value="出差审批"/>
-                    <el-option label="支付申请" value="支付申请"/>
+                    <el-option label="支付申请" value="支付审批"/>
+                    <el-option label="用车审批" value="用车审批"/>
                 </el-select>
             </div>
             <el-button hc-btn @click="authTypeClick">模拟财务审核</el-button>
@@ -151,7 +160,9 @@ import taskApi from '~api/home/task.js';
 import {getArrValue,getObjValue} from "js-fast-way"
 import tripInfo from './components/trip-info.vue'//出差申请
 import paymentRequest from './components/pay-request.vue'
-import loanRequest from './components/loan-request.vue'
+import loanRequest from './components/loan-request.vue' 
+import purchaseRequest from './components/purch-request.vue'//采购
+import vehicleRequest from './components/vehicle-request.vue'
 
 
 //初始变量