Merge branch 'dev' into 'purchaseDev'

Dev

See merge request new-business/drp-web!64

src/views/material/requisition/add.vue

@@ -152,8 +152,7 @@
             <el-row :gutter="20">
               <el-col :span="8">
                 <el-form-item label="序列号管理" prop="serialNoManager">
-                  <el-select v-model="basicForm.serialNoManager" placeholder="序列号管理" @change="stockControl"
-                    :disabled="disable">
+                  <el-select v-model="basicForm.serialNoManager" placeholder="序列号管理" :disabled="disable || isStock">
                     <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
                   </el-select>
                 </el-form-item>