Merge branch 'master' into b_lms2

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

@@ -61,6 +61,7 @@
         </el-button>
         <el-button
           slot="left"
+          v-if="this.mstrow.bill_type !== '1011'"
           class="filter-item"
           :loading="loadingAlldiv"
           type="primary"
@@ -73,6 +74,7 @@
         </el-button>
         <el-button
           slot="left"
+          v-if="this.mstrow.bill_type !== '1011'"
           class="filter-item"
           type="primary"
           icon="el-icon-check"
@@ -97,6 +99,7 @@
         </el-button>
         <el-button
           slot="left"
+          v-if="this.mstrow.bill_type !== '1011'"
           class="filter-item"
           type="warning"
           :loading="loadingSetAllPoint"
@@ -143,6 +146,7 @@
           <el-form-item label="待分配" prop="unassign_qty">
             <el-input-number
               v-model="form2.unassign_qty"
+              style="width: 100px;"
               :controls="false"
               :precision="3"
               :min="0"
@@ -152,6 +156,7 @@
           <el-form-item label="已分配" prop="assign_qty">
             <el-input-number
               v-model="form2.assign_qty"
+              style="width: 100px;"
               :controls="false"
               :precision="3"
               :min="0"
@@ -164,7 +169,7 @@
               clearable
               placeholder="请选择"
               class="filter-item"
-              style="width: 200px;"
+              style="width: 150px;"
             >
               <el-option
                 v-for="item in pointList"
@@ -177,6 +182,20 @@
           <el-form-item prop="checked">
             <el-checkbox 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>
+            <el-radio v-model="rowmst.is_overdue" label="0" :disabled="rowmst.bill_status === '40'" @change="updataIsOverdue">发超期</el-radio>
+          </el-form-item>
+          <!--<el-form-item label="超期数量:" prop="assign_qty" v-if="rowmst.is_overdue === '1'">
+            <el-input-number
+              v-model="overdue_qyt"
+              style="width: 100px;"
+              :controls="false"
+              :precision="3"
+              :min="0"
+              disabled
+            />
+          </el-form-item>-->
         </el-form>
       </div>
       <span class="crud-opts-right2">
@@ -195,6 +214,7 @@
         </el-button>-->
         <el-button
           slot="left"
+          v-if="this.mstrow.bill_type !== '1011'"
           class="filter-item"
           :loading="loadingSetPoint"
           type="warning"
@@ -207,6 +227,7 @@
         </el-button>
         <el-button
           slot="left"
+          v-if="this.mstrow.bill_type !== '1011'"
           class="filter-item"
           :loading="loadingSetAllPoint"
           type="warning"
@@ -217,6 +238,19 @@
         >
           一键设置
         </el-button>
+        <el-button
+          slot="left"
+          v-if="this.mstrow.bill_type === '1011'"
+          class="filter-item"
+          :loading="loadingSetAllPoint"
+          type="warning"
+          icon="el-icon-check"
+          :disabled="button5"
+          size="mini"
+          @click="saveUpdate"
+        >
+          保存修改
+        </el-button>
       </span>
     </div>
     <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
@@ -227,11 +261,13 @@
         style="width: 100%;"
         max-height="400"
         size="mini"
+        :row-style="rowStyle"
         border
         :highlight-current-row="true"
         :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
         @current-change="handleDisCurrentChange"
       >
+        <el-table-column type="index" label="序号" width="50" align="center" />
         <el-table-column prop="bill_status" label="状态" align="center" width="110px">
           <template slot-scope="scope">
             <el-select
@@ -249,16 +285,23 @@
           </template>
         </el-table-column>
         <el-table-column prop="material_code" label="物料编码" width="150px" :min-width="flexWidth('material_code',crud.data,'物料编码')" />
-        <el-table-column prop="material_name" label="物料名称" width="150px" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
+        <el-table-column prop="material_name" label="物料名称" width="170px" :min-width="flexWidth('material_name',crud.data,'物料名称')" />
         <el-table-column prop="box_no" label="木箱号" width="250px" :min-width="flexWidth('box_no',crud.data,'木箱号')" />
         <el-table-column prop="pcsn" label="子卷批次号" width="150px" :min-width="flexWidth('pcsn',crud.data,'子卷批次号')" />
         <el-table-column prop="sap_pcsn" label="sap批次号" width="150px" :min-width="flexWidth('sap_pcsn',crud.data,'sap批次号')" />
