bug

src/BIZComponents/addDoc/index.vue

@@ -1,8 +1,26 @@
 <template>
   <div>
-    <el-button icon="el-icon-plus" v-if="type!='view'" type="primary" @click="handleUpload"> 上传</el-button>
-    <el-button icon="el-icon-view" v-else type="primary" @click="handleUpload"> 查看</el-button>
-    <file-upload @success="getFiles" ref="fileUploadRef"></file-upload>
+    <el-badge :value="value?.length" class="item">
+
+<el-button
+    icon="el-icon-plus"
+    v-if="type != 'view'"
+    type="primary"
+    @click="handleUpload"
+  >
+    上传</el-button
+  >
+  <el-button
+    icon="el-icon-view"
+    v-else
+    type="primary"
+    @click="handleUpload"
+  >
+    查看</el-button
+  >
+</el-badge>
+
+<file-upload @success="getFiles" ref="fileUploadRef"></file-upload>
   </div>
 </template>
 

src/BIZComponents/outdetails.vue

@@ -55,7 +55,7 @@
                 <el-form-item
                   :label="infoData.bizType == 4 ? '领料单:' : '来源单据:'"
                 >
-                <span>{{ infoData.bizNo&&infoData.bizNo.toString() }}</span>
+                <span>{{ infoData.sourceBizNo }}</span>
                 </el-form-item>
               </el-col>
               <el-col :span="8">

src/components/addDoc/index.vue

@@ -1,7 +1,25 @@
 <template>
   <div>
-    <el-button icon="el-icon-plus" v-if="type!='view'" type="primary" @click="handleUpload"> 上传</el-button>
-    <el-button icon="el-icon-view" v-else type="primary" @click="handleUpload"> 查看</el-button>
+    <el-badge :value="value?.length" class="item">
+
+    <el-button
+        icon="el-icon-plus"
+        v-if="type != 'view'"
+        type="primary"
+        @click="handleUpload"
+      >
+        上传</el-button
+      >
+      <el-button
+        icon="el-icon-view"
+        v-else
+        type="primary"
+        @click="handleUpload"
+      >
+        查看</el-button
+      >
+    </el-badge>
+
     <file-upload @success="getFiles" ref="fileUploadRef"></file-upload>
   </div>
 </template>

src/views/bpm/handleTask/components/purchaseOrder/invoice/detailDialog.vue

@@ -64,29 +64,12 @@
               style="margin-bottom: 16px"
             >
               <fileMain v-model="form.receiveFiles" type="view"></fileMain>
-              <!--              <div v-if="detailData.sendFiles && detailData.sendFiles?.length">-->
-              <!--                <el-link-->
-              <!--                  v-for="link in detailData.sendFiles"-->
-              <!--                  :key="link.id"-->
-              <!--                  type="primary"-->
-              <!--                  :underline="false"-->
-              <!--                  @click="downloadFile(link)"-->
-              <!--                >-->
-              <!--                  {{ link.name }}</el-link-->
-              <!--                >-->
-              <!--              </div>-->
+             
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <!--            <el-form-item-->
-            <!--              label="采购单类型："-->
-            <!--              prop="receiveTypeName"-->
-            <!--              style="margin-bottom: 16px"-->
-            <!--            >-->
-            <!--              {{ form.receiveTypeName }}-->
-            <!--            </el-form-item>-->
-
+          
             <el-form-item
               label="收货单编码："
               prop="receiveNo"
@@ -134,25 +117,10 @@
         :datasource="detailData.productList"
         row-key="id"
       >
-        <!-- <template v-slot:toolbar>
-        <div class="headbox">
-        <span class="amount">总计：{{detailData.totalAmount}}元</span>
-        <span class="amount">应付金额：{{detailData.payAmount}}元</span>
-      </div>
-      </template> -->
+
         <template v-slot:technicalDrawings="{ row }">
           <fileMain v-model="row.receiveFiles" type="view"></fileMain>
-          <!--          <div v-if="row.technicalDrawings && row.technicalDrawings?.length">-->
-          <!--            <el-link-->
-          <!--              v-for="link in row.technicalDrawings"-->
-          <!--              :key="link.id"-->
-          <!--              type="primary"-->
-          <!--              :underline="false"-->
-          <!--              @click="downloadFile(link)"-->
-          <!--            >-->
-          <!--              {{ link.name }}</el-link-->
-          <!--            >-->
-          <!--          </div>-->
+          
         </template>
       </ele-pro-table>
     </div>

src/views/bpm/handleTask/components/purchaseOrder/returnGoods/submit.vue

@@ -40,7 +40,7 @@
         v-if="
           ['storemanApprove'].includes(taskDefinitionKey) &&
           activeComp == 'outBound' &&
