销售出库单仓储节点默认展示出库单编辑

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

@@ -149,7 +149,7 @@
       :businessId="form.receiveNo"
       type="sourceBizNo"
       ref="detailDialog"
-      :taskDefinitionKey=taskDefinitionKey
+      :taskDefinitionKey="taskDefinitionKey"
     ></detailDialog>
     <add
       ref="add"
@@ -344,6 +344,11 @@
       }
       if (this.taskDefinitionKey == 'storeManagerApprove') {
         this.tabOptions.push({ key: 'inoutBound', name: '入库单' });
+        this.activeComp = 'inoutBound';
+        this.$emit('activeCompChange', 'inoutBound');
+        this.$nextTick(() => {
+          this.$refs.add.pickerSuccess(this.form);
+        });
       }
     },
 
@@ -375,8 +380,13 @@
       getTableValue() {
         return {
           form: this.form,
-          statusList: (this.$refs.detailDialog && this.$refs.detailDialog.getStatus()) || [],
-          qualityInspector: (this.$refs.detailDialog && this.$refs.detailDialog.getQualityFile()) || {},
+          statusList:
+            (this.$refs.detailDialog && this.$refs.detailDialog.getStatus()) ||
+            [],
+          qualityInspector:
+            (this.$refs.detailDialog &&
+              this.$refs.detailDialog.getQualityFile()) ||
+            {}
         };
       },
       async getDetailData(id) {

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

@@ -64,7 +64,7 @@
         v-if="
           ['storeManagerApprove'].includes(taskDefinitionKey) &&
           activeComp == 'inoutBound' &&
-          ![1].includes(outInData.verifyStatus)
+          ![1,2].includes(outInData.verifyStatus)
         "
         >申请入库
       </el-button>

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

@@ -16,165 +16,165 @@
     </div>
     <div v-show="activeComp == 'main'">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-      <headerTitle title="退货信息"></headerTitle>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item
-            label="供应商名称："
-            prop="supplierName"
-            style="margin-bottom: 16px"
-          >
-            {{ form.supplierName }}
-          </el-form-item>
+        <headerTitle title="退货信息"></headerTitle>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item
+              label="供应商名称："
+              prop="supplierName"
+              style="margin-bottom: 16px"
+            >
+              {{ form.supplierName }}
+            </el-form-item>
 
-          <el-form-item
-            label="金额："
-            prop="payAmount"
-            style="margin-bottom: 16px"
-          >
-            {{ form.payAmount }}元
-          </el-form-item>
-          <el-form-item
-            label="总金额："
-            prop="totalAmount"
-            style="margin-bottom: 16px"
-          >
-            {{ form.totalAmount }}元
-          </el-form-item>
-          <el-form-item
-            label="供应商联系人："
-            prop="linkName"
-            style="margin-bottom: 16px"
-          >
-            {{ form.linkName }}
-          </el-form-item>
-          <el-form-item
-            label="备注："
-            prop="remark"
-            style="margin-bottom: 16px"
-          >
-            {{ form.remark }}
-          </el-form-item>
-          <el-form-item
-            label="创建时间："
-            prop="createTime"
-            style="margin-bottom: 16px"
-          >
-            {{ form.createTime }}
-          </el-form-item>
-          <el-form-item
-            label="制单人："
-            prop="makerName"
-            style="margin-bottom: 16px"
-          >
-            {{ form.makerName }}
-          </el-form-item>
-          <el-form-item
-            v-if="taskDefinitionKey == 'purchaserUploadReceipt'"
-            prop="repliedFiles"
-            label="回执附件"
-            :rules="[{ required: true, trigger: 'blur' }]"
-          >
-            <fileUpload
-              v-model="form.repliedFiles"
-              module="main"
-              :showLib="false"
-              :limit="10"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item
-            label="退货单编码："
-            prop="returnNo"
-            style="margin-bottom: 16px"
-          >
-            {{ form.returnNo }}
-          </el-form-item>
-          <el-form-item
-            label="收货单编码："
-            prop="receiveNo"
-            style="margin-bottom: 16px"
-          >
-            {{ form.receiveNo }}
-          </el-form-item>
-          <el-form-item prop="orderNo" label="订单编码：">
-            {{ form.orderNo }}
-          </el-form-item>
-          <el-form-item
-            prop="linkPhone"
-            label-width="150px"
-            label="供应商联系电话："
-          >
-            {{ form.linkPhone }}
-          </el-form-item>
+            <el-form-item
+              label="金额："
+              prop="payAmount"
+              style="margin-bottom: 16px"
+            >
+              {{ form.payAmount }}元
+            </el-form-item>
+            <el-form-item
+              label="总金额："
+              prop="totalAmount"
+              style="margin-bottom: 16px"
+            >
+              {{ form.totalAmount }}元
+            </el-form-item>
+            <el-form-item
+              label="供应商联系人："
+              prop="linkName"
+              style="margin-bottom: 16px"
+            >
+              {{ form.linkName }}
+            </el-form-item>
+            <el-form-item
+              label="备注："
+              prop="remark"
+              style="margin-bottom: 16px"
+            >
+              {{ form.remark }}
+            </el-form-item>
+            <el-form-item
+              label="创建时间："
+              prop="createTime"
+              style="margin-bottom: 16px"
+            >
+              {{ form.createTime }}
+            </el-form-item>
+            <el-form-item
+              label="制单人："
+              prop="makerName"
+              style="margin-bottom: 16px"
+            >
+              {{ form.makerName }}
+            </el-form-item>
+            <el-form-item
+              v-if="taskDefinitionKey == 'purchaserUploadReceipt'"
+              prop="repliedFiles"
+              label="回执附件"
+              :rules="[{ required: true, trigger: 'blur' }]"
+            >
+              <fileUpload
+                v-model="form.repliedFiles"
+                module="main"
+                :showLib="false"
+                :limit="10"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item
+              label="退货单编码："
+              prop="returnNo"
+              style="margin-bottom: 16px"
+            >
+              {{ form.returnNo }}
+            </el-form-item>
+            <el-form-item
+              label="收货单编码："
+              prop="receiveNo"
+              style="margin-bottom: 16px"
+            >
+              {{ form.receiveNo }}
+            </el-form-item>
+            <el-form-item prop="orderNo" label="订单编码：">
+              {{ form.orderNo }}
+            </el-form-item>
+            <el-form-item
+              prop="linkPhone"
+              label-width="150px"
+              label="供应商联系电话："
+            >
+              {{ form.linkPhone }}
+            </el-form-item>
 
-          <el-form-item
-            label="审核状态："
-            prop="reviewStatus"
-            style="margin-bottom: 16px"
-          >
-            {{ reviewStatusEnum[form.reviewStatus]?.label }}
-          </el-form-item>
-          <el-form-item
-            prop="receiveAddress"
-            label-width="150px"
-            label="供应商收货地址："
-          >
-            {{ form.receiveAddress }}
-          </el-form-item>
-          <el-form-item
-            label="附件："
-            prop="returnFiles"
-            style="margin-bottom: 16px"
-          >
-            <div
-              v-if="detailData.returnFiles && detailData.returnFiles?.length"
+            <el-form-item
+              label="审核状态："
+              prop="reviewStatus"
+              style="margin-bottom: 16px"
             >
-              <el-link
-                v-for="link in detailData.returnFiles"
-                :key="link.id"
-                type="primary"
-                :underline="false"
-                @click="downloadFile(link)"
-              >
-                {{ link.name }}</el-link
+              {{ reviewStatusEnum[form.reviewStatus]?.label }}
+            </el-form-item>
+            <el-form-item
+              prop="receiveAddress"
+              label-width="150px"
+              label="供应商收货地址："
+            >
+              {{ form.receiveAddress }}
+            </el-form-item>
+            <el-form-item
+              label="附件："
+              prop="returnFiles"
+              style="margin-bottom: 16px"
+            >
+              <div
+                v-if="detailData.returnFiles && detailData.returnFiles?.length"
               >
-            </div>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
+                <el-link
+                  v-for="link in detailData.returnFiles"
+                  :key="link.id"
+                  type="primary"
+                  :underline="false"
+                  @click="downloadFile(link)"
+                >
+                  {{ link.name }}</el-link
+                >
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
 
-    <headerTitle title="产品清单"></headerTitle>
-    <ele-pro-table
-      ref="table"
-      :needPage="false"
-      :columns="columns"
-      :toolkit="[]"
-      :datasource="detailData.productList"
-      row-key="id"
-    >
-      <!-- <template v-slot:toolbar>
+      <headerTitle title="产品清单"></headerTitle>
+      <ele-pro-table
+        ref="table"
+        :needPage="false"
+        :columns="columns"
+        :toolkit="[]"
+        :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 }">
-        <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>
+        <template v-slot:technicalDrawings="{ row }">
+          <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>
     <add
       ref="add"
