调整调拨新需求

src/api/warehouseBusiness/stockTransfer.js

@@ -27,6 +27,24 @@ export function addWhgenleg(data) {
   })
 }
 
+// 打印作业单
+export function addJoblist(data) {
+  return request({
+    url: '/warehouseBusiness/stockTransfer/waitWarehousing',
+    method: 'post',
+    data: data
+  })
+}
+
+// 卸货接口
+export function disChargelist(data) {
+  return request({
+    url: '/warehouseBusiness/stockTransfer/ischargeCargo',
+    method: 'post',
+    data: data
+  })
+}
+
 // 撤销调拨确认
 export function updateCredit (data) {
   return request({

src/views/index.vue

@@ -137,6 +137,9 @@
     <el-button type="primary" @click="dialogVisible = false">关 闭</el-button>
   </span>
     </el-dialog>
+    <!-- 弹窗, 新增 / 修改 -->
+    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    <approval-comments v-if="addOrUpdateVisib" ref="ApprovalComments" @refreshDataList="returnData"></approval-comments>
   </div>
 </template>
 
@@ -229,7 +232,6 @@ export default {
         actId: ''
       }
       inquiry(data).then(res => {
-        console.log(res)
         this.tableData = res.data
       })
     },
@@ -238,13 +240,11 @@ export default {
       this.text = res
     },
     handleClose(done) {
-      // console.log(done)
       this.dialogVisible = false
     },
     firstinventory() {
       information(0).then(response => {
         this.chart = response.data
-        console.log(this.chart.whouseList.length)
         if (this.chart.whouseList.length !== 0) {
           for (let index of this.chart.corpsListWhouse) {
             this.master.push({

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -621,6 +621,14 @@
         >
         </el-table-column>
         <el-table-column
+          prop="fWarehouseids"
+          header-align="center"
+          width="150px"
+          align="center"
+          label="*仓库"
+        >
+        </el-table-column>
+        <el-table-column
           prop="fWarehouselocids"
           header-align="center"
           width="150px"
@@ -1931,6 +1939,7 @@
               fGoodsids: this.dialogWhgenlegList[whgen].fGoodsids,
               fMarks: this.dialogWhgenlegList[whgen].fMarks,
               fBillingway: this.dialogWhgenlegList[whgen].fBillingway,
+              fWarehouseids: this.dialogWhgenlegList[whgen].fWarehouseids,
               fOriginalbillno: this.dialogWhgenlegList[whgen].fOriginalbillno,
               fOriginalbilldate: this.dialogWhgenlegList[whgen].fOriginalbilldate,
               fWarehouselocid: this.dialogWhgenlegList[whgen].fWarehouseLocationid,
@@ -2145,7 +2154,6 @@
         this.browseStatus = true
         const fId = row.fId || this.ids
         getGoodsTransfer(fId).then((response) => {
-          console.log(response.data.corps[0].createBy)
           this.Operator = response.data.corps[0].createBy
           this.form = response.data.warehousebills
           this.$set(this.form, 'fStltypeid', this.form.fStltypeid + '')

src/views/warehouseBusiness/inStock/index.vue

@@ -589,7 +589,6 @@
               />
             </el-form-item>
           </el-col>
-
         </el-row>
         <el-row>
           <el-col :span="8">
@@ -997,7 +996,7 @@
                        filterable
                        :disabled="browseStatus || scope.row.fBillstatus === 20 || scope.row.fBillstatus === 30 || scope.row.fBillstatus === 40"
                        :remote-method="kqhouseRemoteMethod"
-                       placeholder="请选择库区"
+                       placeholder="请选择业务类型"
             >
               <el-option
                 v-for="(dict, index) in fStorageTypeOptions"
@@ -1175,7 +1174,6 @@
             />
           </template>
         </el-table-column>
-
         <el-table-column
           prop="fTruckno"
           header-align="center"
@@ -1197,7 +1195,6 @@
             />
           </template>
         </el-table-column>
-
         <el-table-column
           prop="fDriverName"
           header-align="center"
@@ -1241,7 +1238,6 @@
             />
           </template>
         </el-table-column>
-
         <el-table-column
           prop="fDriverIdCar"
           header-align="center"
@@ -1263,7 +1259,6 @@
             />
           </template>
         </el-table-column>
-
         <el-table-column
           prop="fSerialNumber"
           header-align="center"
@@ -2088,7 +2083,7 @@
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="costList">导入</el-button>
+          <el-button type="primary" @click="costList">导入库存明细</el-button>
           <el-button @click="weightList = false">取 消</el-button>
         </div>
       </el-dialog>
@@ -4349,15 +4344,20 @@ export default {
     },
     wDeleteRow(index, rows) {
       rows.splice(index, 1);
-      if (this.dataList) {
-        let sum = 0;
-        for (let li in this.dataList) {
-          if (this.dataList[li].fQty) {
-            sum = Number(sum) + Number(this.dataList[li].fQty);
-          }
+      if (this.dataList.length === 0) {
+        this.formBrowseStatus = false
+        return false
+      }
+      let sum = 0
+      for (let li in this.dataList) {
+        if (this.dataList[li].fQty) {
+          sum = Number(sum) + Number(this.dataList[li].fQty)
+        }
+        if (this.dataList[li].fBillstatus > 10) {
+          this.formBrowseStatus = true
         }
-        this.mum = sum;
       }
+      this.mum = sum
     },
     // 查看审批流
     getDataList() {