-        <el-table-column show-overflow-tooltip prop="plan_qty" label="出库重量" :formatter="crud.formatNum3" align="center" />
+        <el-table-column show-overflow-tooltip prop="plan_qty" label="出库重量" :formatter="crud.formatNum3" align="center" width="120px" :min-width="flexWidth('plan_qty',crud.data,'出库重量')" >
+          <template scope="scope">
+            <el-input-number v-show="mstrow.bill_type === '1011'" v-model="scope.row.plan_qty" :precision="3" :controls="false" :min="1" style="width: 90px" />
+            <span v-show="mstrow.bill_type !== '1011'" >{{ parseFloat(scope.row.plan_qty).toFixed(3) }}</span>
+          </template>
+        </el-table-column>
         <el-table-column show-overflow-tooltip prop="struct_code" width="150px" label="仓位编码" align="center" />
         <el-table-column show-overflow-tooltip prop="struct_name" width="150px" label="仓位名称" align="center" />
+        <el-table-column show-overflow-tooltip prop="is_overdue" width="150px" label="是否超期" align="center" :formatter="formatOverdue" />
+        <el-table-column show-overflow-tooltip prop="instorage_time" width="150px" label="入库时间" align="center" />
         <el-table-column show-overflow-tooltip prop="task_code" width="150px" label="任务号" align="center" />
         <el-table-column show-overflow-tooltip prop="point_code" width="150px" label="出库点" align="center" />
-        <el-table-column align="center" label="操作" width="160" fixed="right">
+        <el-table-column align="center" label="操作" width="120" fixed="right">
           <template scope="scope">
             <el-button :disabled="tabledisabled(scope.row)" type="danger" class="filter-item" size="mini" icon="el-icon-delete" @click.native.prevent="deleteRow(scope.row)" />
           </template>
@@ -266,7 +309,7 @@
       </el-table>
     </el-card>
     <pointDialog ref="child" :dialog-show.sync="pointshow" :dialog-typedisable="typedisable" :dialog-areatype="areatype" @PointChanged="PointChanged" />
-    <StructIvt :dialog-show.sync="structshow" :stor-id="storId" :open-array="openParam" :rowmst="openRow" @StructIvtClosed="queryTableDtl" />
+    <StructIvt :dialog-show.sync="structshow" :stor-id="storId" :open-array="openParam" :rowmst="openRow" @StructIvtClosed="queryTableDtl2" />
   </el-dialog>
 </template>
 
