Merge remote-tracking branch 'origin/dev' into dev

src/components/ProductSelector/index.vue

@@ -39,6 +39,11 @@ export default {
         determined: {
           type: Boolean,
           default: false
+        },
+        // 是否显示已有商品，不传默认
+        status: {
+          type: [String, Number],
+          default: null
         }
     },
     data(){
@@ -90,7 +95,8 @@ export default {
         remoteMethod(keyword){
             let params = {
                 pageSize: keyword ? 100000 : 10,
-                filter: !this.determined
+                filter: !this.determined,
+                status:this.status
             }
             if(this.productType){
                 params.typeId = this.productType

src/views/ecw/order/prepayDeal.vue

@@ -348,6 +348,7 @@
                    class="mb-0 mr-0"
                >
                   <product-selector
+                  :status="0"
                    @hook:mounted="onTableMounted"
                    v-model="productId2"
                    @change = "onProductChange($event)"
@@ -368,6 +369,7 @@
              >
                 <product-selector
                 lang="En"
+                :status="0"
                  v-model="productId1"
                  @change = "onProductChange($event)"
                  />

src/views/ecw/product/index.vue

@@ -159,6 +159,13 @@
 
         </el-form-item>
 
+        <el-form-item prop="auditStatus" :label="$t('是否审核')">
+          <template slot-scope="scope">
+            <el-select v-model="form.auditStatus">
+              <el-option v-for="auditStatusItem in auditStatusDictDatas" :key="auditStatusItem.id" :label="$l(auditStatusItem, 'label')" :value="parseInt(auditStatusItem.value)" />
+            </el-select>
+          </template>
+        </el-form-item>
         <el-form-item :label="$t('商品编码')" prop="productCode">
           <el-input v-model="form.productCode" :placeholder="$t('请输入商品编码')" />
         </el-form-item>