@@ -182,6 +182,7 @@
       type="sourceBizNo"
       @success="success"
     ></add>
+    <detailDialog type="sourceBizNo" :businessId="form.returnNo" v-if="activeComp == 'outBoundView'"></detailDialog>
   </div>
 </template>
 
@@ -192,13 +193,14 @@
   import dictMixins from '@/mixins/dictMixins';
   import fileUpload from '@/components/upload/fileUpload';
   import add from '@/views/bpm/outgoingManagement/add.vue';
+  import detailDialog from '@/views/bpm/handleTask/components/outBound/detailDialog.vue'
 
   import { reviewStatusEnum } from '@/enum/dict';
   import { getOutInBySourceBizNo } from '@/api/classifyManage';
   export default {
     components: {
       fileUpload,
-      add
+      add,detailDialog
     },
     mixins: [dictMixins],
     data() {
@@ -365,6 +367,10 @@
       if (this.taskDefinitionKey == 'storemanApprove') {
         this.tabOptions.push({ key: 'outBound', name: '出库单' });
       }
+      if (this.taskDefinitionKey == 'purchaserUploadReceipt') {
+        this.tabOptions.push({ key: 'outBoundView', name: '出库单详情' });
+      }
+      
     },
     methods: {
       changeActive(item) {
@@ -384,10 +390,10 @@
         this.codeData = res.data;
       },
       getTableValue() {
-        return{
-          id:this.form.id,
-          repliedFiles:this.form.repliedFiles
-        }
+        return {
+          id: this.form.id,
+          repliedFiles: this.form.repliedFiles
+        };
       },
       downloadFile(file) {
         getFile({ objectName: file.storePath }, file.name);
@@ -411,9 +417,12 @@
           this.form = data;
         }
       },
+      save() {
+        this.$refs.add.handleNewSave();
+      },
       success() {
         this.$emit('handleClose');
-      },
+      }
     }
   };
 </script>

src/views/bpm/outgoingManagement/add.vue

@@ -1208,6 +1208,7 @@
 
       handleSave() {
         this.$refs.formName.validate(async (valid) => {
+          
           if (valid) {
             if (!this.warehousingMaterialList?.length) {
               return this.$message.error('请添加出库明细！');