修改入库、出库页面列表字段顺序

src/views/wisdom/bill/index.vue

@@ -50,8 +50,9 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-table v-loading="loading" ref="billTableRef" :data="billList" highlight-current-row @row-click="(row) => tableInfoRowClick(row, billTableRef)" :row-class-name="tableBillRowClassName" @row-dblclick="billClick"
+        <el-table v-loading="loading" ref="billTableRef" :data="billList" highlight-current-row
-          @selection-change="billSelectionChange">
+          @row-click="(row) => tableInfoRowClick(row, billTableRef)" :row-class-name="tableBillRowClassName"
+          @row-dblclick="billClick" @selection-change="billSelectionChange">
           <!-- <el-table-column type="selection" width="55" align="center" /> -->
           <el-table-column label="单据号" align="center" prop="billNo" width="180" />
           <el-table-column label="库存状态" align="center">
@@ -64,7 +65,7 @@
               <dict-tag :options="dictTagData()" :value="scope.row.bizType" />
             </template>
           </el-table-column>
-          <el-table-column label="理货员" align="center" prop="operatorName" width="100" />
+
           <el-table-column label="入库类型" align="center" prop="operationTypeName" width="120" />
           <el-table-column label="物资类型" align="center" prop="wlTypeName" width="100" />
           <el-table-column label="入库时间" align="center" prop="operationTime" width="170">
@@ -74,6 +75,7 @@
               }}</span>
             </template>
           </el-table-column>
+          <el-table-column label="理货员" align="center" prop="operatorName" width="100" />
           <el-table-column label="操作" align="center" fixed="right" width="260">
             <template #default="scope">
               <el-button link type="primary" @click="picDetailFun(scope.row.billNo, 0, 1)">入库图片</el-button>
@@ -128,7 +130,8 @@
             <el-button type="primary" plain icon="Delete" @click="handleOneClickStockDel">一键删除</el-button>
           </el-col>
         </el-row>
-        <el-table v-loading="detailLoading" ref="infoTableRef" highlight-current-row @row-click="(row) => tableInfoRowClick(row, infoTableRef)" show-overflow-tooltip border :data="stockList"
+        <el-table v-loading="detailLoading" ref="infoTableRef" highlight-current-row
+          @row-click="(row) => tableInfoRowClick(row, infoTableRef)" show-overflow-tooltip border :data="stockList"
           @selection-change="printSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
           <el-table-column label="序号" align="center" type="index" width="70" />
@@ -310,14 +313,20 @@
         <div class="addBox">
           <div style="display: flex;align-items: center;">
             <div class="addData" @click="addData">
-              <el-icon style="margin-right: 10px;" size="20"><FolderAdd /></el-icon>
+              <el-icon style="margin-right: 10px;" size="20">
+                <FolderAdd />
+              </el-icon>
               添加至入库
             </div>
-            <div @click="viewData" style="color: #000;text-decoration: underline;margin-left: 5px;">[已添加{{ outTempData.length }}条库存]</div>
+            <div @click="viewData" style="color: #000;text-decoration: underline;margin-left: 5px;">[已添加{{
+              outTempData.length }}条库存]</div>
             <!-- <div @click="viewData" style="color: red;text-decoration: underline;font-weight: bold;">[凭证重复入库或项目已关闭，请点击查看！]</div> -->
           </div>
-          <div v-show="outTempData.length > 0 && planList.length === outTempData.length" @click="deleteData" style="display: flex;align-items: center;color: var(--el-color-primary);">
+          <div v-show="outTempData.length > 0 && planList.length === outTempData.length" @click="deleteData"
-            <el-icon><delete /></el-icon>
+            style="display: flex;align-items: center;color: var(--el-color-primary);">
+            <el-icon>
+              <delete />
+            </el-icon>
             <span>删除</span>
           </div>
         </div>
