Merge remote-tracking branch 'origin/dev_ksck_z' into dev_ksck_z

# Conflicts:
#	src/views/basic/workplace/workplaceManage.vue

src/views/basic/workplace/workplaceManage.vue

@@ -13,7 +13,7 @@
               highlight-current
             >
               <span class="custom-tree-node" slot-scope="{ node, data }">
-                <span style="font-size: 14px; font-weight: 500">{{
+                <span style="font-size: 14px; font-weight: 500; width:200px">{{
                     node.label
                   }}</span>
                   <el-button
@@ -113,7 +113,7 @@
                   <span>{{ workplaceTypeMao[scope.row.workplaceType] }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="库存预警数" prop="invRemindNumber" width="90"></el-table-column>
+              <!--              <el-table-column label="库存预警数" prop="invRemindNumber" width="90"></el-table-column>-->
               <el-table-column label="工位状态" prop="workplaceStatus" width="90">
                 <template slot-scope="scope">
                   <span>{{ workplaceStatusMap[scope.row.workplaceStatus] }}</span>
@@ -451,20 +451,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12" class="el-col">
-            <el-form-item label="库存预警数:" prop="invRemindNumber" class="query-form-item">
-              <el-input-number
-                :min="0"
-                :precision="0" :step="1"
-                placeholder="请输入库存预警数"
-                v-model="formData.invRemindNumber" style="width: 80%"
-                auto-complete="off"
-              ></el-input-number>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="24" class="el-row">
           <el-col :span="12" class="el-col">
             <el-form-item label="备注:" prop="remake" class="query-form-item">
               <el-input
@@ -473,6 +459,21 @@
               ></el-input>
             </el-form-item>
           </el-col>
+          <!--          <el-col :span="12" class="el-col">-->
+          <!--            <el-form-item label="库存预警数:" prop="invRemindNumber" class="query-form-item">-->
+          <!--              <el-input-number-->
+          <!--                :min="0"-->
+          <!--                :precision="0" :step="1"-->
+          <!--                placeholder="请输入库存预警数"-->
+          <!--                v-model="formData.invRemindNumber" style="width: 80%"-->
+          <!--                auto-complete="off"-->
+          <!--              ></el-input-number>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+        </el-row>
+
+        <el-row :gutter="24" class="el-row">
+
         </el-row>
 
         <!--<el-col :span="12" class="el-col">-->