YangJian0701 1 an în urmă
părinte
comite
d84fa58c41
29 a modificat fișierele cu 103 adăugiri și 97 ștergeri
  1. BIN
      ERP.rar
  2. 1 1
      src/components/TableBase/index.vue
  3. 1 1
      src/layouts/Header/index.vue
  4. 2 2
      src/views/Login.vue
  5. 3 3
      src/views/project/ProjectDetail.vue
  6. 18 18
      src/views/salary/Reimburse/ReimburseFrom.vue
  7. 16 16
      src/views/salary/ReimburseMy.vue
  8. 2 0
      src/views/salary/SalaryCount.vue
  9. 3 3
      src/views/storehouse/inventory/InStorageDetail.vue
  10. 2 2
      src/views/storehouse/inventory/InStorageForm.vue
  11. 3 3
      src/views/storehouse/inventory/InStorageProduct.vue
  12. 1 1
      src/views/storehouse/inventory/InStorageSn.vue
  13. 4 4
      src/views/storehouse/inventory/MyPercentageFormStorage.vue
  14. 2 2
      src/views/storehouse/inventory/MyPercentageFormStorage1.vue
  15. 9 9
      src/views/storehouse/outStock/OutStockDetail.vue
  16. 5 3
      src/views/storehouse/outStock/OutStockProduct.vue
  17. 4 3
      src/views/storehouse/outStock/ReceiveOutStock.vue
  18. 5 4
      src/views/storehouse/outStock/SaleOutStock.vue
  19. 4 4
      src/views/storehouse/sales/ContractDetail.vue
  20. 1 1
      src/views/storehouse/sales/ContractForm.vue
  21. 1 1
      src/views/storehouse/sales/MyPercentageForm.vue
  22. 2 2
      src/views/storehouse/sales/PercentageDetail.vue
  23. 1 1
      src/views/storehouse/sales/PercentageDetail1.vue
  24. 2 2
      src/views/storehouse/sales/PercentageForm.vue
  25. 1 1
      src/views/storehouse/sales/PercentageTable.vue
  26. 1 1
      src/views/storehouse/sales/TableDetail.vue
  27. 1 1
      src/views/storehouse/sales/VerifyForm.vue
  28. 3 3
      src/views/storehouse/sales/VerifyProject.vue
  29. 5 5
      src/views/storehouse/sales/verifyxiang.vue

+ 1 - 1
src/components/TableBase/index.vue

