Merge branch 'master' of http://139.196.39.194:9021/yuansh/doors-windows-web

src/views/production/productionTotalOrder/modules/materiaWaring.vue

@@ -363,6 +363,7 @@
                     alertModal.closeLoading();
                     if (res.success) {
                         this.$emit('ok')
+                        this.$message.success(res.message);
                         this.handleCancel()
                     } else {
                         this.$message.error(res.message);

src/views/production/safetyStock/modules/AddEncoder.vue

@@ -47,8 +47,9 @@
                     </a-form-model-item>
                   </a-col>
                   <a-col :md="8" :sm="24">
-                    <a-form-model-item label="换算率" prop='rate' >
-                      <a-input-number v-model="form.rate" />
+                    <!-- <a-form-model-item label="换算率" prop='rate' >标准转换率 -->
+                    <a-form-model-item label="换算率">标准转换率
+                     <!-- <a-input-number v-model="form.rate" /> -->
                     </a-form-model-item>
                   </a-col>
                   <a-col :md="8" :sm="24">

src/views/production/safetyStock/modules/EncoderDetail.vue

@@ -40,8 +40,8 @@
                     </a-form-model-item>
                   </a-col>
                   <a-col :md="8" :sm="24">
-                    <a-form-model-item label="换算率" prop='rate' >
-                      <a-input-number v-model="form.rate" disabled/>
+                    <a-form-model-item label="换算率" >标准转换率
+                      <!-- <a-input-number v-model="form.rate" disabled/> -->
                     </a-form-model-item>
                   </a-col>
                   <a-col :md="8" :sm="24">