Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter

src/views/collect/DealOrder.vue

@@ -631,7 +631,7 @@ export default {
     },
     findFromInvList(val) {
       let cQuery = {
-        corpType: 3,
+        corpType:  this.formDataVisible.consignee,
         invCode: this.formData.invCode
       };
       findFromCorp(cQuery)
@@ -1010,7 +1010,7 @@ export default {
         workPlaceCode: this.formData.workPlaceCode,
         fromCorp: this.formData.fromCorp,
         fromCorpName: this.formData.fromCorpName,
-        shipper: this.formData.invCode,
+        shipper: this.formData.shipper,
         shipperName: this.formData.shipperName,
         billNo: this.formData.billNo,
         code: this.filterQuery.code.trim(),
@@ -1429,6 +1429,7 @@ export default {
     changeShipper() {
       let corp = this.invList.find(item => item.code === this.formData.shipper);
       this.formData.shipperName = corp.name
+      this.formData.shipper = corp.code
     },
     //处理事件
     handleRecCodesEvent(event) {

src/views/inoutDrug/IoAuditedOrder.vue

@@ -197,87 +197,7 @@
                 @row-click="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)"
                 :default-sort="defaultSort"
                 @sort-change="handleSortChange">
-<!--        <el-table-column label="序号" type="index"></el-table-column>-->
-<!--        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>-->
-<!--        <el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>-->
-<!--        <el-table-column label="往来单位" prop="fromName" width="220">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="创建时间" prop="createTime" show-overflow-tooltip width="150"-->
-<!--                         sortable="custom"-->
-<!--                         :sort-orders="['ascending', 'descending']">-->
-<!--          <template slot-scope="scope">-->
-<!--            <i class="el-icon-time"></i>-->
-<!--            <span>{{ scope.row.createTime }}</span>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-
-<!--        <el-table-column label="审核时间" prop="auditTime" show-overflow-tooltip width="150"-->
-<!--                         sortable="custom"-->
-<!--                         :sort-orders="['ascending', 'descending']">-->
-<!--          <template slot-scope="scope">-->
-<!--            <i class="el-icon-time"></i>-->
-<!--            <span>{{ scope.row.auditTime }}</span>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-
-
-<!--        <el-table-column label="所属部门" prop="deptName" width="120">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="所属仓库" prop="invName" width="120">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="审核人" prop="reviewUserName" width="120">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>-->
-<!--        <el-table-column label="来源" prop="fromType" width="120">-->
-<!--          <template slot-scope="scope">-->
-<!--            <span>{{ fromTypeMap[scope.row.fromType] }}</span>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="审核状态" prop="status" width="100">-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-tag :type="statusFilterType(scope.row.status)">{{-->
-<!--                checkStatus[scope.row.status]-->
-<!--              }}-->
-<!--            </el-tag>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="操作" width="200" fixed="right">-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-button-->
-<!--              type="text"-->
-<!--              size="small"-->
-<!--              @click.native.stop="printOrder(scope.row)"-->
-<!--            >打印-->
-<!--            </el-button-->
-<!--            >-->
-<!--            &lt;!&ndash;            <el-button&ndash;&gt;-->
-<!--            &lt;!&ndash;                type="text"&ndash;&gt;-->
-<!--            &lt;!&ndash;                size="small"&ndash;&gt;-->
-<!--            &lt;!&ndash;                @click.native="printOrderDetailPDF(scope.row)"&ndash;&gt;-->
-<!--            &lt;!&ndash;            >报表打印&ndash;&gt;-->
-<!--            &lt;!&ndash;            </el-button&ndash;&gt;-->
-<!--            &lt;!&ndash;            >&ndash;&gt;-->
-<!--            &lt;!&ndash;            暂时隐藏&ndash;&gt;-->
-<!--            &lt;!&ndash;            <el-button&ndash;&gt;-->
-<!--            &lt;!&ndash;              type="text"&ndash;&gt;-->
-<!--            &lt;!&ndash;              size="small"&ndash;&gt;-->
-<!--            &lt;!&ndash;              @click.native.stop="rollback(scope.row)"&ndash;&gt;-->
-<!--            &lt;!&ndash;            >撤回&ndash;&gt;-->
-<!--            &lt;!&ndash;            </el-button&ndash;&gt;-->
-<!--            &lt;!&ndash;            >&ndash;&gt;-->
-
-<!--            <el-button-->
-<!--              type="text"-->
-<!--              size="small"-->
-<!--              @click.native="generOrder(scope.row)"-->
-<!--            >复制-->
-<!--            </el-button>-->
-
-
-<!--          </template>-->
-<!--        </el-table-column>-->
+<
         <template v-for="(item, index) in tableHeader">
           <el-table-column
             v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"