Merge branch 'feature/Feature-supply' into develop

src/views/supply/apply/components/apply_form.vue

@@ -289,6 +289,7 @@ export default {
           item.orderId = item.id;
         })
         this.goodsList = data.orders;
+        this.screenForm.type = data.mainId;
       })
     },
 
@@ -457,6 +458,9 @@ export default {
     clickSubmitForm(status) {
       this.$refs.mainForm.validate((valid) => {
         if (valid) {
+          if(this.goodsList.length < 1) {
+            return this.$errorMsg('请添加引用');
+          }
           for(let i=0; i<this.goodsList.length; i++) {
             if(!this.goodsList[i].invoiceNum) {
               this.$errorMsg('请输入申请数量');

src/views/supply/apply/components/engin_form.vue

@@ -624,6 +624,9 @@ export default {
     clickSubmitForm(status) {
       this.$refs.mainForm.validate((valid) => {
         if (valid) {
+          if(this.goodsList.length < 1) {
+            return this.$errorMsg('请添加引用');
+          }
           for(let i=0; i<this.goodsList.length; i++) {
             if(!this.goodsList[i].invoiceNum) {
               this.$errorMsg('请输入申请数量');

src/views/supply/retail/components/retail_form.vue

@@ -26,7 +26,7 @@
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="产品大类" prop="type">
-            <el-select v-model="mainForm.type" placeholder="选择产品大类" style="width: 100%">
+            <el-select v-model="mainForm.type" placeholder="选择产品大类" style="width: 100%" :disabled="goodsList.length > 0">
               <el-option v-for="item in typeList" :key="item.dictCode" :label="item.dictValue" :value="item.dictCode"></el-option>
             </el-select>
           </el-form-item>
@@ -167,7 +167,7 @@
         <el-row :gutter="20">
           <el-col :xs="12" :sm="6" :lg="6">
             <el-form-item prop="type">
-              <el-select v-model="mainForm.type" placeholder="选择品类" style="width: 100%" clearable>
+              <el-select v-model="mainForm.type" placeholder="选择品类" style="width: 100%" clearable :disabled="goodsList.length > 0 || rightGoodsList.length > 0">
                 <el-option v-for="item in typeList" :key="item.dictCode" :label="item.dictValue" :value="item.dictCode"></el-option>
               </el-select>
             </el-form-item>