Merge branch 'develop' of http://code.dashoo.cn/dashoo/supplier_system into develop

src/dashoo.cn/frontend_web/src/components/oilcontract/submitPopup.vue

@@ -38,9 +38,11 @@
                 </el-option>
               </el-select>
             </el-form-item>
+            <!--供应商评价只能选择物资装备处-->
             <el-form-item label="专业处室">
               <el-select v-model="selectDept"
                          filterable
+                         :disabled="selectDept === 100000653 && supplierType === '01'"
                          placeholder="请选择"
                          style="width: 100%"
                          @change="changeOrgUnit">
@@ -223,6 +225,10 @@ export default {
     selectDeptBoolean2: {
       type: Boolean,
       default: false
+    },
+    supplierType: {
+      type: String,
+      default: ''
     }
   },
   data () {

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-goods/_opera/evaluate.vue

@@ -235,7 +235,7 @@
       </el-tabs>
     </el-card>
 
-    <submit-popup ref="submitpopup" :eveId="parseInt(formData.Id)" :formData="formData" @refreshPage="refreshPage"></submit-popup>
+    <submit-popup ref="submitpopup" :eveId="parseInt(formData.Id)" :supplierType="'01'" :formData="formData" @refreshPage="refreshPage"></submit-popup>
 
 
   </div>