Merge remote-tracking branch 'origin/project9-8' into project9-8

src/views/template/outcomeWmsJbapplyTemp.vue

@@ -44,6 +44,16 @@
           style="width: 150px"
         />
       </el-form-item>
+      <el-form-item label="lot" prop="lot">
+        <el-input
+          v-model="queryParams.lot"
+          placeholder="请输入lot"
+          clearable
+          :maxlength="100"
+          size="small"
+          style="width: 150px"
+        />
+      </el-form-item>
       <el-form-item label="出库状态" prop="dealStatus">
         <el-select v-model="queryParams.dealStatus" placeholder="请选择出库状态" clearable size="small" :maxlength="1">
           <el-option
@@ -69,20 +79,38 @@
           @click="resetQuery"
         >重置</el-button>
       </el-form-item>
+      <div style="margin-left: 92%">
+        <el-form-item>
+          <el-button
+            :class="commonField.addClass"
+            :type="commonField.typePrimary"
+            :icon="commonField.addIcon"
+            :size="commonField.smallSize"
+            @click="handleAdd"
+          >新增</el-button>
+          <!--          <el-button-->
+          <!--            :class="commonField.exportClass"-->
+          <!--            :type="commonField.typeSuccess"-->
+          <!--            :icon="commonField.exportIcon"-->
+          <!--            :size="commonField.smallSize"-->
+          <!--            @click="handleExport"-->
+          <!--          >导出</el-button>-->
+        </el-form-item>
+      </div>
     </el-form>
     <div class="placeholder" />
     <div style="padding:5px 10px">
       <div class="mb12 font-small-bold">检查申请列表</div>
       <el-table v-loading="loading" border :data="outcomeWmsJbapplyTempList">
         <el-table-column type="index" label="序号" width="55" align="center" />
-        <el-table-column label="wh_id" prop="whId" :show-overflow-tooltip="true" >
+        <el-table-column label="wh_id" prop="whId" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <!-- 假设字典数据存储在 dataDict 中 -->
             <span v-if="scope.row.whId &&getDataDictLabel(scope.row.whId) ">{{ getDataDictLabel(scope.row.whId) }}</span>
             <span v-else>-</span>
           </template>
         </el-table-column>
-        <el-table-column label="ptype" prop="ptype" :show-overflow-tooltip="true" >
+        <el-table-column label="ptype" prop="ptype" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span v-if="scope.row.ptype === '1'">jb</span>
             <span v-else-if="scope.row.ptype === '2'">label</span>
@@ -92,7 +120,7 @@
             <span v-else>-</span>
           </template>
         </el-table-column>
-        <el-table-column label="pn" prop="pn" :show-overflow-tooltip="true" >
+        <el-table-column label="pn" prop="pn" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             {{ scope.row.pn || '-' }}
           </template>
@@ -102,7 +130,22 @@
             {{ scope.row.qty || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="出库状态" prop="dealStatus" :show-overflow-tooltip="true" >
+        <el-table-column label="LOT" prop="lot" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            {{ scope.row.lot || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="rank" prop="rank" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            {{ scope.row.rank || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" prop="createDate" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="出库状态" prop="dealStatus" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span v-if="scope.row.dealStatus === '1'">已出库</span>
             <span v-else-if="scope.row.dealStatus === '0'">未出库</span>
@@ -232,6 +275,10 @@ export default {
         {
           dictLabel: 'jb',
           dictValue: '1'
+        },
+        {
+          dictLabel: 'jl',
+          dictValue: '20'
         }
       ],
       addTypeOption: [
@@ -308,7 +355,7 @@ export default {
         remarks: undefined,
         pn: undefined,
         qty: undefined,
-        whId: undefined,
+        whId: this.warehouseList[0].dictValue,
         ptype: undefined,
         dealStatus: undefined,
         createByName: undefined,
@@ -397,6 +444,14 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const id = row.businessId
+      if (row.dealStatus === '1') {
+        this.$message({
+          message: '已出库，不能删除',
+          duration: 2000,
+          type: 'error'
+        })
+        return // 停止执行
+      }
       this.$confirm('是否确认操作？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',