-          [0, 3].includes(outInData.verifyStatus)
+          ([0, 3].includes(outInData.verifyStatus)||!outInData.verifyStatus)
         "
         >申请出库
       </el-button>
@@ -186,6 +186,7 @@
         this.$emit('handleBackList');
       },
       activeCompChange(activeComp) {
+        console.log(activeComp,'activeComp')
         this.activeComp = activeComp;
       },
       async handleAudit(status) {

src/views/bpm/handleTask/components/saleOrder/invoice/addInvoiceDialog.vue

@@ -67,15 +67,9 @@
             </el-form-item>
           </el-col>
         </el-row>
+
         <el-row :gutter="20">
-          <el-col :span="12">
-            <el-form-item label="计价方式" style="margin-bottom: 22px">
-              <el-select v-model="form.pricingWay" disabled style="width: 100%">
-                <el-option label="按数量计费" :value="1"></el-option>
-                <el-option label="按重量计费" :value="2"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+          
           <el-col :span="12">
             <el-form-item
               label="客户电话"
@@ -89,8 +83,6 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item
               label="车辆号"
@@ -113,8 +105,6 @@
               />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item prop="sendFiles" label="发货附件">
               <fileMain v-model="form.sendFiles"></fileMain>
@@ -214,7 +204,7 @@
   import orderListDialog from './orderListDialog.vue';
   import { copyObj } from '@/utils/util';
   import EntrustedReceiveDialog from '@/views/bpm/handleTask/components/saleOrder/invoice/entrustedReceiveDialog.vue';
-  import fileMain from "@/components/addDoc/index.vue";
+  import fileMain from "@/BIZComponents/addDoc/index.vue";
 
   export default {
     mixins: [dictMixins],
@@ -393,6 +383,16 @@
             slot: 'weightUnit',
             align: 'center'
           },
+          {
+            width: 160,
+            prop: 'pricingWay',
+            label: '计价方式',
+            slot: 'pricingWay',
+            align: 'center',
+            formatter: (row, column) => {
+              return row.pricingWay == 1 ? '数量' :  row.pricingWay == 2 ? '重量':'';
+            }
+          },
           {
             width: 160,
             prop: 'singlePrice',
@@ -545,9 +545,11 @@
         const data = await getSendSaleOrderrecordDetail(id);
         this.loading = false;
         if (data) {
+          this.form = data;
+          this.form.pricingWay = data?.saleOrder?.pricingWay;
+          data.productList.forEach
           this.$nextTick(() => {
-            this.form = data;
-            this.form.pricingWay = data?.saleOrder?.pricingWay;
+
             this.$refs.inventoryTableref &&
               this.$refs.inventoryTableref.putTableValue(data.productList);
           });

src/views/bpm/handleTask/components/saleOrder/invoice/detailDialog.vue

@@ -418,6 +418,16 @@
             slot: 'weightUnit',
             align: 'center'
           },
+          {
+            width: 160,
+            prop: 'pricingWay',
+            label: '计价方式',
+            slot: 'pricingWay',
+            align: 'center',
+            formatter: (row, column) => {
+              return row.pricingWay == 1 ? '数量' :  row.pricingWay == 2 ? '重量':'';
+            }
+          },
           {
             width: 160,
             prop: 'singlePrice',

src/views/bpm/handleTask/components/saleOrder/invoice/inventoryTable.vue

@@ -443,6 +443,16 @@
             slot: 'weightUnit',
             align: "center"
           },
+          {
+            width: 160,
+            prop: 'pricingWay',
+            label: '计价方式',
+            slot: 'pricingWay',
+            align: 'center',
+            formatter: (row, column) => {
+              return row.pricingWay == 1 ? '数量' :  row.pricingWay == 2 ? '重量':'';
+            }
+          },
           {
             width: 160,
             prop: 'singlePrice',

src/views/bpm/outgoingManagement/details.vue

@@ -112,6 +112,7 @@
               minWidth="150"
               label="出库单号"
               prop="bizNo"
+              v-if="isIds"
               align="center"
               :show-overflow-tooltip="true"
             ></el-table-column>

src/views/bpm/stockManagement/details.vue

@@ -109,6 +109,7 @@
             <el-table-column label="序号" type="index" width="50">
             </el-table-column>
             <el-table-column
+            v-if="isIds"
               minWidth="150"
               label="入库单号"
               prop="bizNo"

src/views/bpm/stockManagement/storage.vue

@@ -1180,7 +1180,7 @@
           this.form.categoryLevelTopId != ''
         ) {
           this.formData.extInfo.assetType = Array.from(
-            new Set(this.form.categoryLevelTopId.split(','))
+            new Set(this.form?.categoryLevelTopId?.split(','))
           );
         } else {
           this.$message.warning('未获取到物品类型！');