Merge remote-tracking branch 'origin/master'

lms/nladmin-ui/src/views/wms/basedata/structattr/index.vue

@@ -144,7 +144,7 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="20">
+          <el-row :gutter="24">
             <el-col :span="12">
               <el-form-item label="载具号">
                 <label slot="label">载&nbsp;&nbsp;具&nbsp;号:</label>
@@ -222,12 +222,28 @@
             </el-col>
           </el-row>
           <el-row :gutter="20">
-            <el-col :span="24">
+            <el-col :span="12">
               <el-form-item label="是否临时" prop="is_tempstruct">
                 <el-radio v-model="form.is_tempstruct" label="1">是</el-radio>
                 <el-radio v-model="form.is_tempstruct" label="0">否</el-radio>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="占用状态" prop="occupancy_state">
+                <el-select
+                  v-model="form.occupancy_state"
+                  placeholder=""
+                  style="width: 200px"
+                >
+                  <el-option
+                    v-for="item in dict.occupancy_state"
+                    :key="item.id"
+                    :label="item.label"
+                    :value="parseInt(item.value)"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
@@ -292,6 +308,11 @@
         <el-table-column prop="inv_code" label="锁定单据编码" width="150" />
         <el-table-column prop="inv_type" label="锁定单据类型" width="150" :formatter="invtypeFormat" />
         <el-table-column prop="remark" label="备注" show-overflow-tooltip />
+        <el-table-column prop="occupancy_state" label="占用状态" show-overflow-tooltip >
+          <template slot-scope="scope">
+            {{ dict.label.occupancy_state[scope.row.occupancy_state] }}
+          </template>
+        </el-table-column>
         <el-table-column
           v-permission="['admin','structattr:edit','structattr:del']"
           label="操作"

lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue

@@ -297,7 +297,7 @@ export default {
       sects: [],
       pointList: [],
       rules: {
-      },
+      }
     }
   },
   watch: {