yusheng преди 11 месеца
родител
ревизия
d33d0b1271

+ 2 - 0
src/views/bpm/handleTask/components/financialManage/feeManage/feeApplication/detailDialog.vue

@@ -189,6 +189,8 @@ export default {
     //获取详情
     async getFeeApplyInfoInfo(id) {
       this.form = await getFeeApplyInfoAPI(id)
+      this.form.documentType = this.form.documentType + '';
+
     },
     downloadFile(file) {
       getFile({objectName: file.storePath}, file.name);

+ 3 - 3
src/views/bpm/handleTask/components/marketManagem/view.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-form ref="form" class="el-form-box" :model="form" label-width="0">
+  <el-form ref="form" class="el-form-box" :model="form" label-width="0" style="padding:20px">
     <el-row :gutter="15">
       <el-descriptions title="基本信息" :column="4">
         <el-descriptions-item label="编码">
@@ -35,7 +35,7 @@
         </el-descriptions-item>
         <el-descriptions-item label="时间">
           {{ form.start }}
-          <span style="margin-left: 15px" v-if="TimeArr.length > 1">
+          <span style="margin-left: 15px" v-if="TimeArr?.length > 1">
             {{ getTimeArr }} 天
           </span>
         </el-descriptions-item>
@@ -62,7 +62,7 @@
     <el-row
       :gutter="15"
       style="margin-top: 20px"
-      v-if="form.receptionProjectList.length > 0"
+      v-if="form.receptionProjectList?.length > 0"
     >
       <el-col :span="24">
         <el-tabs

+ 2 - 2
src/views/bpm/handleTask/components/purchasePlanManage/detailDialog.vue

@@ -170,7 +170,7 @@
       </el-tabs>
     </el-form>
     <timeDialog ref="timeDialogRef" :view="true"></timeDialog>
-    <div class="title"> 入库单信息</div>
+    <div class="title" v-if="['3', '4', '5'].includes(form.sourceType)"> 入库单信息</div>
 
     <div v-if="taskDefinitionKey == 'storeManagerApprove'">
       <add
@@ -182,7 +182,7 @@
         :bizType="2"
       ></add>
     </div>
-    <div v-if="view && ['3', '4', '5'].includes(form.sourceType)">
+    <div v-if="isView && ['3', '4', '5'].includes(form.sourceType)">
       <detailDialog
         ref="inoutBoundViewRef"
         :bizType="2"

+ 2 - 2
src/views/bpm/stockManagement/details.vue

@@ -136,12 +136,12 @@
               :prop="item.prop" :show-overflow-tooltip="item.showOverflowTooltip"></el-table-column>
             <el-table-column label="批次号" prop="batchNo" align="center" :show-overflow-tooltip="true">
             </el-table-column>
-            <el-table-column label="包装数量" v-if="clientEnvironmentId == 3" prop="packingQuantity" align="center">
+            <el-table-column label="数量" v-if="clientEnvironmentId == 3" prop="packingQuantity" align="center">
               <template slot-scope="{ row, $index }">
                 {{ row.packingQuantity }} {{ row.packingUnit }}
               </template>
             </el-table-column>
-            <el-table-column v-else label="包装数量" prop="packingQuantity" width="80"></el-table-column>
+            <el-table-column v-else label="数量" prop="packingQuantity" width="80"></el-table-column>
             <el-table-column v-if="clientEnvironmentId == 3" label="最小包装单元" align="center" width="120"
               prop="minPackingQuantity">
               <template slot-scope="{ row, $index }">