入库部分和接口

ruoyi-ui/src/views/in/job/index.vue

@@ -407,7 +407,11 @@ export default {
       if (row.type === 'invalid'){
         //手动作废
         manualInvalidation(data).then(response => {
-          this.$modal.msgSuccess('操作成功');
+          if(response.code==200) {
+            this.$modal.msgSuccess('操作成功');
+          }else{
+            this.$modal.msgError('操作失败');
+          }
           this.getList();
         })
 
@@ -415,7 +419,12 @@ export default {
       }else if (row.type === 'completed'){
         //手动完成
         manualCompleted(data).then(response => {
-          this.$modal.msgSuccess('操作成功');
+          if(response.code==200){
+            this.$modal.msgSuccess('操作成功');
+
+          }else{
+            this.$modal.msgError(response.msg);
+          }
           this.getList();
         })
 

ruoyi-ui/src/views/in/stockIn/add/index_new.vue

@@ -700,7 +700,7 @@ export default {
           const data = {
             warehouseId: "01",
             supplierId: this.form.supplierId,
-            classNo:this.classNo,
+            classNo:this.form.classNo,
             remark: this.form.remark,
             inType:this.form.inType,
             erpBill:this.form.erpBill,
@@ -716,6 +716,7 @@ export default {
               spare1: item.spare1,
               spare2: item.spare2,
               spare3: item.spare3,
+              spec:item.spec,
               // spare4: item.spare4,
               // spare5: item.spare5,
               // spare6: item.spare6,

ruoyi-ui/src/views/in/stockIn/index.vue

@@ -152,18 +152,18 @@
         >单据确认<!--单据确认-->
         </el-button>
       </el-col>
-      <!--      <el-col :span="1.5">-->
-      <!--        <el-button-->
-      <!--          type="info"-->
-      <!--          plain-->
-      <!--          icon="el-icon-download"-->
-      <!--          size="mini"-->
-      <!--          :disabled="detailMultiple"-->
-      <!--          @click="handleBarcodePrinting"-->
-      <!--          v-hasPermi="['in:stockIn:barcodePrinting']"-->
-      <!--        >打印条码&lt;!&ndash;打印条码&ndash;&gt;-->
-      <!--        </el-button>-->
-      <!--      </el-col>-->
+            <el-col :span="1.5">
+              <el-button
+                type="info"
+                plain
+                icon="el-icon-download"
+                size="mini"
+                :disabled="detailMultiple"
+                @click="handleBarcodePrinting"
+                v-hasPermi="['in:stockIn:barcodePrinting']"
+              >打印条码<!--打印条码-->
+              </el-button>
+            </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>