Merge pull request 'projects/mesxc-zjl' (#231) from projects/mesxc-zjl into projects/mesxc-test

Reviewed-on: #231

src/views/order/base/orderGroup/components/orderGroupAdd.vue

@@ -60,14 +60,7 @@
       </el-col>
       <el-col :span='6'>
         <el-form-item label="包装要求" prop="packReq">
-          <el-select v-model="form.packReq" placeholder="请选择" style="width: 100%;" clearable>
+          <el-input v-model="form.packReq"></el-input>
-            <el-option
-              v-for="item in getDictDatas(DICT_TYPE.PACK_SPEC)"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-            </el-option>
-          </el-select>
         </el-form-item>
       </el-col>
     </el-row>
@@ -127,7 +120,7 @@ export default {
             this.form.customerId = res.data.customerId
             this.form.planQuantity = res.data.planQuantity
             this.form.deliveTime = res.data.deliveTime ? res.data.deliveTime : null
-            this.form.packReq = res.data.packReq ? res.data.packReq+'' : ''
+            this.form.packReq = res.data.packReq
             this.form.remark = res.data.remark
             setTimeout(() => {
               this.getSpecifications(this.form.planProductId)

src/views/order/base/orderGroup/index.vue

@@ -125,7 +125,7 @@ const tableProps = [
   {
     prop: 'packReq',
     label: '包装要求',
-    filter: publicFormatter('pack_spec'),
+    // filter: publicFormatter('pack_spec'),
     minWidth: 120,
     showOverflowtooltip: true
   },