feat: ✨ 完成合同管理的修改

src/views/project/ProjectForm.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ElMessage } from 'element-plus'
-import { ref, reactive, nextTick, computed } from 'vue'
+import { ref, reactive, nextTick } from 'vue'
 import { GlobalStore } from '@/stores/index'
 import ProjectDetail from './ProjectDetail.vue'
 import Drawer from '@/components/Drawer/index.vue'
@@ -288,7 +288,12 @@ defineExpose({
         >
       </el-form-item>
     </el-form>
-    <receiveUser ref="receiveUserDrawerRef" @onUserInfo="getProjectInfo" title="选择审批人"></receiveUser>
+    <receiveUser
+      ref="receiveUserDrawerRef"
+      :dept_leader="1"
+      @onUserInfo="getProjectInfo"
+      title="选择审批人"
+    ></receiveUser>
   </Drawer>
 </template>
 <style scoped lang="scss">

src/views/salary/salary/SalaryFrom.vue

@@ -77,7 +77,8 @@ defineExpose({
     <el-row :gutter="24">
       <el-col :span="12" style="margin-left: 4rem" v-if="form.T_State">
         <el-tag v-if="form.T_State == '1'" type="success" effect="dark">未发布 </el-tag>
-        <el-tag v-else type="warning" effect="dark">已发布 </el-tag>
+        <el-tag v-else-if="form.T_State == '2'" type="warning" effect="dark">已发布 </el-tag>
+        <el-tag v-else type="danger" effect="dark">未提交</el-tag>
       </el-col>
     </el-row>
     <el-form :model="form" ref="formRef" :rules="rules">

src/views/storehouse/outStock/ReceiveOutStock.vue

@@ -317,7 +317,7 @@ const changeDepot = () => drawerProductRef.value?.clearProdctData()
       </div>
     </el-form>
     <InStorageSn ref="drawerSnRef" @onCount="autoGetCount" />
-    <ReceiveUser ref="receiveUserdialog" @onUserInfo="getReceiveInfo" title="选择经办人" />
+    <ReceiveUser ref="receiveUserdialog" :dept_leader="1" @onUserInfo="getReceiveInfo" title="选择经办人" />
     <OutStockProduct
       ref="drawerProductRef"
       :depotId="form.T_depot_id"

src/views/storehouse/outStock/SaleOutStock.vue

@@ -363,7 +363,7 @@ const { options } = depotHooks()
       </div>
     </el-form>
     <InStorageSn ref="drawerSnRef" @onCount="autoGetCount" />
-    <ReceiveUser ref="receiveUserdialog" @onUserInfo="getReceiveInfo" title="选择经办人" />
+    <ReceiveUser ref="receiveUserdialog" :dept_leader="1" @onUserInfo="getReceiveInfo" title="选择经办人" />
     <ContractNumber ref="contractNumberRef" @onContactInfo="getContactInfo" />
   </div>
 </template>

src/views/storehouse/outStock/receiveUser.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref } from 'vue'
+import { ref, onMounted } from 'vue'
 import { User_List } from '@/api/user/index'
 import Drawer from '@/components/Drawer/index.vue'
 import { GlobalStore } from '@/stores/index'
@@ -15,7 +15,7 @@ const Dialogcolumns: ColumnProps[] = [{ prop: 'T_name', label: '名字' }]
 const InitParam = {
   User_tokey: globalStore.GET_User_tokey,
   T_name: '',
-  T_dept_leader: 1
+  T_dept_leader: 0
 }
 const searchHandle = () => {
   InitParam.T_name = search.value
@@ -29,14 +29,21 @@ const getApproverInfo = (row: any) => {
   drawerRef.value?.closeDrawer()
 }
 
-const props = defineProps<{ title: string }>()
+const props = withDefaults(defineProps<{ title: string; dept_leader?: number }>(), {
+  dept_leader: undefined
+})
 const title = ref(props.title)
+
 const callbackDrawer = (done: () => void) => done()
 const emit = defineEmits<{ (event: 'onUserInfo', value: any): void }>()
 const openDrawer = () => drawerRef.value?.openDrawer()
 defineExpose({
   openDrawer
 })
+
+onMounted(() => {
+  if (props.dept_leader === 1) InitParam.T_dept_leader = props.dept_leader
+})
 </script>
 
 <template>

src/views/storehouse/sales/Contract.vue

@@ -25,15 +25,10 @@ const columns: ColumnProps[] = [
   { prop: 'operation', label: '操作', width: 260, fixed: 'right' }
 ]
 
-const openContractFormDrawer = (type: string, row?: any) => {
-  ContractFormRef.value?.openDrawer(type, row)
-}
-
+const openContractFormDrawer = (type: string, row?: any) => ContractFormRef.value?.openDrawer(type, row)
 const updateOnTableList = () => TableRef.value?.getTableList()
 // 审核
-const processContract = (id: string) => {
-  router.push({ name: 'ContractDetail', params: { id, type: fnMd5('contract') } })
-}
+const processContract = (id: string) => router.push({ name: 'ContractDetail', params: { id, type: fnMd5('contract') } })
 // 删除
 const UserDelete = (row: any) => {
   ElMessageBox.confirm('您确定要删除该销售合同吗?', '警告', {
@@ -66,9 +61,7 @@ const initParam = reactive({
   T_name: '',
   T_state: ''
 })
-const searchHandle = () => {
-  TableRef.value?.searchTable()
-}
+const searchHandle = () => TableRef.value?.searchTable()
 </script>
 
 <template>

src/views/storehouse/sales/ContractForm.vue

@@ -8,23 +8,27 @@ import Upload from '@/components/Upload/index.vue'
 import {
   Storehouse_Contract_Add,
   Storehouse_Contract_Edit,
-  Storehouse_Contract_Product_List
+  Storehouse_Contract_Product_List,
+  Storehouse_Contract_Gen_Number
 } from '@/api/storehouse/index'
 import { ElMessage } from 'element-plus'
 import ImageCom from '@/components/Image/index.vue'
 import InStorageProduct from '@/views/storehouse/inventory/InStorageProduct.vue'
+import ContractUser from '@/views/storehouse/outStock/receiveUser.vue'
 
 const isProduct = ref(false)
 let selectProductData: any[] = []
 const isNew = ref(true)
 const globalStore = GlobalStore()
+const User_tokey = globalStore.GET_User_tokey
 const formLabelWidth = ref('120px')
 const ruleFormRef = ref<FormInstance>()
 const drawerRef = ref<InstanceType<typeof Drawer> | null>(null)
 const uploadRef = ref<InstanceType<typeof Upload> | null>(null)
+const receiveUserdialog = ref<InstanceType<typeof ContractUser> | null>(null)
 
 const validate_T_product = (rule: any, value: any, callback: any) => {
-  if (form.T_type === 1 && value === '') {
+  if (value === '') {
     callback(new Error('请选择产品明细'))
   } else if (value.includes(undefined)) {
     callback(new Error('请填写产品数量'))
@@ -60,8 +64,8 @@ const resetForm = (formEl: FormInstance | undefined) => {
 // 父级方法
 const emit = defineEmits<{ (event: 'onTableList'): void }>()
 
-// 添加仓库名称
 interface FormType {
+  T_uuid: string
   T_number: string
   T_customer: string
   T_type: any
@@ -70,9 +74,11 @@ interface FormType {
   T_date: string
   T_remark: string
   T_pdf: string
+  T_submit: string
 }
-// type Fn = () => void
+
 const form = reactive<FormType>({
+  T_uuid: '',
   T_number: '',
   T_customer: '',
   T_type: '',
@@ -80,7 +86,8 @@ const form = reactive<FormType>({
   T_money: '',
   T_date: '',
   T_remark: '',
-  T_pdf: ''
+  T_pdf: '',
+  T_submit: ''
 })
 
 const openDrawer = (type: string, row?: any) => {
@@ -103,7 +110,7 @@ const editDataEcho = async (row: any) => {
   form.T_customer = row.T_customer
 
   const res: any = await Storehouse_Contract_Product_List({
-    User_tokey: globalStore.GET_User_tokey,
+    User_tokey,
     T_number: row.T_number
   })
   if (res.Code === 200) {
@@ -146,18 +153,16 @@ const AddContract = (formEl: FormInstance | undefined) => {
       tableData.value.forEach(item => {
         product += `${item.Id},${item.count}|`
       })
+      const params = {
+        ...form,
+        User_tokey,
+        T_submit: form.T_uuid,
+        T_product: product
+      }
       if (isNew.value) {
-        res = await Storehouse_Contract_Add({
-          ...form,
-          User_tokey: globalStore.GET_User_tokey,
-          T_product: product
-        })
+        res = await Storehouse_Contract_Add(params)
       } else {
-        res = await Storehouse_Contract_Edit({
-          ...form,
-          T_product: product,
-          User_tokey: globalStore.GET_User_tokey
-        })
+        res = await Storehouse_Contract_Edit(params)
       }
       if (res.Code === 200) {
         ElMessage.success(`${isNew.value ? '添加' : '修改'}合同成功！！`)
@@ -193,7 +198,6 @@ const drawerProductRef = ref<InstanceType<typeof InStorageProduct> | null>(null)
  */
 const AddProductionDetailed = () => {
   isProduct.value = true
-  console.log(selectProductData)
   nextTick(() => {
     drawerProductRef.value?.openDrawer()
   })
@@ -213,8 +217,18 @@ const ProductselectionChange = (row: any) => {
 /**
  * 全选
  */
-const ProductSelectionAllChange = (selection: any[]) => {
-  tableData.value = selection
+const ProductSelectionAllChange = (selection: any[]) => (tableData.value = selection)
+const getContractNumber = async () => {
+  const res: any = await Storehouse_Contract_Gen_Number({ User_tokey })
+  if (res.Code === 200) form.T_number = res.Data
+}
+/**
+ * 合同负责人
+ */
+const selectApprover = () => receiveUserdialog.value?.openDrawer()
+const getReceiveInfo = ({ T_uuid, T_name }: { T_uuid: string; T_name: string }) => {
+  form.T_submit = T_name
+  form.T_uuid = T_uuid
 }
 defineExpose({
   openDrawer
@@ -230,36 +244,20 @@ defineExpose({
       <el-form ref="ruleFormRef" :model="form" :rules="rules">
         <el-divider border-style="dashed" />
         <el-form-item label="合同编号：" :label-width="formLabelWidth" prop="T_number">
-          <el-input
-            v-model="form.T_number"
-            type="text"
-            :disabled="!isNew"
-            autocomplete="off"
-            placeholder="请输入合同编号"
-            class="w-50"
-          />
+          <div>
+            <el-input v-model="form.T_number" :disabled="!isNew" placeholder="请输入合同编号" class="w-50" />
+            <el-button type="primary" @click="getContractNumber">生成合同编号</el-button>
+          </div>
         </el-form-item>
         <el-form-item label="客户名称：" :label-width="formLabelWidth" prop="T_customer">
-          <el-input
-            v-model="form.T_customer"
-            type="text"
-            autocomplete="off"
-            placeholder="请输入客户名称"
-            class="w-50"
-          />
-        </el-form-item>
-        <el-form-item label="合同类型：" :label-width="formLabelWidth" prop="T_type">
-          <el-select v-model="form.T_type" class="w-50" clearable :disabled="!isNew" placeholder="请选择合同类型~">
-            <el-option label="销售合同" :value="1" />
-            <el-option label="验证合同" :value="2" />
-          </el-select>
+          <el-input v-model="form.T_customer" placeholder="请输入客户名称" class="w-50" />
         </el-form-item>
         <el-form-item label="产品明细：" :label-width="formLabelWidth" prop="T_product">
           <el-table
-            :data="tableData"
-            style="width: 100%"
             border
             stripe
+            :data="tableData"
+            style="width: 100%"
             :header-cell-style="{ background: '#dedfe0', height: '50px' }"
           >
             <template v-for="item in columns" :key="item.prop">
@@ -295,13 +293,13 @@ defineExpose({
             </template>
           </el-table>
         </el-form-item>
-        <el-form-item label="业务日期：" :label-width="formLabelWidth" prop="T_date">
+        <el-form-item label="签订时间：" :label-width="formLabelWidth" prop="T_date">
           <el-date-picker
             class="my-date-picker"
             style="width: 21.5rem"
             v-model="form.T_date"
             type="date"
-            placeholder="选择日期"
+            placeholder="签订时间"
             format="YYYY-MM-DD"
             value-format="YYYY-MM-DD"
           />
@@ -309,6 +307,9 @@ defineExpose({
         <el-form-item label="合同金额：" :label-width="formLabelWidth" prop="T_money">
           <el-input v-model="form.T_money" type="text" autocomplete="off" placeholder="请输入合同金额" class="w-50" />
         </el-form-item>
+        <el-form-item label="合同负责人：" :label-width="formLabelWidth" prop="T_submit">
+          <el-input v-model="form.T_submit" placeholder="请选择合同负责人" class="w-50" @focus="selectApprover" />
+        </el-form-item>
         <el-form-item label="合同备注：" :label-width="formLabelWidth" prop="T_remark">
           <el-input
             class="w-50"
@@ -343,6 +344,7 @@ defineExpose({
         </div>
       </el-form>
     </Drawer>
+    <ContractUser ref="receiveUserdialog" @onUserInfo="getReceiveInfo" title="合同负责人" />
     <InStorageProduct
       v-if="isProduct"
       ref="drawerProductRef"
@@ -354,10 +356,6 @@ defineExpose({
 </template>
 
 <style scoped lang="scss">
-.tooltip-content {
-  max-width: 500px;
-  overflow-y: auto;
-}
 .contract-form {
   :deep(.el-table--border .el-table__cell) {
     border-right: 0;

src/views/storehouse/sales/ContractSale.vue

@@ -24,10 +24,7 @@ const columns: ColumnProps[] = [
   { prop: 'operation', label: '操作', width: 260, fixed: 'right' }
 ]
 
-const openContractFormDrawer = (type: string, row?: any) => {
-  ContractFormRef.value?.openDrawer(type, row)
-}
-
+const openContractFormDrawer = (type: string, row?: any) => ContractFormRef.value?.openDrawer(type, row)
 const updateOnTableList = () => TableRef.value?.getTableList()
 // 审核
 const processContract = (id: string) => {

src/views/storehouse/sales/TableDetail.vue

@@ -0,0 +1,6 @@
+<script setup lang="ts"></script>
+<template>
+  <div></div>
+</template>
+
+<style scoped></style>