进仓对货功能调整

src/views/oms/orderCheck/WarehouseInPanel.vue

@@ -10,7 +10,7 @@
                       </el-radio-group>
                   </div>
                   <XdTextareaInput
-                    v-model="queryParams.billCode"
+                    v-model="queryParams.queryKey"
                     :placeholder="$t('多个流水号逗号或换行隔开')"
                     clearable
                     :rows="2"
@@ -131,18 +131,25 @@
                   @click="handleView"
                 >查看进仓信息</el-button>
               </el-col>
-
+              <el-col :span="1.5">
-
-              <!-- <el-col :span="1.5">
                 <el-button
                   type="warning"
                   plain
                   icon="el-icon-download"
                   size="mini"
-                  @click="handleExport"
+                  :disabled="single"
-                  v-hasPermi="['emis:emisWarehouseIn:export']"
+                  @click="handleDownload"
-                >导出</el-button>
+                >下载打印PDF</el-button>
-              </el-col> -->
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  size="mini"
+                  :disabled="single || currentSelectOrder.confirmStatus=='1' || currentSelectOrder.stockInFlag !=='1' "
+                  @click="confirmJinCang"
+                >确认可发货</el-button>
+              </el-col>
           </el-row>
       </div>
 
@@ -189,7 +196,7 @@
 </template>
 
 <script>
-import { listSimpleEmisWarehouseIn } from "@/api/oms/emisWarehouseIn";
+import { listSimpleEmisWarehouseIn, cusConfirmWsIn } from "@/api/oms/emisWarehouseIn";
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 
 export default {
@@ -241,6 +248,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 20,
+        queryKey: null,
         serialNo: null,
         inNo: null,
         orderSn: null,
@@ -255,7 +263,7 @@ export default {
         remark: null,
         delFlag: null,
         params:{
-          queryStatusType:null
+          queryStatusType:null,
         }
       },
     };
@@ -273,9 +281,12 @@ export default {
       this.loading = true;
 
        // 按运单查询时的处理 
-       if(this.queryOrderType==2){
+       if(this.queryOrderType=='2'){
-        this.queryParams.inNo=this.queryParams.billCode;
+        this.queryParams.inNo=this.queryParams.queryKey;
         this.queryParams.billCode=null;
+      }else {
+        this.queryParams.inNo=null;
+        this.queryParams.billCode = this.queryParams.queryKey;
       }
 
       listSimpleEmisWarehouseIn(this.addDateRange(this.queryParams, this.dateTimeRange,"createTime")).then(response => {
@@ -424,6 +435,22 @@ export default {
     dateTimeChange(value){
         this.dateTimeRange=value;                   
     },
+    handleDownload(){
+      this.download('oms2c/common/exportWarehouseInTpl', {
+        'orderSn':this.currentSelectOrder.orderSn
+      }, `emisWarehouseIn_${new Date().getTime()}.pdf`)
+    },
+    confirmJinCang(){
+        cusConfirmWsIn({
+          'confirmStatus':'1',
+          'inNo':this.currentSelectOrder.inNo
+        }).then(response => {
+          if (response.code === 200) {
+            this.$modal.msgSuccess("确认成功");
+            this.getList();
+          }
+        })
+    }
   }
 };
 </script>