Merge branch 'refs/heads/b_lms' into master_merge

lms/nladmin-ui/src/views/wms/pdm/sub/MaterDialog.vue

@@ -66,7 +66,7 @@ export default {
       url: 'api/Materialbase',
       idField: 'material_id',
       sort: 'material_id,desc',
-      query: { search: '', material_id: '' },
+      query: { search: '木箱', material_id: '' },
       crudMethod: { ...crudMaterattr }
     })
   },

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

@@ -163,7 +163,7 @@
               disabled
             />
           </el-form-item>
-          <el-form-item label="出库点" prop="point_code">
+          <el-form-item label="出库点" prop="point_code" v-if="mstrow.stor_id !== '1582991156504039455'">
             <el-select
               v-model="form2.point_code"
               clearable
@@ -180,7 +180,7 @@
             </el-select>
           </el-form-item>
           <el-form-item prop="checked">
-            <el-checkbox v-model="checked">是否异常出库</el-checkbox>
+            <el-checkbox v-if="mstrow.stor_id !== '1582991156504039455'" v-model="checked">是否异常出库</el-checkbox>
           </el-form-item>
           <el-form-item label="超期发货:" prop="is_overdue">
             <el-radio v-model="rowmst.is_overdue" label="1" :disabled="rowmst.bill_status === '40'" @change="updataIsOverdue">不发超期</el-radio>
@@ -220,6 +220,7 @@
           type="warning"
           icon="el-icon-check"
           size="mini"
+          v-if="mstrow.stor_id !== '1582991156504039455'"
           :disabled="button4"
           @click="oneSetPoint2"
         >
@@ -233,6 +234,7 @@
           type="warning"
           icon="el-icon-check"
           :disabled="button5"
+          v-if="mstrow.stor_id !== '1582991156504039455'"
           size="mini"
           @click="allSetPoint"
         >