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

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

@@ -193,6 +193,25 @@
               />
             </el-select>
           </el-form-item>
+
+          <el-form-item label="是否管控">
+            <el-select
+              v-model="query.control"
+              clearable
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+              style="width: 200px;"
+              @change="crud.toQuery"
+            >
+              <el-option
+                v-for="item in dict.IS_OR_NOT"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <rrOperation :crud="crud" />
         </el-form>
       </div>
@@ -379,6 +398,7 @@ export default {
       this.sects = res.content
     })
     this.crud.query.ivt_status = 'canuse_qty'
+    this.crud.query.control = '0'
     this.crud.toQuery()
   },
   methods: {

lms/nladmin-ui/src/views/wms/control/ivtcontrol/AddDialog.vue

@@ -293,6 +293,12 @@ export default {
         return
       }
       this.form.open_type = this.openType
+      if (this.openType === '0' || this.openType === '1') {
+        if (this.form.remark === '') {
+          this.crud.notify('备注不能为空！', CRUD.NOTIFICATION_TYPE.INFO)
+          return
+        }
+      }
       crudControl.addSubmit(this.form).then(res => {
         this.crud.notify('操作成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.crud.toQuery()

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

@@ -57,6 +57,7 @@
         >
           <el-option
             v-for="item in dict.ST_INV_OUT_TYPE"
+            :disabled="item.value === '1099'"
             :key="item.value"
             :label="item.label"
             :value="item.value"