@@ -79,7 +79,7 @@ defineExpose({
           :align="item.align ?? 'center'"
           :reserve-selection="item.type == 'selection'"
           v-if="item.type == 'selection' || item.type == 'index'"
-          
+          show-overflow-tooltip
         ></el-table-column>
         <!-- expand 支持 tsx 语法 && 作用域插槽 (tsx > slot) -->
         <el-table-column v-bind="item" :align="item.align ?? 'center'" v-if="item.type === 'expand'" v-slot="scope" show-overflow-tooltip>

+ 1 - 1
src/layouts/Header/index.vue

@@ -21,7 +21,7 @@ const logOut = () => {
 }
 const info = computed(() => globalStore.GET_User_Info)
 const goTask = () => {
-  window.open(`http://dootask.baozhida.cn/gologin/index.html?uuid=${info.value.T_uuid}&name=${info.value.T_name}`)
+  window.open(`https://dootask.baozhida.cn/gologin/index.html?uuid=${info.value.T_uuid}&name=${info.value.T_name}`)
 }
 const getTime = () => {
   return new Date().toLocaleString('en-US', {

+ 2 - 2
src/views/Login.vue

@@ -14,8 +14,8 @@ const router = useRouter()
 const globalStore = GlobalStore()
 const ruleFormRef = ref<FormInstance>()
 const ruleForm = reactive<InLogin>({
-  username: 'admin',
-  password: '12345678'
+  username: '',
+  password: ''
 })
 
 const validatePass = (rule: any, value: any, callback: any) => {

+ 3 - 3
src/views/project/ProjectDetail.vue

@@ -97,9 +97,9 @@ const isShow = ref(props.isShow)
     }"
   >
     <template v-for="item in columns" :key="item.prop">
-      <el-table-column v-bind="item" v-if="item.type === 'index'"></el-table-column>
-      <el-table-column v-bind="item" v-if="item.fixed !== 'right' && item.type !== 'index'"> </el-table-column>
-      <el-table-column v-bind="item" v-if="item.fixed === 'right' && isShow === 'myProject'">
+      <el-table-column show-overflow-tooltip v-bind="item" v-if="item.type === 'index'"></el-table-column>
+      <el-table-column show-overflow-tooltip v-bind="item" v-if="item.fixed !== 'right' && item.type !== 'index'"> </el-table-column>
+      <el-table-column show-overflow-tooltip v-bind="item" v-if="item.fixed === 'right' && isShow === 'myProject'">
         <template #default="{ row }">
           <el-button size="small" :disabled="disabled" type="primary" @click="openProductionDetailed('edit', row)"
             >编辑</el-button

+ 18 - 18
src/views/salary/Reimburse/ReimburseFrom.vue

@@ -44,27 +44,27 @@
       <el-form :model="data.formData" label-position="top">
         <el-form-item label="报销明细">
           <el-table :data="data.formData.T_reimburse_details" style="width: 100%">
-            <el-table-column type="index" label="序号" width="70" />
-            <el-table-column label="出差时间">
+            <el-table-column show-overflow-tooltip type="index" label="序号" width="70" />
+            <el-table-column show-overflow-tooltip label="出差时间">
               <el-table-column label="起" width="120">
                 <template #default="scope">
                   {{ scope.row.T_trip_start_time }}
                 </template>
               </el-table-column>
-              <el-table-column prop="city" label="止" width="120">
+              <el-table-column show-overflow-tooltip prop="city" label="止" width="120">
                 <template #default="scope">
                   {{ scope.row.T_trip_end_time }}
                 </template>
               </el-table-column>
             </el-table-column>
 
-            <el-table-column label="出差地点">
-              <el-table-column label="起" width="150">
+            <el-table-column show-overflow-tooltip label="出差地点">
+              <el-table-column show-overflow-tooltip label="起" width="150">
                 <template #default="scope">
                   {{ scope.row.T_trip_terminus }}
                 </template>
               </el-table-column>
-              <el-table-column prop="city" label="止" width="150">
+              <el-table-column show-overflow-tooltip prop="city" label="止" width="150">
                 <template #default="scope">
                   {{ scope.row.T_trip_origin }}
                 </template>
@@ -72,43 +72,43 @@
             </el-table-column>
 
 
-            <el-table-column label="费用类型" width="150">
+            <el-table-column show-overflow-tooltip label="费用类型" width="150">
               <template #default="scope">
                 {{ scope.row.T_fee_type_name }}
               </template>
             </el-table-column>
-            <el-table-column label="费用明细" width="150">
+            <el-table-column show-overflow-tooltip label="费用明细" width="150">
               <template #default="scope">
                 {{ scope.row.T_fee_details_name }}
               </template>
             </el-table-column>
-            <el-table-column label="费用金额" width="100">
+            <el-table-column show-overflow-tooltip label="费用金额" width="100">
               <template #default="scope">
                 {{ scope.row.T_money }}
               </template>
             </el-table-column>
-            <el-table-column label="审批金额" width="100">
+            <el-table-column show-overflow-tooltip label="审批金额" width="100">
               <template #default="scope">
                 <el-input v-model="scope.row.T_approval_money" :disabled="data.drawerTiti=='详情'?true:false" placeholder="审批金额" />
               </template>
             </el-table-column>
-            <el-table-column label="审批意见" width="100" show-overflow-tooltip>
+            <el-table-column show-overflow-tooltip label="审批意见" width="100">
               <template #default="scope">
                 <el-input v-model="scope.row.T_approval_opinion" v-if="data.drawerTiti!='详情'" placeholder="审批意见" />
                 <div v-if="data.drawerTiti=='详情'" style="overflow:hidden; white-space: nowrap; text-overflow: ellipsis;">{{ scope.row.T_approval_opinion }}</div>
               </template>
             </el-table-column>
-            <el-table-column label="费用事由" width="150">
+            <el-table-column show-overflow-tooltip label="费用事由" width="150">
               <template #default="scope">
                 {{ scope.row.T_reasons }}
               </template>
             </el-table-column>
-            <el-table-column label="涉及项目" width="150"  :show-overflow-tooltip="true">
+            <el-table-column show-overflow-tooltip label="涉及项目" width="150">
               <template #default="scope">
                 {{ scope.row.T_project }}
               </template>
             </el-table-column>
-            <el-table-column label="附件" min-width="80">
+            <el-table-column show-overflow-tooltip label="附件" min-width="80">
               <template #default="scope">
                 <upImg v-model:upImg="scope.row.T_img" :imgData="scope.row.T_img" :disabled="true"></upImg>
               </template>
@@ -127,18 +127,18 @@
         </el-form-item>
         <el-form-item label="打款明细">
           <el-table :data="data.formData.T_remit_detail" :header-cell-style="{ background: '#f5f7fa' }" border>
-            <el-table-column type="index" label="序号" fixed width="70" />
-            <el-table-column label="打款时间" :width="data.drawerTiti == '编辑'?'300':''">
+            <el-table-column show-overflow-tooltip type="index" label="序号" fixed width="70" />
+            <el-table-column show-overflow-tooltip label="打款时间" :width="data.drawerTiti == '编辑'?'300':''">
               <template #default="scope">
                 <el-date-picker v-model="scope.row.T_time" type="date" value-format="YYYY-MM-DD" placeholder="打款时间" :disabled="data.drawerTiti == '详情'?true:false"/>
               </template>
            </el-table-column>
-           <el-table-column label="打款金额" :width="data.drawerTiti == '编辑'?'300':''">
+           <el-table-column show-overflow-tooltip label="打款金额" :width="data.drawerTiti == '编辑'?'300':''">
               <template #default="scope">
                 <el-input v-model="scope.row.T_money" placeholder="打款金额" :disabled="data.drawerTiti == '详情'?true:false" />
               </template>
            </el-table-column>
-            <el-table-column fixed="right" min-width="300" v-if="data.drawerTiti == '编辑'">
+            <el-table-column show-overflow-tooltip fixed="right" min-width="300" v-if="data.drawerTiti == '编辑'">
               <template #default="scope">
                 <el-popconfirm title="删除当前明细,确定删除吗?" @confirm="newDel" width="235" 
                 confirm-button-text="立即删除" cancel-button-text="取消">

+ 16 - 16
src/views/salary/ReimburseMy.vue

@@ -57,21 +57,21 @@
                 <el-form-item label="报销明细">
                     <el-table :data="data.fromData.ReimburseDetails" style="width: 100%">
                         <el-table-column type="index" label="序号" width="70" />
-                        <el-table-column label="出差地点">
-                            <el-table-column label="起点站" width="150">
+                        <el-table-column label="出差地点" show-overflow-tooltip>
+                            <el-table-column label="起点站" width="150" show-overflow-tooltip>
                                 <template #default="scope">
                                     <el-input v-model="scope.row.T_trip_origin" placeholder="起点站"
                                         :disabled="data.disabledNum == scope.$index ? false : true" />
                                 </template>
                             </el-table-column>
-                            <el-table-column prop="city" label="终点站" width="150">
+                            <el-table-column prop="city" label="终点站" width="150" show-overflow-tooltip>
                                 <template #default="scope">
                                     <el-input v-model="scope.row.T_trip_terminus" placeholder="终点站"
                                         :disabled="data.disabledNum == scope.$index ? false : true" />
                                 </template>
                             </el-table-column>
                         </el-table-column>
-                        <el-table-column label="出差时间起止时间" width="250">
+                        <el-table-column show-overflow-tooltip label="出差时间起止时间" width="250">
                             <template #default="scope">
                                 <el-date-picker v-model="scope.row.mapPick" type="daterange" style="width: 220px;"
                                     @change="changeFun($event, scope)" value-format="YYYY-MM-DD"
@@ -79,7 +79,7 @@
                             </template>
 
                         </el-table-column>
-                        <el-table-column label="费用类型" width="150">
+                        <el-table-column show-overflow-tooltip label="费用类型" width="150">
                             <template #default="scope">
                                 <el-select v-model.number="scope.row.T_fee_type" class="m-2" placeholder="费用类型" size="large"
                                     :disabled="data.disabledNum == scope.$index ? false : true">
@@ -88,7 +88,7 @@
                                 </el-select>
                             </template>
                         </el-table-column>
-                        <el-table-column label="费用明细" width="150">
+                        <el-table-column show-overflow-tooltip label="费用明细" width="150">
                             <template #default="scope">
                                 <el-select v-model.number="scope.row.T_fee_details" class="m-2" placeholder="费用明细" size="large"
                                     :disabled="data.disabledNum == scope.$index ? false : true">
@@ -97,29 +97,29 @@
                                 </el-select>
                             </template>
                         </el-table-column>
-                        <el-table-column label="费用金额" width="150">
+                        <el-table-column show-overflow-tooltip label="费用金额" width="150">
                             <template #default="scope">
                                 <el-input v-model="scope.row.T_money" placeholder="费用金额"
                                     :disabled="data.disabledNum == scope.$index ? false : true" />
                             </template>
                         </el-table-column>
-                        <el-table-column label="审批金额" width="100" v-if="data.drawerTiti=='详情'">
+                        <el-table-column show-overflow-tooltip label="审批金额" width="100" v-if="data.drawerTiti=='详情'">
                             <template #default="scope">
                                 <el-input v-model="scope.row.T_approval_money" :disabled="data.drawerTiti=='详情'?true:false" placeholder="审批金额" />
                             </template>
                         </el-table-column>
-                        <el-table-column label="审批意见" width="100" v-if="data.drawerTiti=='详情'">
+                        <el-table-column show-overflow-tooltip label="审批意见" width="100" v-if="data.drawerTiti=='详情'">
                             <template #default="scope">
                                 <el-input v-model="scope.row.T_approval_opinion" :disabled="data.drawerTiti=='详情'?true:false" placeholder="审批意见" />
                             </template>
                         </el-table-column>
-                        <el-table-column label="费用事由" width="150">
+                        <el-table-column show-overflow-tooltip label="费用事由" width="150">
                             <template #default="scope">
                                 <el-input v-model="scope.row.T_reasons" placeholder="费用事由"
                                     :disabled="data.disabledNum == scope.$index ? false : true" />
                             </template>
                         </el-table-column>
-                        <el-table-column label="涉及项目" width="150" :show-overflow-tooltip="true">
+                        <el-table-column show-overflow-tooltip label="涉及项目" width="150">
                             <template #default="scope">
                                 <div v-if="data.drawerTiti == '详情'" style="width: 130px;overflow-x: hidden;">
                                     {{ scope.row.T_project }}
@@ -129,12 +129,12 @@
                             </template>
                         </el-table-column>
 
-                        <el-table-column label="附件" :min-width="data.drawerTiti != '详情' ? '80' : ''">
+                        <el-table-column show-overflow-tooltip label="附件" :min-width="data.drawerTiti != '详情' ? '80' : ''">
                             <template #default="scope">
                                 <upImg v-model:upImg="scope.row.T_img" :imgData="scope.row.T_img" :disabled="data.drawerTiti=='详情'?true:false"></upImg>
                             </template>
                         </el-table-column>
-                        <el-table-column fixed="right" min-width="300" v-if="data.drawerTiti != '详情'">
+                        <el-table-column show-overflow-tooltip fixed="right" min-width="300" v-if="data.drawerTiti != '详情'">
                             <template #default="scope">
                                 <el-button type="primary" @click="EditFun(scope)">修改</el-button>
                                 <el-button @click="newDel(scope)">删除</el-button>
@@ -150,9 +150,9 @@
                 </el-form-item>
                  <el-form-item label="打款明细" v-if="data.drawerTiti == '详情'">
                     <el-table :data="data.tableRemit" :header-cell-style="{ background: '#f5f7fa' }" border>
-                        <el-table-column type="index" label="序号" fixed width="70" />
-                        <el-table-column prop="T_time" label="打款时间" width="300" />
-                        <el-table-column prop="T_money" label="打款金额" />
+                        <el-table-column show-overflow-tooltip type="index" label="序号" fixed width="70" />
+                        <el-table-column show-overflow-tooltip prop="T_time" label="打款时间" width="300" />
+                        <el-table-column show-overflow-tooltip prop="T_money" label="打款金额" />
                     </el-table>
                 </el-form-item>
             </el-form>

+ 2 - 0
src/views/salary/SalaryCount.vue

@@ -208,6 +208,7 @@ getSalary_List()
       >
         <template v-for="(item, index) in tableTH" :key="index">
           <el-table-column
+          show-overflow-tooltip
             v-if="item.type === 'index' || item.fixed === 'left' || item.type === 'selection'"
             :selectable="selectableDisable"
             :type="item.type"
@@ -223,6 +224,7 @@ getSalary_List()
             align="center"
             label-class-name="label-table"
             :sortable="item.sortable"
+            show-overflow-tooltip
           >
             <template #default="{ row }">
               <el-tooltip v-if="item.prop === 'T_remark'" effect="customized" placement="left">

+ 3 - 3
src/views/storehouse/inventory/InStorageDetail.vue

@@ -97,7 +97,7 @@ onMounted(() => {
               }"
             >
               <template v-for="item in columns" :key="item.prop">
-                <el-table-column v-bind="item" v-if="item.fixed !== 'right'">
+                <el-table-column v-bind="item" v-if="item.fixed !== 'right'" :show-overflow-tooltip="true">
                   <template #default="{ row }" v-if="item.prop === item.name">
                     <span v-if="item.prop === 'T_product_relation_sn'">
                       <el-tag v-if="row.T_product_relation_sn === 1" effect="dark">是</el-tag>
@@ -150,8 +150,8 @@ onMounted(() => {
         }"
       >
         <template v-for="item in snColumns" :key="item">
-          <el-table-column v-if="item.type === 'index'" v-bind="item" />
-          <el-table-column v-if="item.prop" v-bind="item" />
+          <el-table-column show-overflow-tooltip v-if="item.type === 'index'" v-bind="item" />
+          <el-table-column show-overflow-tooltip v-if="item.prop" v-bind="item" />
         </template>
       </el-table>
     </Drawer>

+ 2 - 2
src/views/storehouse/inventory/InStorageForm.vue

@@ -249,7 +249,7 @@ defineExpose({
             }"
           >
             <template v-for="item in columns" :key="item.prop">
-              <el-table-column v-bind="item" v-if="item.fixed !== 'right' && !item.ellipsis">
+              <el-table-column show-overflow-tooltip v-bind="item" v-if="item.fixed !== 'right' && !item.ellipsis">
                 <template #header v-if="item.prop === 'count' || item.prop === 'sn'">
                   <span style="color: red">{{ item.label }}</span>
                 </template>
@@ -280,7 +280,7 @@ defineExpose({
                   <ImageCom v-if="item.prop === 'T_img'" :src="row.T_img" />
                 </template>
               </el-table-column>
-              <el-table-column v-if="item.ellipsis && item.prop === 'T_model'" v-bind="item">
+              <el-table-column show-overflow-tooltip v-if="item.ellipsis && item.prop === 'T_model'" v-bind="item">
                 <template #default="{ row }">
                   <el-tooltip effect="dark" :content="row.T_model" placement="bottom">
                     {{ row.T_model }}

+ 3 - 3
src/views/storehouse/inventory/InStorageProduct.vue

@@ -213,7 +213,7 @@ defineExpose({
       >
         <template v-for="item in productColumns" :key="item">
           <el-table-column v-if="item.type === 'index' || item.type === 'selection'" align="center" v-bind="item" />
-          <el-table-column v-if="!item.ellipsis && item.prop" v-bind="item">
+          <el-table-column show-overflow-tooltip v-if="!item.ellipsis && item.prop" v-bind="item">
             <template #default="{ row }">
               <span v-if="item.prop === 'T_relation_sn'">
                 <el-tag v-if="row.T_relation_sn === 1" effect="dark">是</el-tag>
@@ -222,14 +222,14 @@ defineExpose({
               <ImageCom v-if="item.prop === 'T_img'" :src="row.T_img" />
             </template>
           </el-table-column>
-          <el-table-column v-if="item.ellipsis && item.prop === 'T_model'" align="center" v-bind="item">
+          <el-table-column show-overflow-tooltip v-if="item.ellipsis && item.prop === 'T_model'" align="center" v-bind="item">
             <template #default="{ row }">
               <el-tooltip effect="dark" :content="row.T_model" placement="bottom">
                 {{ row.T_model }}
               </el-tooltip>
             </template>
           </el-table-column>
-          <el-table-column v-if="item.ellipsis && item.prop === 'T_remark'" align="center" v-bind="item">
+          <el-table-column show-overflow-tooltip v-if="item.ellipsis && item.prop === 'T_remark'" align="center" v-bind="item">
             <template #default="{ row }">
               <el-tooltip effect="customized" placement="left">
                 <template #content>

+ 1 - 1
src/views/storehouse/inventory/InStorageSn.vue

@@ -113,7 +113,7 @@ defineExpose({
       >
         <template v-for="item in snColumns" :key="item">
           <el-table-column v-if="item.type === 'index'" v-bind="item" />
-          <el-table-column v-if="item.prop" align="center" v-bind="item">
+          <el-table-column show-overflow-tooltip v-if="item.prop" align="center" v-bind="item">
             <template #default="{ row }">
               <el-button
                 v-if="item.prop === 'operation'"

+ 4 - 4
src/views/storehouse/inventory/MyPercentageFormStorage.vue

@@ -144,8 +144,8 @@ defineExpose({
         }" v-el-table-infinite-scroll="load" :infinite-scroll-immediate="false" infinite-scroll-distance="'50px'"
         @select="ProductselectionChange" @select-all="ProductSelectionAllChange">
         <template v-for="item in productColumns" :key="item">
-          <el-table-column v-if="item.type === 'index' || item.type === 'selection'" align="center" v-bind="item" />
-          <el-table-column v-if="!item.ellipsis && item.prop" v-bind="item">
+          <el-table-column show-overflow-tooltip v-if="item.type === 'index' || item.type === 'selection'" align="center" v-bind="item" />
+          <el-table-column show-overflow-tooltip v-if="!item.ellipsis && item.prop" v-bind="item">
             <template #default="{ row }">
               <span v-if="item.prop === 'T_relation_sn'">
                 <el-tag v-if="row.T_relation_sn === 1" effect="dark">是</el-tag>
@@ -154,14 +154,14 @@ defineExpose({
               <ImageCom v-if="item.prop === 'T_img'" :src="row.T_img" />
             </template>
           </el-table-column>
-          <el-table-column v-if="item.ellipsis && item.prop === 'T_model'" align="center" v-bind="item">
+          <el-table-column show-overflow-tooltip v-if="item.ellipsis && item.prop === 'T_model'" align="center" v-bind="item">
             <template #default="{ row }">
               <el-tooltip effect="dark" :content="row.T_model" placement="bottom">
                 {{ row.T_model }}
               </el-tooltip>
             </template>
           </el-table-column>
-          <el-table-column v-if="item.ellipsis && item.prop === 'T_remark'" align="center" v-bind="item">
+          <el-table-column show-overflow-tooltip v-if="item.ellipsis && item.prop === 'T_remark'" align="center" v-bind="item">
             <template #default="{ row }">
               <el-tooltip effect="customized" placement="left">
                 <template #content>

+ 2 - 2
src/views/storehouse/inventory/MyPercentageFormStorage1.vue

@@ -156,8 +156,8 @@ defineExpose({
         }" v-el-table-infinite-scroll="load" :infinite-scroll-immediate="false" infinite-scroll-distance="'50px'"
         @select="ProductselectionChange" @select-all="ProductSelectionAllChange">
         <template v-for="item in productColumns" :key="item">
-          <el-table-column v-if="item.type === 'index' || item.type === 'selection'" align="center" v-bind="item" />
-          <el-table-column v-if="item.prop" v-bind="item">
+          <el-table-column show-overflow-tooltip v-if="item.type === 'index' || item.type === 'selection'" align="center" v-bind="item" />
+          <el-table-column show-overflow-tooltip v-if="item.prop" v-bind="item">
             <template #default="{ row }">
               <span v-if="item.prop === 'T_relation_sn'">
                 <el-tag v-if="row.T_relation_sn === 1" effect="dark">是</el-tag>

+ 9 - 9
src/views/storehouse/outStock/OutStockDetail.vue

@@ -76,17 +76,17 @@ onMounted(() => {
 <template>
   <div class="contract-detail">
     <div class="info">
-      <h1>库详情</h1>
+      <h1>库详情</h1>
       <el-divider />
       <div class="content">
         <el-row>
-          <el-col :xs="8" :sm="6" :md="4" :lg="3" :xl="2"><span>库单号:</span></el-col>
+          <el-col :xs="8" :sm="6" :md="4" :lg="3" :xl="2"><span>库单号:</span></el-col>
           <el-col :xs="11" :sm="9" :md="7" :lg="6" :xl="5"
             ><span>{{ info?.T_number! }}</span></el-col
           >
         </el-row>
         <el-row>
-          <el-col :xs="8" :sm="6" :md="4" :lg="3" :xl="2"><span>库明细:</span></el-col>
+          <el-col :xs="8" :sm="6" :md="4" :lg="3" :xl="2"><span>库明细:</span></el-col>
           <el-col :span="21">
             <el-table
               :data="tableData"
@@ -100,7 +100,7 @@ onMounted(() => {
               }"
             >
               <template v-for="item in columns" :key="item.prop">
-                <el-table-column v-bind="item" v-if="item.fixed !== 'right'">
+                <el-table-column v-bind="item" v-if="item.fixed !== 'right'" show-overflow-tooltip>
                   <template #default="{ row }" v-if="item.prop === item.name">
                     <span v-if="item.prop === 'T_product_relation_sn'">
                       <el-tag v-if="row.T_product_relation_sn === 1" effect="dark">是</el-tag>
@@ -132,13 +132,13 @@ onMounted(() => {
           </el-col>
         </el-row>
         <el-row>
-          <el-col :xs="8" :sm="6" :md="4" :lg="3" :xl="2"> <span>库仓库:</span></el-col>
+          <el-col :xs="8" :sm="6" :md="4" :lg="3" :xl="2"> <span>库仓库:</span></el-col>
           <el-col :xs="11" :sm="9" :md="7" :lg="6" :xl="5"
             ><span>{{ info?.T_depot_name! }}</span></el-col
           >
         </el-row>
         <el-row>
-          <el-col :xs="8" :sm="6" :md="4" :lg="3" :xl="2"> <span>库日期:</span></el-col>
+          <el-col :xs="8" :sm="6" :md="4" :lg="3" :xl="2"> <span>库日期:</span></el-col>
           <el-col :xs="11" :sm="9" :md="7" :lg="6" :xl="5"
             ><span>{{ info?.T_date! }}</span></el-col
           >
@@ -146,7 +146,7 @@ onMounted(() => {
         <el-row>
           <el-col :xs="8" :sm="6" :md="4" :lg="3" :xl="2"> <span>领取人:</span></el-col>
           <el-col :xs="11" :sm="9" :md="7" :lg="6" :xl="5"
-            ><span>{{ info?.T_date! }}</span></el-col
+            ><span>{{ info?.T_receive_name! }}</span></el-col
           >
         </el-row>
         <div v-if="info?.T_type === 2">
@@ -209,8 +209,8 @@ onMounted(() => {
         }"
       >
         <template v-for="item in snColumns" :key="item">
-          <el-table-column v-if="item.type === 'index'" v-bind="item" />
-          <el-table-column v-if="item.prop" v-bind="item" />
+          <el-table-column show-overflow-tooltip v-if="item.type === 'index'" v-bind="item" />
+          <el-table-column show-overflow-tooltip v-if="item.prop" v-bind="item" />
         </template>
       </el-table>
     </Drawer>

+ 5 - 3
src/views/storehouse/outStock/OutStockProduct.vue

@@ -129,6 +129,8 @@ const productColumns = [
   { type: 'selection', width: 80 },
   { prop: 'T_product_img', label: '产品图片', name: 'T_product_img' },
   { prop: 'T_product_name', label: '产品名称' },
+  { prop: 'T_product_model', label: '产品型号' },
+
   { prop: 'T_product_class_name', label: '产品分类' },
   { prop: 'T_product_model', label: '产品型号', ellipsis: true },
   { prop: 'T_product_spec', label: '产品规格' },
@@ -213,7 +215,7 @@ defineExpose({
       >
         <template v-for="item in productColumns" :key="item">
           <el-table-column v-if="item.type === 'index' || item.type === 'selection'" align="center" v-bind="item" />
-          <el-table-column v-if="!item.ellipsis && item.prop" v-bind="item" align="center">
+          <el-table-column show-overflow-tooltip v-if="!item.ellipsis && item.prop" v-bind="item" align="center">
             <template #default="{ row }">
               <span v-if="item.prop === 'T_product_relation_sn'">
                 <el-tag v-if="row.T_product_relation_sn === 1" effect="dark">是</el-tag>
@@ -222,14 +224,14 @@ defineExpose({
               <ImageCom v-if="item.prop === 'T_product_img'" :src="row.T_product_img" />
             </template>
           </el-table-column>
-          <el-table-column v-if="item.ellipsis && item.prop === 'T_model'" align="center" v-bind="item">
+          <el-table-column show-overflow-tooltip v-if="item.ellipsis && item.prop === 'T_model'" align="center" v-bind="item">
             <template #default="{ row }">
               <el-tooltip effect="dark" :content="row.T_model" placement="bottom">
                 {{ row.T_model }}
               </el-tooltip>
             </template>
           </el-table-column>
-          <el-table-column v-if="item.ellipsis && item.prop === 'T_remark'" align="center" v-bind="item">
+          <el-table-column show-overflow-tooltip v-if="item.ellipsis && item.prop === 'T_remark'" align="center" v-bind="item">
             <template #default="{ row }">
               <el-tooltip effect="customized" placement="left">
                 <template #content>

+ 4 - 3
src/views/storehouse/outStock/ReceiveOutStock.vue

@@ -54,6 +54,7 @@ const columns = [
   { type: 'index', label: '序号', width: 80, align: 'center ' },
   { label: '产品图片', prop: 'T_product_img', align: 'center ', name: 'T_product_img' },
   { label: '产品名称', prop: 'T_product_name', align: 'center ' },
+  { label: '产品型号', prop: 'T_product_model', align: 'center ' },
   { label: '产品分类', prop: 'T_product_class_name', align: 'center ' },
   { label: '产品型号', prop: 'T_product_model', align: 'center ', ellipsis: true },
   { label: '产品规格', prop: 'T_product_spec', align: 'center ' },
@@ -250,7 +251,7 @@ const changeDepot = () => drawerProductRef.value?.clearProdctData()
           }"
         >
           <template v-for="item in columns" :key="item.prop">
-            <el-table-column v-bind="item" v-if="item.fixed !== 'right' && !item.ellipsis">
+            <el-table-column show-overflow-tooltip v-bind="item" v-if="item.fixed !== 'right' && !item.ellipsis">
               <template #header v-if="item.prop === 'count' || item.prop === 'sn'">
                 <span style="color: red">{{ item.label }}</span>
               </template>
@@ -281,7 +282,7 @@ const changeDepot = () => drawerProductRef.value?.clearProdctData()
                 <ImageCom v-if="item.prop === 'T_product_img'" :src="row.T_product_img" />
               </template>
             </el-table-column>
-            <el-table-column v-if="item.ellipsis && item.prop === 'T_model'" v-bind="item">
+            <el-table-column show-overflow-tooltip v-if="item.ellipsis && item.prop === 'T_model'" v-bind="item">
               <template #default="{ row }">
                 <el-tooltip effect="dark" :content="row.T_model" placement="bottom">
                   {{ row.T_model }}
@@ -317,7 +318,7 @@ const changeDepot = () => drawerProductRef.value?.clearProdctData()
       </div>
     </el-form>
     <InStorageSn ref="drawerSnRef" @onCount="autoGetCount" />
-    <ReceiveUser ref="receiveUserdialog" :dept_leader="1" @onUserInfo="getReceiveInfo" title="选择经办人" />
+    <ReceiveUser ref="receiveUserdialog" :dept_leader="0" @onUserInfo="getReceiveInfo" title="选择经办人" />
     <OutStockProduct
       ref="drawerProductRef"
       :depotId="form.T_depot_id"

+ 5 - 4
src/views/storehouse/outStock/SaleOutStock.vue

@@ -42,6 +42,7 @@ const columns = [
   { type: 'index', label: '序号', width: 80, align: 'center ' },
   { label: '产品图片', prop: 'T_product_img', align: 'center ', name: 'T_product_img', width: 100 },
   { label: '产品名称', prop: 'T_product_name', align: 'center ' },
+  { label: '产品型号', prop: 'T_product_model', align: 'center ' },
   { label: '产品分类', prop: 'T_product_class_name', align: 'center ' },
   { label: '产品型号', prop: 'T_product_model', align: 'center ', ellipsis: true },
   { label: '产品规格', prop: 'T_product_spec', align: 'center ' },
@@ -273,7 +274,7 @@ const { options } = depotHooks()
           }"
         >
           <template v-for="item in columns" :key="item.prop">
-            <el-table-column v-bind="item" v-if="item.fixed !== 'right' && !item.ellipsis">
+            <el-table-column v-bind="item" v-if="item.fixed !== 'right' && !item.ellipsis" tooltip-effect="dark" :show-overflow-tooltip="true">
               <template #header v-if="item.prop === 'count' || item.prop === 'sn'">
                 <span style="color: red">{{ item.label }}</span>
               </template>
@@ -304,14 +305,14 @@ const { options } = depotHooks()
                 <ImageCom v-if="item.prop === 'T_product_img'" :src="row.T_product_img" />
               </template>
             </el-table-column>
-            <el-table-column v-if="item.ellipsis && item.prop === 'T_model'" v-bind="item">
+            <el-table-column v-if="item.ellipsis && item.prop === 'T_model'" v-bind="item" tooltip-effect="dark" :show-overflow-tooltip="true">
               <template #default="{ row }">
                 <el-tooltip effect="dark" :content="row.T_model" placement="bottom">
                   {{ row.T_model }}
                 </el-tooltip>
               </template>
             </el-table-column>
-            <el-table-column v-bind="item" v-if="item.fixed === 'right'">
+            <el-table-column v-bind="item" v-if="item.fixed === 'right'" tooltip-effect="dark" :show-overflow-tooltip="true">
               <template #default="{ row }">
                 <el-button link type="danger" size="small" :icon="Delete" @click="deleteProduct(row)">删除</el-button>
               </template>
@@ -363,7 +364,7 @@ const { options } = depotHooks()
       </div>
     </el-form>
     <InStorageSn ref="drawerSnRef" @onCount="autoGetCount" />
-    <ReceiveUser ref="receiveUserdialog" :dept_leader="1" @onUserInfo="getReceiveInfo" title="选择经办人" />
+    <ReceiveUser ref="receiveUserdialog" :dept_leader="0" @onUserInfo="getReceiveInfo" title="选择经办人" />
     <ContractNumber ref="contractNumberRef" @onContactInfo="getContactInfo" />
   </div>
 </template>

+ 4 - 4
src/views/storehouse/sales/ContractDetail.vue

@@ -191,7 +191,7 @@ onUnmounted(() => {
           <el-col :span="21">
             <el-table border stripe :data="tableData" style="width: 100%" :header-cell-style="headerCellStyle">
               <template v-for="item in columns" :key="item.prop">
-                <el-table-column v-bind="item" v-if="item.fixed !== 'right'">
+                <el-table-column show-overflow-tooltip v-bind="item" v-if="item.fixed !== 'right'">
                   <template #default="{ row }" v-if="item.prop === item.name">
                     <span v-if="item.prop === 'T_product_relation_sn'">
                       <el-tag v-if="row.T_product_relation_sn === 1" effect="dark">是</el-tag>
@@ -325,7 +325,7 @@ onUnmounted(() => {
           <el-col :xs="8" :sm="6" :md="4" :lg="3" :xl="2"><span>开票明细</span></el-col>
           <el-col :span="21">
             <el-table border stripe :data="invoiceTableData" style="width: 100%" :header-cell-style="headerCellStyle">
-              <el-table-column v-bind="item" v-for="item in columnsInvoice" :key="item.prop"></el-table-column>
+              <el-table-column show-overflow-tooltip v-bind="item" v-for="item in columnsInvoice" :key="item.prop"></el-table-column>
             </el-table>
           </el-col>
         </el-row>
@@ -351,8 +351,8 @@ onUnmounted(() => {
     <Drawer ref="drawerSnRef" :handleClose="callbackSnDrawer" size="30%">
       <el-table :data="tableSnData" style="width: 100%; height: 99%" :header-cell-style="headerCellStyle">
         <template v-for="item in snColumns" :key="item">
-          <el-table-column v-if="item.type === 'index'" v-bind="item" />
-          <el-table-column v-if="item.prop" v-bind="item" />
+          <el-table-column show-overflow-tooltip v-if="item.type === 'index'" v-bind="item" />
+          <el-table-column show-overflow-tooltip v-if="item.prop" v-bind="item" />
         </template>
       </el-table>
     </Drawer>

+ 1 - 1
src/views/storehouse/sales/ContractForm.vue

@@ -278,7 +278,7 @@ defineExpose({
             :header-cell-style="{ background: '#dedfe0', height: '50px' }"
           >
             <template v-for="item in columns" :key="item.prop">
-              <el-table-column v-bind="item" v-if="item.fixed !== 'right'">
+              <el-table-column show-overflow-tooltip v-bind="item" v-if="item.fixed !== 'right'">
                 <template #header v-if="item.prop === 'count'">
                   <span style="color: red">*数量</span>
                 </template>

+ 1 - 1
src/views/storehouse/sales/MyPercentageForm.vue

@@ -301,7 +301,7 @@ defineExpose({
           <el-table border stripe :data="tableData" style="width: 100%"
             :header-cell-style="{ background: '#dedfe0', height: '50px' }">
             <template v-for="item in Mycolumns" :key="item.prop">
-              <el-table-column v-bind="item" v-if="item.fixed !== 'right'">
+              <el-table-column show-overflow-tooltip v-bind="item" v-if="item.fixed !== 'right'">
                 <template #header v-if="item.prop === 'T_num'">
                   <span style="color: red">*数量</span>
                 </template>

+ 2 - 2
src/views/storehouse/sales/PercentageDetail.vue

@@ -317,8 +317,8 @@ const InvoiceRef = ref<InstanceType<typeof PercentageTable> | null>(null)
     <Drawer ref="drawerSnRef" :handleClose="callbackSnDrawer" size="30%">
       <el-table :data="tableSnData" style="width: 100%; height: 99%" :header-cell-style="headerCellStyle">
         <template v-for="item in snColumns" :key="item">
-          <el-table-column v-if="item.type === 'index'" v-bind="item" />
-          <el-table-column v-if="item.prop" v-bind="item" />
+          <el-table-column show-overflow-tooltip v-if="item.type === 'index'" v-bind="item" />
+          <el-table-column show-overflow-tooltip v-if="item.prop" v-bind="item" />
         </template>
       </el-table>
     </Drawer>

+ 1 - 1
src/views/storehouse/sales/PercentageDetail1.vue

@@ -296,7 +296,7 @@ defineExpose({
           <el-table border stripe :data="tableData" style="width: 100%"
             :header-cell-style="{ background: '#dedfe0', height: '50px' }">
             <template v-for="item in Mycolumns" :key="item.prop">
-              <el-table-column v-bind="item" v-if="item.fixed !== 'right'">
+              <el-table-column show-overflow-tooltip v-bind="item" v-if="item.fixed !== 'right'">
                 <template #header v-if="item.prop === 'T_num'">
                   <span style="color: red">*数量</span>
                 </template>

+ 2 - 2
src/views/storehouse/sales/PercentageForm.vue

@@ -288,7 +288,7 @@ defineExpose({
           <el-table border stripe :data="tableData" style="width: 100%"
             :header-cell-style="{ background: '#dedfe0', height: '50px' }">
             <template v-for="item in columns" :key="item.prop">
-              <el-table-column v-bind="item" v-if="item.fixed !== 'right'">
+              <el-table-column show-overflow-tooltip v-bind="item" v-if="item.fixed !== 'right'">
                 <template #header v-if="item.prop === 'count'">
                   <span style="color: red">*数量</span>
                 </template>
@@ -309,7 +309,7 @@ defineExpose({
           <el-table border stripe :data="tableDatalty" style="width: 100%"
             :header-cell-style="{ background: '#dedfe0', height: '50px' }">
             <template v-for="item in royalty" :key="item.prop">
-              <el-table-column v-bind="item">
+              <el-table-column show-overflow-tooltip v-bind="item">
                 <template #default="{ row }" v-if="item.prop === item.name">
                   <div v-if="item.prop === 'T_priceNum'">{{Number(row.T_num) * Number(row.T_price)}}</div>
                 </template>

+ 1 - 1
src/views/storehouse/sales/PercentageTable.vue

@@ -78,7 +78,7 @@ defineExpose({
   <div class="table-detail">
     <el-table border stripe :data="tableData" style="width: 100%" :header-cell-style="{ height: '50px' }">
       <template v-for="item in columns" :key="item.prop">
-        <el-table-column v-bind="item" v-if="item.fixed !== 'right'"></el-table-column>
+        <el-table-column show-overflow-tooltip v-bind="item" v-if="item.fixed !== 'right'"></el-table-column>
         <el-table-column v-bind="item" v-if="item.fixed === 'right' && props.showTable">
           <template #default="{ row }">
             <el-button link type="primary" size="small" :icon="Edit" @click="AddMoneyDetailed('edit', row)" >编辑</el-button >

+ 1 - 1
src/views/storehouse/sales/TableDetail.vue

@@ -77,7 +77,7 @@ defineExpose({
   <div class="table-detail">
     <el-table border stripe :data="tableData" style="width: 100%" :header-cell-style="{ height: '50px' }">
       <template v-for="item in columns" :key="item.prop">
-        <el-table-column v-bind="item" v-if="item.fixed !== 'right'"></el-table-column>
+        <el-table-column show-overflow-tooltip v-bind="item" v-if="item.fixed !== 'right'"></el-table-column>
         <el-table-column v-bind="item" v-if="item.fixed === 'right'">
           <template #default="{ row }">
             <el-button link type="primary" size="small" :icon="Edit" @click="AddMoneyDetailed('edit', row)"

+ 1 - 1
src/views/storehouse/sales/VerifyForm.vue

@@ -320,7 +320,7 @@ defineExpose({
             :header-cell-style="{ height: '50px' }"
           >
             <template v-for="item in verifyFormColumns" :key="item.prop">
-              <el-table-column v-bind="item" v-if="item.fixed !== 'right'">
+              <el-table-column show-overflow-tooltip v-bind="item" v-if="item.fixed !== 'right'">
                 <template #header v-if="item.prop === 'count'">
                   <span style="color: red">*数量</span>
                 </template>

+ 3 - 3
src/views/storehouse/sales/VerifyProject.vue

@@ -95,7 +95,7 @@ defineExpose({
     >
       <template v-for="item in productColumns" :key="item">
         <el-table-column v-if="item.type === 'index' || item.type === 'selection'" align="center" v-bind="item" />
-        <el-table-column v-if="!item.ellipsis && item.prop" v-bind="item">
+        <el-table-column show-overflow-tooltip v-if="!item.ellipsis && item.prop" v-bind="item">
           <template #default="{ row }">
             <span v-if="item.prop === 'T_relation_sn'">
               <el-tag v-if="row.T_relation_sn === 1" effect="dark">是</el-tag>
@@ -104,14 +104,14 @@ defineExpose({
             <ImageCom v-if="item.prop === 'T_img'" :src="row.T_img" />
           </template>
         </el-table-column>
-        <el-table-column v-if="item.ellipsis && item.prop === 'T_model'" align="center" v-bind="item">
+        <el-table-column show-overflow-tooltip v-if="item.ellipsis && item.prop === 'T_model'" align="center" v-bind="item">
           <template #default="{ row }">
             <el-tooltip effect="dark" :content="row.T_model" placement="bottom">
               {{ row.T_model }}
             </el-tooltip>
           </template>
         </el-table-column>
-        <el-table-column v-if="item.ellipsis && item.prop === 'T_remark'" align="center" v-bind="item">
+        <el-table-column show-overflow-tooltip v-if="item.ellipsis && item.prop === 'T_remark'" align="center" v-bind="item">
           <template #default="{ row }">
             <el-tooltip effect="customized" placement="left">
               <template #content>

+ 5 - 5
src/views/storehouse/sales/verifyxiang.vue

@@ -192,7 +192,7 @@ defineExpose({
                             <el-table border stripe :data="tableData" style="width: 100%"
                                 :header-cell-style="headerCellStyle">
                                 <template v-for="item in columns" :key="item.prop">
-                                    <el-table-column v-bind="item" v-if="item.fixed !== 'right'">
+                                    <el-table-column show-overflow-tooltip v-bind="item" v-if="item.fixed !== 'right'">
                                         <template #default="{ row }" v-if="item.prop === item.name">
                                             <span v-if="item.prop === 'T_product_relation_sn'">
                                                 <el-tag v-if="row.T_product_relation_sn === 1" effect="dark">是</el-tag>
@@ -285,7 +285,7 @@ defineExpose({
                         <el-col :span="21">
                             <el-table border stripe :data="recoveriesTableData" style="width: 100%"
                                 :header-cell-style="headerCellStyle">
-                                <el-table-column v-bind="item" v-for="item in columnsRecoveries"
+                                <el-table-column show-overflow-tooltip v-bind="item" v-for="item in columnsRecoveries"
                                     :key="item.prop"></el-table-column>
                             </el-table>
                         </el-col>
@@ -303,7 +303,7 @@ defineExpose({
                         <el-col :span="21">
                             <el-table border stripe :data="invoiceTableData" style="width: 100%"
                                 :header-cell-style="headerCellStyle">
-                                <el-table-column v-bind="item" v-for="item in columnsInvoice"
+                                <el-table-column show-overflow-tooltip v-bind="item" v-for="item in columnsInvoice"
                                     :key="item.prop"></el-table-column>
                             </el-table>
                         </el-col>
@@ -327,8 +327,8 @@ defineExpose({
             <Drawer ref="drawerSnRef" :handleClose="callbackSnDrawer" size="30%">
                 <el-table :data="tableSnData" style="width: 100%; height: 99%" :header-cell-style="headerCellStyle">
                     <template v-for="item in snColumns" :key="item">
-                        <el-table-column v-if="item.type === 'index'" v-bind="item" />
-                        <el-table-column v-if="item.prop" v-bind="item" />
+                        <el-table-column show-overflow-tooltip v-if="item.type === 'index'" v-bind="item" />
+                        <el-table-column show-overflow-tooltip v-if="item.prop" v-bind="item" />
                     </template>
                 </el-table>
             </Drawer>