Merge branch 'develop' of https://e.coding.net/ctcdevteam/hberp/hberp into develop

hb_client/src/views/inm/product.vue

@@ -35,7 +35,7 @@
         <el-table-column label="订单">
           <template slot-scope="scope">
             <span v-if="scope.row.to_order_">{{scope.row.to_order_.number}}</span>
-            <el-tag v-else-if="scope.row.to_order_ == null && scope.row.need_to_order == true">
+            <el-tag v-else-if="scope.row.to_order_ == null">
               需要确定订单
             </el-tag>
             <span v-else></span>

hb_client/src/views/qm/product.vue

@@ -1,49 +1,7 @@
 <template>
   <div class="app-container">
     <el-card>
-      <el-tabs v-model="activeName" type="card">
-        <el-tab-pane label="待军检" name="first">
-          <el-button
-            v-if="checkPermission(['wp_need_to_order'])"
-            type="primary"
-            icon="el-icon-plus"
-            @click="handleorder"
-          >
-            申请
-          </el-button>
-          <el-table
-            ref="multipleTable"
-            :data="iproductData.results"
-            border
-            fit
-            stripe
-            highlight-current-row
-            max-height="700"
-            height="100"
-            v-el-height-adaptive-table="{bottomOffset: 42}"
-          >
-            <el-table-column type="selection" width="55"></el-table-column>
-            <el-table-column type="index" width="50"/>
-            <el-table-column label="成品编号" prop="number">
-            </el-table-column>
-            <el-table-column label="成品批次" prop="batch">
-            </el-table-column>
-            <el-table-column label="成品名称">
-              <template slot-scope="scope">{{ scope.row.material_.name }}</template>
-            </el-table-column>
-            <el-table-column label="所在仓库">
-              <template slot-scope="scope">{{ scope.row.warehouse_.name }}</template>
-            </el-table-column>
-          </el-table>
-          <pagination
-            v-show="iproductData.count > 0"
-            :total="iproductData.count"
-            :page.sync="listQuery.page"
-            :limit.sync="listQuery.page_size"
-            @pagination="getList"
-          />
-        </el-tab-pane>
-        <el-tab-pane label="军检列表" name="second">
+      
           <el-table
             :data="iproductData2.results"
             border
@@ -117,8 +75,7 @@
             :limit.sync="listQuery2.page_size"
             @pagination="getList2"
           />
-        </el-tab-pane>
-      </el-tabs>
+    
       <el-dialog
         :visible.sync="dialogVisible"
         :close-on-click-modal="false"
@@ -158,13 +115,7 @@
     components: {Pagination},
     data() {
       return {
-        iproductData: {
-          count: 0,
-        },
-        listQuery: {
-          page: 1,
-          page_size: 20,
-        },
+       
         iproductData2: {
           count: 0,
         },
@@ -181,24 +132,15 @@
       };
     },
     created() {
-      this.getList();
       this.getList2();
     },
 
     methods: {
       checkPermission,
-      getList() {
-        this.listQuery.material__type = 1;
-        this.listQuery.need_to_order = false;
-        getiproductList(this.listQuery).then((response) => {
-          if (response.data) {
-            this.iproductData = response.data;
-          }
-        });
-      },
-
+     
       getList2() {
         this.listQuery2.material__type = 1;
+         this.listQuery2.to_order_need_mtest = true;
         getiproductList(this.listQuery2).then((response) => {
           if (response.data) {
             this.iproductData2 = response.data;