dev:优化

lms/nladmin-ui/src/views/wms/pdm/ivt/sbpointivt/index.vue

@@ -48,6 +48,16 @@
               @change="hand"
             />
           </el-form-item>
+          <el-form-item label="MES启用">
+            <el-switch
+              v-model="query.mes_used"
+              active-value="0"
+              inactive-value="1"
+              active-color="#C0CCDA"
+              inactive-color="#409EFF"
+              @change="hand"
+            />
+          </el-form-item>
           <rrOperation :crud="crud" />
         </el-form>
       </div>
@@ -99,6 +109,9 @@
           <el-form-item label="是否启用" prop="is_used">
             <el-switch v-model="form.is_used" active-value="1" inactive-value="0" />
           </el-form-item>
+          <el-form-item label="MES启用" prop="is_used">
+            <el-switch v-model="form.mes_used" active-value="1" inactive-value="0" />
+          </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button type="text" @click="crud.cancelCU">取消</el-button>
@@ -127,6 +140,11 @@
             {{ dict.label.is_used[scope.row.is_used] }}
           </template>
         </el-table-column>
+        <el-table-column prop="mes_used" label="MES启用">
+          <template slot-scope="scope">
+            {{ dict.label.is_used[scope.row.mes_used] }}
+          </template>
+        </el-table-column>
         <el-table-column prop="update_time" label="修改时间" min-width="150" show-overflow-tooltip />
         <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
           <template slot-scope="scope">

lms/nladmin-ui/src/views/wms/st/inStor/productscrap/index.vue

@@ -96,7 +96,7 @@
         <el-button
           slot="right"
           class="filter-item"
-          type="warning"
+          type="success"
           :permission="permission"
           :disabled="confirm_flag"
           :loading="loading_button"
@@ -109,7 +109,7 @@
         <el-button
           slot="right"
           class="filter-item"
-          type="warning"
+          type="danger"
           :permission="permission"
           :disabled="confirm_flag"
           icon="el-icon-close"

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

@@ -652,6 +652,7 @@ export default {
       const data = {
         'point_code': this.form2.point_code,
         'iostorinv_id': this.mstrow.iostorinv_id,
+        'bill_code': this.mstrow.bill_code,
         'checked': this.checked
       }
       checkoutbill.allSetPoint(data).then(res => {