Merge branch 'feat-two' into feat-warehouse

src/views/sales_policy/components/Examine.vue

@@ -189,6 +189,19 @@
               </el-col>
             </el-row>
             <el-divider />
+            <el-row :gutter="20">
+              <el-col :span="12" :offset="0"> <el-input v-model="specification" placeholder="请输入规格型号" size="mini" clearable />
+              </el-col>
+              <el-col :span="12" :offset="0">
+                <el-button
+                  style="margin-left: 20px"
+                  type="primary"
+                  size="mini"
+                  @click=" dcurrentPage =1; handletwoList() "
+                >查询</el-button>
+                <el-button size="mini" @click="specification=''; handletwoList()">重置</el-button>
+              </el-col>
+            </el-row>
           </el-row>
           <div class="table">
             <el-table
@@ -757,10 +770,8 @@ export default {
       cid: '',
       cpolicyId: '',
       dataL: [],
-      clistTotal: 0,
       clistTotals: 0,
       type: 1,
-      fileList: [],
       importFileList: [],
       leftData: [],
       rightData: [],
@@ -791,7 +802,8 @@ export default {
       policyCurrentPages: 1,
       policyPageSize: 10,
       policyListTotal: 0,
-      policyKeyWord: ''
+      policyKeyWord: '',
+      specification: ''
     }
   },
   computed: {
@@ -974,7 +986,8 @@ export default {
         pageNum: this.dcurrentPage,
         pageSize: this.dpageSize,
         policyId: this.detail.code,
-        saleTypeCode: ''
+        saleTypeCode: '',
+        specification: this.specification
       }
       getMaterialList(paramss)
         .then(result => {

src/views/sales_policy/components/details.vue

@@ -187,6 +187,19 @@
               <el-col :span="12" class="tr" />
             </el-row>
             <el-divider />
+            <el-row :gutter="20">
+              <el-col :span="12" :offset="0"> <el-input v-model="specification" placeholder="请输入规格型号" size="mini" clearable />
+              </el-col>
+              <el-col :span="12" :offset="0">
+                <el-button
+                  style="margin-left: 20px"
+                  type="primary"
+                  size="mini"
+                  @click=" dcurrentPage =1; handletwoList() "
+                >查询</el-button>
+                <el-button size="mini" @click="specification=''; handletwoList()">重置</el-button>
+              </el-col>
+            </el-row>
           </el-row>
           <div class="table">
             <el-table
@@ -597,7 +610,12 @@
                         <el-button
                           type="text"
                           size="mini"
-                          @click="operationType = null , (linitVisible = true), (linitType = 'edit'), (recordSelected = [scope.row])"
+                          @click="
+                            ;(operationType = null),
+                              (linitVisible = true),
+                              (linitType = 'edit'),
+                              (recordSelected = [scope.row])
+                          "
                         >编辑</el-button>
                         <el-popconfirm
                           style="margin-left: 10px"
@@ -758,7 +776,12 @@
                         <el-button
                           type="text"
                           size="mini"
-                          @click="operationType = 'group' , (linitVisible = true), (linitType = 'edit'), (recordSelected = [scope.row])"
+                          @click="
+                            ;(operationType = 'group'),
+                              (linitVisible = true),
+                              (linitType = 'edit'),
+                              (recordSelected = [scope.row])
+                          "
                         >编辑</el-button>
                         <el-popconfirm
                           style="margin-left: 10px"
@@ -1075,10 +1098,8 @@ export default {
       cid: '',
       cpolicyId: '',
       dataL: [],
-      clistTotal: 0,
       clistTotals: 0,
       type: 1,
-      fileList: [],
       importFileList: [],
       leftData: [],
       rightData: [],
@@ -1138,7 +1159,8 @@ export default {
       linitVisible: false,
       linitType: null,
       recordSelected: [],
-      operationType: null
+      operationType: null,
+      specification: ''
     }
   },
   computed: {
@@ -1353,7 +1375,8 @@ export default {
         pageNum: this.dcurrentPage,
         pageSize: this.dpageSize,
         policyId: this.detail.code,
-        saleTypeCode: ''
+        saleTypeCode: '',
+        specification: this.specification
       }
       getMaterialList(paramss)
         .then(result => {