@@ -1858,7 +1867,6 @@ function isAudit() {
 isAudit();
 </script>
 <style scoped lang="scss">
-
 .printMeBox {
   div {
     line-height: 30px;
@@ -1932,6 +1940,7 @@ isAudit();
   justify-content: space-between;
   margin-bottom: 10px;
   cursor: pointer;
+
   .addData {
     display: flex;
     align-items: center;

src/views/wisdom/outbound/index.vue

@@ -2,101 +2,51 @@
   <div class="app-container">
     <el-splitter>
       <el-splitter-panel size="40%">
-        <el-form
+        <el-form :model="queryParams" ref="queryRef" v-show="showSearch" label-width="80">
-          :model="queryParams"
-          ref="queryRef"
-          v-show="showSearch"
-          label-width="80"
-        >
           <el-row>
             <el-col :span="12">
               <el-form-item label="出库时间" prop="ckTime">
-                <el-date-picker
+                <el-date-picker v-model="ckTime" type="datetimerange" start-placeholder="开始时间" end-placeholder="结束时间"
-                  v-model="ckTime"
+                  format="YYYY/MM/DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
-                  type="datetimerange"
-                  start-placeholder="开始时间"
-                  end-placeholder="结束时间"
-                  format="YYYY/MM/DD HH:mm:ss"
-                  value-format="YYYY-MM-DD HH:mm:ss"
-                />
               </el-form-item>
             </el-col>
             <el-col :span="10">
               <el-form-item label="单据号" prop="billNo">
-                <el-input
+                <el-input v-model="queryParams.billNo" placeholder="请输入单据号" clearable @keyup.enter="handleQuery" />
-                  v-model="queryParams.billNo"
-                  placeholder="请输入单据号"
-                  clearable
-                  @keyup.enter="handleQuery"
-                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10" class="mb8">
             <el-col :span="12">
               <el-form-item label="出库类型" prop="operationType">
-                <el-select
+                <el-select v-model="queryParams.operationType" placeholder="请选择出库类型" clearable>
-                  v-model="queryParams.operationType"
+                  <el-option v-for="dict in storeTypeList" :key="dict.id" :label="dict.typeName"
-                  placeholder="请选择出库类型"
+                    :value="dict.typeCode" />
-                  clearable
-                >
-                  <el-option
-                    v-for="dict in storeTypeList"
-                    :key="dict.id"
-                    :label="dict.typeName"
-                    :value="dict.typeCode"
-                  />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item>
-                <el-button type="primary" icon="Search" @click="handleQuery"
+                <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-                  >搜索</el-button
-                >
                 <el-button icon="Refresh" @click="resetQuery">重置</el-button>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
-              <el-button
+              <el-button type="primary" plain icon="Plus" @click="handleAdd"
-                type="primary"
+                v-hasPermi="['wisdom:bill:add']">新增出库1111</el-button>
-                plain
-                icon="Plus"
-                @click="handleAdd"
-                v-hasPermi="['wisdom:bill:add']"
-                >新增出库</el-button
-              >
             </el-col>
             <el-col :span="1.5">
-              <el-button
+              <el-button type="warning" plain icon="Download" @click="handleExport"
-                type="warning"
+                v-hasPermi="['wisdom:bill:export']">导出</el-button>
-                plain
-                icon="Download"
-                @click="handleExport"
-                v-hasPermi="['wisdom:bill:export']"
-                >导出</el-button
-              >
             </el-col>
           </el-row>
         </el-form>
 
-        <el-table
+        <el-table v-loading="loading" :data="billList" :row-class-name="tableBillRowClassName" @row-dblclick="billClick"
-          v-loading="loading"
+          ref="billTableRef" highlight-current-row @row-click="(row) => tableInfoRowClick(row, billTableRef)">
-          :data="billList"
+          <el-table-column label="单据号" align="center" prop="billNo" width="180" />
-          :row-class-name="tableBillRowClassName"
-          @row-dblclick="billClick"
-          ref="billTableRef" 
-          highlight-current-row 
-          @row-click="(row) => tableInfoRowClick(row, billTableRef)"
-        >
-          <el-table-column
-            label="单据号"
-            align="center"
-            prop="billNo"
-            width="180"
-          />
           <el-table-column label="库存状态" align="center">
             <template #default="scope">
               <span>{{ getExecStatusName(scope.row.execStatus) }}</span>
@@ -109,21 +59,15 @@
           </el-table-column>
           <el-table-column label="是否派送" align="center" prop="isDelivery">
             <template #default="scope">
-              <span v-if="scope.row.isDelivery == '0' || !scope.row.isDelivery"
+              <span v-if="scope.row.isDelivery == '0' || !scope.row.isDelivery">否</span>
-                >否</span
-              >
               <span v-else-if="scope.row.isDelivery === '1'">是</span>
               <span v-else-if="scope.row.isDelivery === '2'">待配送</span>
               <span v-else-if="scope.row.isDelivery === '3'">配送中</span>
               <span v-else-if="scope.row.isDelivery === '4'">配送完成</span>
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="出库类型" align="center" prop="operationTypeName" width="160" />
-            label="出库类型"
+          <el-table-column label="施工队" align="center" prop="teamName" width="200" />
-            align="center"
-            prop="operationTypeName"
-            width="160"
-          />
           <el-table-column label="出库时间" align="center" width="180">
             <template #default="scope">
               <span>{{
@@ -132,253 +76,86 @@
             </template>
           </el-table-column>
           <el-table-column label="理货员" align="center" prop="operatorName" />
-          <el-table-column
+
-            label="施工队"
+          <el-table-column label="操作" align="center" width="220" fixed="right">
-            align="center"
-            prop="teamName"
-            width="200"
-          />
-          <el-table-column
-            label="操作"
-            align="center"
-            width="220"
-            fixed="right"
-          >
             <template #default="scope">
-              <el-button
+              <el-button link type="primary" @click="picDetailFun(scope.row.billNo)">图片</el-button>
-                link
+              <el-button link type="primary" @click="billClick(scope.row, 'bill')">出库单</el-button>
-                type="primary"
+              <el-button link type="primary" @click="editData(scope.row)">修改</el-button>
-                @click="picDetailFun(scope.row.billNo)"
-                >图片</el-button
-              >
-              <el-button
-                link
-                type="primary"
-                @click="billClick(scope.row, 'bill')"
-                >出库单</el-button
-              >
-              <el-button link type="primary" @click="editData(scope.row)"
-                >修改</el-button
-              >
               <el-button link type="primary" @click="delData(scope.row)">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
 
-        <pagination
+        <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-          v-show="total > 0"
+          v-model:limit="queryParams.pageSize" @pagination="getList" />
-          :total="total"
-          v-model:page="queryParams.pageNum"
-          v-model:limit="queryParams.pageSize"
-          @pagination="getList"
-        />
       </el-splitter-panel>
       <el-splitter-panel :min="200">
         <el-row :gutter="10" v-show="outboundList.length > 0" class="mb8">
           <el-col :span="1.5">
-            <el-button
+            <el-button type="success" plain icon="Printer" @click="handlePrint" v-print="printViewInfo"
-              type="success"
+              v-hasPermi="['wisdom:bill:print']">打印单据</el-button>
-              plain
-              icon="Printer"
-              @click="handlePrint"
-              v-print="printViewInfo"
-              v-hasPermi="['wisdom:bill:print']"
-              >打印单据</el-button
-            >
           </el-col>
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleDispatch"
+            <el-button type="primary" plain icon="Plus" @click="handleDispatch">生成调度任务</el-button>
-              >生成调度任务</el-button
-            >
           </el-col>
           <el-col :span="1.5">
-            <el-button
+            <el-button type="primary" plain icon="Plus" @click="handleOneClickWarehousing">一键出库</el-button>
-              type="primary"
-              plain
-              icon="Plus"
-              @click="handleOneClickWarehousing"
-              >一键出库</el-button
-            >
           </el-col>
           <el-col :span="1.5">
-            <el-button
+            <el-button type="primary" plain icon="Plus" @click="handleOneClickStockDelete">一键撤销</el-button>
-              type="primary"
-              plain
-              icon="Plus"
-              @click="handleOneClickStockDelete"
-              >一键撤销</el-button
-            >
           </el-col>
           <el-col :span="1.5">
-            <el-button
+            <el-button type="primary" plain icon="Delete" @click="handleOneClickStockDel">一键删除</el-button>
-              type="primary"
-              plain
-              icon="Delete"
-              @click="handleOneClickStockDel"
-              >一键删除</el-button
-            >
           </el-col>
         </el-row>
-        <el-table
+        <el-table v-loading="detailLoading" show-overflow-tooltip border :data="outboundList"
-          v-loading="detailLoading"
+          @selection-change="selectionChange" ref="infoTableRef" highlight-current-row
-          show-overflow-tooltip
+          @row-click="(row) => tableInfoRowClick(row, infoTableRef)">
-          border
-          :data="outboundList"
-          @selection-change="selectionChange"
-          ref="infoTableRef" 
-          highlight-current-row 
-          @row-click="(row) => tableInfoRowClick(row, infoTableRef)"
-        >
           <el-table-column type="selection" width="55" align="center" />
-          <el-table-column
+          <el-table-column label="序号" align="center" type="index" width="70" />
-            label="序号"
-            align="center"
-            type="index"
-            width="70"
-          />
           <el-table-column label="库存状态" align="center">
             <template #default="scope">
               <span>{{ getExecStatusName(scope.row.execStatus) }}</span>
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="订单编号" align="center" prop="sapNo" width="150" />
-            label="订单编号"
+          <el-table-column label="项目号" align="center" prop="xmNo" width="150" />
-            align="center"
+          <el-table-column label="项目描述" align="center" prop="xmMs" width="250" />
-            prop="sapNo"
+          <el-table-column label="物料号" align="center" prop="wlNo" width="100" />
-            width="150"
+          <el-table-column label="物料描述" align="center" prop="wlMs" width="250" />
-          />
+          <el-table-column label="供应商名称" align="center" prop="gysMc" width="200" />
-          <el-table-column
+          <el-table-column label="合同单价" align="center" prop="htDj" width="120" />
-            label="项目号"
-            align="center"
-            prop="xmNo"
-            width="150"
-          />
-          <el-table-column
-            label="项目描述"
-            align="center"
-            prop="xmMs"
-            width="250"
-          />
-          <el-table-column
-            label="物料号"
-            align="center"
-            prop="wlNo"
-            width="100"
-          />
-          <el-table-column
-            label="物料描述"
-            align="center"
-            prop="wlMs"
-            width="250"
-          />
-          <el-table-column
-            label="供应商名称"
-            align="center"
-            prop="gysMc"
-            width="200"
-          />
-          <el-table-column
-            label="合同单价"
-            align="center"
-            prop="htDj"
-            width="120"
-          />
           <el-table-column label="总计" align="center" prop="totalAmount" />
           <el-table-column label="计量单位" align="center" prop="dw" />
-          <el-table-column
+          <el-table-column label="实际出库数量" align="center" prop="realQty" width="120" />
-            label="实际出库数量"
+          <el-table-column label="所属仓库" align="center" prop="cangkuName" width="150">
-            align="center"
-            prop="realQty"
-            width="120"
-          />
-          <el-table-column
-            label="所属仓库"
-            align="center"
-            prop="cangkuName"
-            width="150"
-          >
             <template #default="scope">
               <span>{{
                 scope.row.parentWarehouseName + "/" + scope.row.warehouseName
               }}</span>
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="备注" align="center" prop="remark" width="200" />
-            label="备注"
+          <el-table-column label="库位码" align="center" prop="pcode" width="120" />
-            align="center"
-            prop="remark"
-            width="200"
-          />
-          <el-table-column
-            label="库位码"
-            align="center"
-            prop="pcode"
-            width="120"
-          />
           <el-table-column label="托盘码" align="center" prop="trayCode" />
-          <el-table-column
+          <el-table-column label="身份码" align="center" prop="entityId" width="200" />
-            label="身份码"
-            align="center"
-            prop="entityId"
-            width="200"
-          />
           <el-table-column label="物资类型" align="center" prop="wlTypeName" />
-          <el-table-column
+          <el-table-column label="现场图片" align="center" v-if="isExamine == 1">
-            label="现场图片"
-            align="center"
-            v-if="isExamine == 1"
-          >
             <template #default="scope">
-              <el-image
+              <el-image :src="scope.row.scenePhotoUrl" style="width: 50px; height: 50px" :zoom-rate="1.2" :max-scale="7"
-                :src="scope.row.scenePhotoUrl"
+                :min-scale="0.2" :preview-src-list="srcList" show-progress :initial-index="4" :preview-teleported="true"
-                style="width: 50px; height: 50px"
+                @click="preview(scope.row.scenePhotoUrl)" />
-                :zoom-rate="1.2"
-                :max-scale="7"
-                :min-scale="0.2"
-                :preview-src-list="srcList"
-                show-progress
-                :initial-index="4"
-                :preview-teleported="true"
-                @click="preview(scope.row.scenePhotoUrl)"
-              />
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column label="一次封样号" align="center" prop="fycde1" width="150" />
-            label="一次封样号"
+          <el-table-column label="二次封样号" align="center" prop="fycde2" width="150" />
-            align="center"
+          <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
-            prop="fycde1"
-            width="150"
-          />
-          <el-table-column
-            label="二次封样号"
-            align="center"
-            prop="fycde2"
-            width="150"
-          />
-          <el-table-column
-            label="操作"
-            align="center"
-            class-name="small-padding fixed-width"
-            width="150"
-          >
             <template #default="scope">
-              <el-button
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
-                link
+                v-hasPermi="['wisdom:bill:edit']">修改</el-button>
-                type="primary"
+              <el-button link type="primary" icon="Delete" @click="handleStockDelete(scope.row)"
-                icon="Edit"
+                v-show="scope.row.execStatus == 1" v-hasPermi="['wisdom:bill:delete']">撤销</el-button>
-                @click="handleUpdate(scope.row)"
-                v-hasPermi="['wisdom:bill:edit']"
-                >修改</el-button
-              >
-              <el-button
-                link
-                type="primary"
-                icon="Delete"
-                @click="handleStockDelete(scope.row)"
-                v-show="scope.row.execStatus == 1"
-                v-hasPermi="['wisdom:bill:delete']"
-                >撤销</el-button
-              >
             </template>
           </el-table-column>
         </el-table>
@@ -386,50 +163,27 @@
     </el-splitter>
 
     <!-- 添加或修改库存单据主对话框 -->
-    <el-dialog
+    <el-dialog :title="title" v-model="open" width="75%" :close-on-click-modal="false" :z-index="4" :draggable="true">
-      :title="title"
-      v-model="open"
-      width="75%"
-      :close-on-click-modal="false"
-      :z-index="4"
-      :draggable="true"
-    >
       <el-form ref="stockRef" :model="storeData" :rules="rules">
         <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="项目号">
-              <el-input
+              <el-input v-model="outQueryParams.xmNo" placeholder="请输入项目号" clearable />
-                v-model="outQueryParams.xmNo"
-                placeholder="请输入项目号"
-                clearable
-              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="订单号">
-              <el-input
+              <el-input v-model="outQueryParams.sapNo" placeholder="请输入订单号" clearable />
-                v-model="outQueryParams.sapNo"
-                placeholder="请输入订单号"
-                clearable
-              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="物料号">
-              <el-input
+              <el-input v-model="outQueryParams.wlNo" placeholder="请输入物料号" clearable />
-                v-model="outQueryParams.wlNo"
-                placeholder="请输入物料号"
-                clearable
-              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="物料描述">
-              <el-input
+              <el-input v-model="outQueryParams.wlMs" placeholder="请输入物料描述" clearable />
-                v-model="outQueryParams.wlMs"
-                placeholder="请输入物料描述"
-                clearable
-              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -446,33 +200,18 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="物资类型">
-              <el-select
+              <el-select v-model="outQueryParams.wlType" placeholder="请选择物资类型" clearable>
-                v-model="outQueryParams.wlType"
+                <el-option v-for="dict in wzlxList" :key="dict.id" :label="dict.typeName" :value="dict.typeCode" />
-                placeholder="请选择物资类型"
-                clearable
-              >
-                <el-option
-                  v-for="dict in wzlxList"
-                  :key="dict.id"
-                  :label="dict.typeName"
-                  :value="dict.typeCode"
-                />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="所属仓库">
-              <el-cascader
+              <el-cascader style="width: 100%" :options="warehouseList" v-model="outQueryParams.cangku" :props="{
-                style="width: 100%"
-                :options="warehouseList"
-                v-model="outQueryParams.cangku"
-                :props="{
                 children: 'children',
                 label: 'warehouseName',
                 value: 'warehouseCode',
-                }"
+              }" clearable />
-                clearable
-              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -495,60 +234,28 @@
         <el-row :gutter="20">
           <el-col :span="6">
             <el-form-item label="出库类型" prop="operationType">
-              <el-select
+              <el-select v-model="storeData.operationType" placeholder="请选择出库类型" clearable>
-                v-model="storeData.operationType"
+                <el-option v-for="dict in storeTypeList" :key="dict.id" :label="dict.typeName" :value="dict.typeCode" />
-                placeholder="请选择出库类型"
-                clearable
-              >
-                <el-option
-                  v-for="dict in storeTypeList"
-                  :key="dict.id"
-                  :label="dict.typeName"
-                  :value="dict.typeCode"
-                />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="施工队" prop="teamCode">
-              <el-select
+              <el-select v-model="storeData.teamCode" placeholder="请选择施工队" clearable filterable>
-                v-model="storeData.teamCode"
+                <el-option v-for="dict in wzTypeList" :key="dict.id" :label="dict.teamName" :value="dict.teamCode" />
-                placeholder="请选择施工队"
-                clearable
-                filterable
-              >
-                <el-option
-                  v-for="dict in wzTypeList"
-                  :key="dict.id"
-                  :label="dict.teamName"
-                  :value="dict.teamCode"
-                />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="理货员" prop="operator">
-              <el-select
+              <el-select v-model="storeData.operator" placeholder="请选择理货员" clearable>
-                v-model="storeData.operator"
+                <el-option v-for="dict in personList" :key="dict.userId" :label="dict.userName" :value="dict.userId" />
-                placeholder="请选择理货员"
-                clearable
-              >
-                <el-option
-                  v-for="dict in personList"
-                  :key="dict.userId"
-                  :label="dict.userName"
-                  :value="dict.userId"
-                />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="是否配送" prop="isDelivery">
-              <el-select
+              <el-select v-model="storeData.isDelivery" placeholder="请选择是否配送" clearable>
-                v-model="storeData.isDelivery"
-                placeholder="请选择是否配送"
-                clearable
-              >
                 <el-option :key="1" label="是" value="1" />
                 <el-option :key="0" label="否" value="0" />
               </el-select>
@@ -556,17 +263,8 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="库存状态" prop="execStatus">
-              <el-select
+              <el-select v-model="storeData.execStatus" placeholder="请选择" clearable>
-                v-model="storeData.execStatus"
+                <el-option v-for="dict in execStatusList" :key="dict.value" :label="dict.label" :value="dict.value" />
-                placeholder="请选择"
-                clearable
-              >
-                <el-option
-                  v-for="dict in execStatusList"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -574,14 +272,21 @@
         <div class="addOutBoundBox">
           <div style="display: flex;align-items: center;">
             <div class="addOutBound" @click="addOutBoundData">
-              <el-icon style="margin-right: 10px;" size="20"><FolderAdd /></el-icon>
+              <el-icon style="margin-right: 10px;" size="20">
+                <FolderAdd />
+              </el-icon>
               添加至出库
             </div>
-            <div @click="viewOutBoundData" style="color: #000;text-decoration: underline;margin-left: 5px;">[已添加{{ outBoundData.length }}条库存]</div>
+            <div @click="viewOutBoundData" style="color: #000;text-decoration: underline;margin-left: 5px;">[已添加{{
-            <div @click="viewOutBoundData" style="color: red;text-decoration: underline;font-weight: bold;">[凭证重复出库或项目已关闭，请点击查看！]</div>
+              outBoundData.length }}条库存]</div>
+            <div @click="viewOutBoundData" style="color: red;text-decoration: underline;font-weight: bold;">
+              [凭证重复出库或项目已关闭，请点击查看！]</div>
           </div>
-          <div v-show="outBoundData.length > 0 && planList.length === outBoundData.length" @click="deleteOutBoundData" style="display: flex;align-items: center;color: var(--el-color-primary);">
+          <div v-show="outBoundData.length > 0 && planList.length === outBoundData.length" @click="deleteOutBoundData"
-            <el-icon><delete /></el-icon>
+            style="display: flex;align-items: center;color: var(--el-color-primary);">
+            <el-icon>
+              <delete />
+            </el-icon>
             <span>删除</span>
           </div>
         </div>
@@ -598,135 +303,44 @@
           </el-col>
         </el-row> -->
       </el-form>
-      <el-table
+      <el-table :data="planList" ref="addTableRef" height="400" border show-overflow-tooltip style="width: 100%"
-        :data="planList"
+        @selection-change="handleSelectionChange">
-        ref="addTableRef"
-        height="400"
-        border
-        show-overflow-tooltip
-        style="width: 100%"
-        @selection-change="handleSelectionChange"
-      >
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="序号" type="index" align="center" width="70" />
-        <el-table-column
+        <el-table-column label="物料号" align="center" prop="wlNo" width="100" />
-          label="物料号"
+        <el-table-column label="订单号" align="center" prop="sapNo" width="100" />
-          align="center"
+        <el-table-column label="物料描述" align="center" prop="wlMs" width="200" />
-          prop="wlNo"
+        <el-table-column label="出库数量" align="center" prop="realQty" width="100">
-          width="100"
-        />
-        <el-table-column
-          label="订单号"
-          align="center"
-          prop="sapNo"
-          width="100"
-        />
-        <el-table-column
-          label="物料描述"
-          align="center"
-          prop="wlMs"
-          width="200"
-        />
-        <el-table-column
-          label="出库数量"
-          align="center"
-          prop="realQty"
-          width="100"
-        >
           <template #default="scope">
-            <el-input
+            <el-input v-model="scope.row.realQty" placeholder="请输入出库数量" />
-              v-model="scope.row.realQty"
-              placeholder="请输入出库数量"
-            />
           </template>
         </el-table-column>
         <el-table-column label="单价" align="center" prop="htDj" />
         <el-table-column label="单位" align="center" prop="dw" />
-        <el-table-column
+        <el-table-column label="库位" align="center" prop="pcode" width="150"></el-table-column>
-          label="库位"
+        <el-table-column label="项目定义号" align="center" prop="xmNo" width="150" />
-          align="center"
+        <el-table-column label="项目名称" align="center" prop="xmMs" width="250" />
-          prop="pcode"
+        <el-table-column label="供应商" align="center" prop="gysMc" width="200" />
-          width="150"
+        <el-table-column label="容器码" align="center" prop="trayCode"></el-table-column>
-        ></el-table-column>
+        <el-table-column label="身份码" align="center" prop="entityId" width="200"></el-table-column>
-        <el-table-column
-          label="项目定义号"
-          align="center"
-          prop="xmNo"
-          width="150"
-        />
-        <el-table-column
-          label="项目名称"
-          align="center"
-          prop="xmMs"
-          width="250"
-        />
-        <el-table-column
-          label="供应商"
-          align="center"
-          prop="gysMc"
-          width="200"
-        />
-        <el-table-column
-          label="容器码"
-          align="center"
-          prop="trayCode"
-        ></el-table-column>
-        <el-table-column
-          label="身份码"
-          align="center"
-          prop="entityId"
-          width="200"
-        ></el-table-column>
         <el-table-column label="备注" align="center" width="200">
           <template #default="scope">
-            <el-input
+            <el-input v-model="scope.row.remark" placeholder="请输入备注"></el-input>
-              v-model="scope.row.remark"
-              placeholder="请输入备注"
-            ></el-input>
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column label="一次封样号" align="center" prop="fycde1" width="150" />
-          label="一次封样号"
+        <el-table-column label="二次封样号" align="center" prop="fycde2" width="150" />
-          align="center"
+        <el-table-column label="上传" align="center" width="150" v-if="isExamine == 1">
-          prop="fycde1"
-          width="150"
-        />
-        <el-table-column
-          label="二次封样号"
-          align="center"
-          prop="fycde2"
-          width="150"
-        />
-        <el-table-column
-          label="上传"
-          align="center"
-          width="150"
-          v-if="isExamine == 1"
-        >
           <template #default="scope">
-            <el-upload
+            <el-upload class="upload-demo" :action="actionUrl" :multiple="false" :headers="headers"
-              class="upload-demo"
+              :on-preview="handlePreview" :on-remove="function (response) {
-              :action="actionUrl"
-              :multiple="false"
-              :headers="headers"
-              :on-preview="handlePreview"
-              :on-remove="
-                function (response) {
                 return handleRemove(response, scope.row.id);
               }
-              "
+                " :on-success="function (response) {
-              :on-success="
-                function (response) {
                   return handleAvatarSuccess(response, scope.row.id);
                 }
-              "
+                  ">
-            >
+              <el-button type="primary" size="small" v-show="!scope.row.photoUrl">选择图片</el-button>
-              <el-button
-                type="primary"
-                size="small"
-                v-show="!scope.row.photoUrl"
-                >选择图片</el-button
-              >
             </el-upload>
           </template>
         </el-table-column>
@@ -739,18 +353,8 @@
         <el-row :gutter="20">
           <el-col :span="8">
             <el-form-item label="审批人">
-              <el-select
+              <el-select v-model="storeData.approverId" clearable filterable placeholder="请选择审批人">
-                v-model="storeData.approverId"
+                <el-option v-for="dict in personList" :key="dict.userId" :label="dict.userName" :value="dict.userId" />
-                clearable
-                filterable
-                placeholder="请选择审批人"
-              >
-                <el-option
-                  v-for="dict in personList"
-                  :key="dict.userId"
-                  :label="dict.userName"
-                  :value="dict.userId"
-                />
               </el-select>
             </el-form-item>
           </el-col>
@@ -766,52 +370,20 @@
 
     <!-- 修改主单据等字段 -->
     <el-dialog title="修改" v-model="openBill" append-to-body width="40%">
-      <el-form
+      <el-form :model="billData" :rules="rules" ref="editRef" label-width="100px">
-        :model="billData"
-        :rules="rules"
-        ref="editRef"
-        label-width="100px"
-      >
         <el-form-item label="出库类型" prop="operationType">
-          <el-select
+          <el-select v-model="billData.operationType" placeholder="请选择出库类型" clearable>
-            v-model="billData.operationType"
+            <el-option v-for="dict in storeTypeList" :key="dict.id" :label="dict.typeName" :value="dict.typeCode" />
-            placeholder="请选择出库类型"
-            clearable
-          >
-            <el-option
-              v-for="dict in storeTypeList"
-              :key="dict.id"
-              :label="dict.typeName"
-              :value="dict.typeCode"
-            />
           </el-select>
         </el-form-item>
         <el-form-item label="施工队" prop="teamCode">
-          <el-select
+          <el-select v-model="billData.teamCode" placeholder="请选择施工队" clearable>
-            v-model="billData.teamCode"
+            <el-option v-for="dict in wzTypeList" :key="dict.id" :label="dict.teamName" :value="dict.teamCode" />
-            placeholder="请选择施工队"
-            clearable
-          >
-            <el-option
-              v-for="dict in wzTypeList"
-              :key="dict.id"
-              :label="dict.teamName"
-              :value="dict.teamCode"
-            />
           </el-select>
         </el-form-item>
         <el-form-item label="理货员" prop="operator">
-          <el-select
+          <el-select v-model="billData.operator" placeholder="请选择理货员" clearable>
-            v-model="billData.operator"
+            <el-option v-for="dict in personList" :key="dict.userId" :label="dict.userName" :value="dict.userId" />
-            placeholder="请选择理货员"
-            clearable
-          >
-            <el-option
-              v-for="dict in personList"
-              :key="dict.userId"
-              :label="dict.userName"
-              :value="dict.userId"
-            />
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="库存状态" prop="execStatus">
@@ -829,11 +401,7 @@
           </el-select>
         </el-form-item> -->
         <el-form-item label="是否配送" prop="isDelivery">
-          <el-select
+          <el-select v-model="billData.isDelivery" placeholder="请选择是否配送" clearable>
-            v-model="billData.isDelivery"
-            placeholder="请选择是否配送"
-            clearable
-          >
             <el-option :key="1" label="是" value="1" />
             <el-option :key="0" label="否" value="0" />
           </el-select>
@@ -847,13 +415,7 @@
     </el-dialog>
 
     <!-- 出库单 -->
-    <el-dialog
+    <el-dialog title="出库单" v-model="dialogBill" append-to-body width="80%" :close-on-click-modal="false">
-      title="出库单"
-      v-model="dialogBill"
-      append-to-body
-      width="80%"
-      :close-on-click-modal="false"
-    >
       <bill :billAllObj="billAllObj" billStatus="ck" />
       <template #footer>
         <div class="dialog-footer">
@@ -872,21 +434,11 @@
       <img w-full :src="dialogImageUrl" alt="Preview Image" />
     </el-dialog>
     <el-dialog title="图片详情" v-model="dialogPicDetailVisible">
-      <el-image
+      <el-image style="width: 100px; height: 100px; margin-right: 20px" :src="url" v-for="url in picList" :key="url"
-        style="width: 100px; height: 100px; margin-right: 20px"
+        :preview-src-list="picList" />
-        :src="url"
-        v-for="url in picList"
-        :key="url"
-        :preview-src-list="picList"
-      />
     </el-dialog>
 
-    <el-dialog
+    <el-dialog title="调度任务" v-model="dispatchOpen" width="30%" :close-on-click-modal="false">
-      title="调度任务"
-      v-model="dispatchOpen"
-      width="30%"
-      :close-on-click-modal="false"
-    >
       <el-form>
         <el-row>
           <el-col>
@@ -908,17 +460,9 @@
 
     <!-- 修改主单据，入库时间等字段 -->
     <el-dialog title="修改" v-model="outInfoDialog" append-to-body width="40%">
-      <el-form
+      <el-form :model="outInfoData" :rules="outInfoRules" ref="outInfoRef" label-width="100px">
-        :model="outInfoData"
-        :rules="outInfoRules"
-        ref="outInfoRef"
-        label-width="100px"
-      >
         <el-form-item label="出库数量" prop="realQty">
-          <el-input
+          <el-input v-model="outInfoData.realQty" placeholder="请输入出库数量" />
-            v-model="outInfoData.realQty"
-            placeholder="请输入出库数量"
-          />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="outInfoData.remark" placeholder="请输入备注" />
@@ -1698,12 +1242,14 @@ function submitDispatch() {
     line-height: 30px;
   }
 }
+
 .addOutBoundBox {
   display: flex;
   align-items: center;
   justify-content: space-between;
   margin-bottom: 10px;
   cursor: pointer;
+
   .addOutBound {
     display: flex;
     align-items: center;