@@ -282,7 +325,7 @@ export default {
   name: 'DivDialog',
   components: { PointDialog, StructIvt },
   mixins: [crud()],
-  dicts: ['io_bill_status', 'ST_QUALITY_SCODE', 'ST_IVT_LEVEL', 'is_used', 'work_status', 'is_usable'],
+  dicts: ['io_bill_status', 'ST_QUALITY_SCODE', 'ST_IVT_LEVEL', 'is_used', 'work_status', 'is_usable', 'IS_OR_NOT'],
   props: {
     dialogShow: {
       type: Boolean,
@@ -336,7 +379,8 @@ export default {
       invtypelist: [],
       pointList: [],
       rules: {
-      }
+      },
+      overdue_qyt: 0
     }
   },
   watch: {
@@ -391,6 +435,9 @@ export default {
     ivt_levelFormat(row, column) {
       return this.dict.label.ST_IVT_LEVEL[row.ivt_level]
     },
+    formatOverdue(row, column) {
+      return this.dict.label.IS_OR_NOT[row.is_overdue]
+    },
     is_activeFormat(row, column) {
       return this.dict.label.is_usable[row.is_active]
     },
@@ -461,6 +508,7 @@ export default {
       row.cancel_type = '3'
       checkoutbill.oneCancel(row).then(res => {
         this.queryTableDtl()
+        this.updataIsOverdue()
       })
     },
     handleDtlCurrentChange(current) {
@@ -520,6 +568,7 @@ export default {
       checkoutbill.allDiv(this.mstrow).then(res => {
         this.crud.notify('分配成功！', CRUD.NOTIFICATION_TYPE.INFO)
         this.queryTableDtl()
+        this.updataIsOverdue()
         this.loadingAlldiv = false
       }).catch(() => {
         this.loadingAlldiv = false
@@ -530,15 +579,16 @@ export default {
       //   this.crud.notify('请先选择库区！', CRUD.NOTIFICATION_TYPE.INFO)
       //   return
       // }
-      this.loadingAlldiv = true
+      this.loadingAutodiv = true
       if (this.currentRow.iostorinvdtl_id !== null) {
         this.currentRow.div_type = '2'
         this.currentRow.stor_id = this.rowmst.stor_id
         checkoutbill.allDivOne(this.currentRow).then(res => {
           this.queryTableDtl()
-          this.loadingAlldiv = false
+          this.updataIsOverdue()
+          this.loadingAutodiv = false
         }).catch(() => {
-          this.loadingAlldiv = false
+          this.loadingAutodiv = false
         })
       }
     },
@@ -547,6 +597,7 @@ export default {
       this.mstrow.cancel_type = '1'
       checkoutbill.allCancel(this.mstrow).then(res => {
         this.queryTableDtl()
+        this.updataIsOverdue()
         this.loadingAlldiv = false
       }).catch(() => {
         this.loadingAlldiv = false
@@ -560,6 +611,7 @@ export default {
         checkoutbill.allCancel(this.currentRow).then(res => {
           this.queryTableDtl()
           this.loadingAlldiv = false
+          this.updataIsOverdue()
         }).catch(() => {
           this.loadingAlldiv = false
         })
@@ -585,29 +637,6 @@ export default {
         })
       }
     },
-    oneSetPoint() {
-      if (this.form2.point_code === '') {
-        this.crud.notify('请先选择站点！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      if (this.currentDis.point_code) {
-        this.crud.notify('站点已设置！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      if (this.currentDis.work_status !== '00') {
-        this.crud.notify('任务已生成！', CRUD.NOTIFICATION_TYPE.INFO)
-        return
-      }
-      if (this.currentDis.iostorinvdis_id !== null) {
-        this.currentDis.point_code = this.form2.point_code
-        checkoutbill.oneSetPoint(this.currentDis).then(res => {
-          this.queryTableDdis(this.currentDis.iostorinvdtl_id)
-          this.crud.notify('设置成功！', CRUD.NOTIFICATION_TYPE.INFO)
-        }).catch(() => {
-          this.currentDis.point_code = ''
-        })
-      }
-    },
     oneSetPoint2() {
       if (this.form2.point_code === '') {
         this.crud.notify('请先选择站点！', CRUD.NOTIFICATION_TYPE.INFO)
@@ -657,6 +686,25 @@ export default {
         this.loadingSetAllPoint = false
       })
     },
+    saveUpdate() {
+      if (this.tabledis.length === 0) {
+        this.crud.notify('分配明细为空!', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      this.loadingSetAllPoint = true
+      const data = {
+        'dtl': this.currentRow,
+        'tabledis': this.tabledis
+      }
+      checkoutbill.saveUpdate(data).then(res => {
+        this.queryTableDtl()
+        this.queryTableDdis(this.currentRow.iostorinvdtl_id)
+        this.crud.notify('保存成功！', CRUD.NOTIFICATION_TYPE.INFO)
+        this.loadingSetAllPoint = false
+      }).catch(() => {
+        this.loadingSetAllPoint = false
+      })
+    },
     allSetPointAllDtl() {
       if (this.mstrow.stor_id !== '1582991156504039455') {
         if (this.form2.point_code === '') {
@@ -672,7 +720,6 @@ export default {
         'checked': this.checked,
         'stor_id': this.mstrow.stor_id
       }
-      debugger
       checkoutbill.allSetPoint(data).then(res => {
         this.queryTableDdis(this.currentRow.iostorinvdtl_id)
         this.crud.notify('设置成功！', CRUD.NOTIFICATION_TYPE.INFO)
@@ -686,6 +733,10 @@ export default {
         this.tableDtl = res
       })
     },
+    queryTableDtl2() {
+      this.queryTableDtl()
+      this.updataIsOverdue()
+    },
     queryTableDdis(iostorinvdtl_id) {
       checkoutbill.getOutBillDis2({ 'iostorinvdtl_id': iostorinvdtl_id, 'bill_status': '01' }).then(res => {
         this.tabledis = res
@@ -702,6 +753,23 @@ export default {
           return 'background: yellow'
         }
       }
+    },
+    rowStyle({ row, rowIndex }) {
+      const stylejson = {}
+
+      if (this.rowmst.is_overdue === '1') {
+        if (row.is_overdue === '1') {
+          stylejson.background = '#f3f071'
+          return stylejson
+        }
+      }
+    },
+    updataIsOverdue() {
+      this.rowmst.iostorinvdtl_id = this.currentRow.iostorinvdtl_id
+      checkoutbill.updataIsOverdue(this.rowmst).then(res => {
+        this.overdue_qyt = res.overdue_qyt
+        this.rowmst = res.mst
+      })
     }
   }
 }