Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-aps into dev

src/views/saleOrder/components/EquipmentDialog.vue

@@ -111,6 +111,13 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
+          {
+            prop: 'specification',
+            label: '规格',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             prop: 'modelType',
             label: '型号',

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

@@ -291,6 +291,7 @@ export default {
               productUnitWeight:  item.netWeight,
               weightUnit:  item.weightUnit,
               model: item.modelType,
+              specification: item.specification,
               brandNo: item.brandNum
             };
           }

src/views/workOrder/index.vue

@@ -56,7 +56,7 @@
             :underline="false"
             icon="el-icon-truck"
             @click="toRelease(row)"
-            v-if="row.status == 8 && !row.productName.includes('板材')"
+            v-if="(clientEnvironmentId!='4'&&row.status == 8 )|| (clientEnvironmentId=='4'&&!row.productName.includes('板材')&&row.status == 8)"
 
           >
             下达