Merge branch 'greenUrgent' into testToMerge

src/HDrpManagement/logistics/modules/productlist.vue

@@ -6,12 +6,21 @@
           {{tool.nominalPressureSet(scope.column.data.nominalpressure)}}
         </div>
         <div v-else-if="scope.column.columnname == 'qty'">
-          <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="type === 'edit' && tool.checkAuth($route.name,'update') && status == '新建' && logistics_qty_editable" size="mini" v-model="scope.column.data.qty" :min="1" :step="scope.column.data.orderaddqty" :label="$t(`输入数量`)" @change="qtyChange(scope.column.data,scope.$index)"></el-input-number>
-          <span v-else>{{scope.column.data.qty}}</span>
+          <div v-if="siteid == 'TZ'">
+            <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="type === 'edit' && tool.checkAuth($route.name,'update') && status == '新建' && logistics_qty_editable" size="mini" v-model="scope.column.data.qty" :min="1" :step="scope.column.data.orderaddqty" :label="$t(`输入数量`)" @change="qtyChange(scope.column.data,scope.$index)"></el-input-number>
+            <span v-else>{{scope.column.data.boxmxqty}}</span>
+          </div>
+          <div v-else>
+            <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="type === 'edit' && tool.checkAuth($route.name,'update') && status == '新建' && logistics_qty_editable" size="mini" v-model="scope.column.data.qty" :min="1" :step="scope.column.data.orderaddqty" :label="$t(`输入数量`)" @change="qtyChange(scope.column.data,scope.$index)"></el-input-number>
+            <span v-else>{{scope.column.data.qty}}</span>
+          </div>
         </div>
         <div v-else-if="scope.column.columnname == 'unlogisticsqty'">
           {{tool.qtyShow(scope.column.data.unlogisticsqty)}}
         </div>
+        <div v-else-if="scope.column.columnname == 'dispatchqty'">
+          {{tool.qtyShow(scope.column.data.dispatchqty)}}
+        </div>
         <div v-else-if="scope.column.columnname == 'unit'">
           <el-tag size="mini" type="info" effect="plain">{{scope.column.data.unitname}}</el-tag>
         </div>