55

src/views/saleOrder/components/order-search.vue

@@ -249,6 +249,8 @@ export default {
       const productCode = this.selection[0].productCode;
       const orderType = this.selection[0].orderType;
       const produceRoutingId = this.selection[0].produceRoutingId
+       const measuringUnit = this.selection[0].measuringUnit;
+
 
       for (var i = 0; i < this.selection.length; i++) {
         if (productCode != this.selection[i].productCode) {
@@ -260,6 +262,10 @@ export default {
         if (produceRoutingId != this.selection[i].produceRoutingId) {
           return this.$message.warning('工艺路线不一致！');
         }
+        if(measuringUnit != this.selection[i].measuringUnit) {
+          return this.$message.warning('计量单位不一致！');
+        }
+
       }
       const list = [];
       this.selection.map((item) => {

src/views/saleOrder/salesToProduction.vue

@@ -137,12 +137,17 @@
             :label="'订单数量' + (clientEnvironmentId == '4' ? '(方)' : '')"
             align="center"
             prop="contractNum"
+               width="120"
           >
+          <template slot-scope="scope">
+              {{ scope.row.contractNum }} {{scope.row.measuringUnit }}
+            </template>
           </el-table-column>
           <el-table-column
             label="订单重量"
             align="center"
             prop="productSumWeight"
+            width="120"
           >
             <template slot-scope="scope">
               {{ scope.row.productSumWeight }} {{ form.weightUnit }}