调整页面细节

src/views/agreement/agreementTask/index.vue

@@ -896,17 +896,18 @@ export default {
     },
     // 取消按钮
     cancel() {
-      this.open = false
-      this.agreementitemsList = []
       this.reset()
+      this.open = false
     },
     handleClose(){
-      this.open = false
-      this.agreementitemsList = []
       this.reset()
+      this.open = false
     },
     // 表单重置
     reset() {
+      this.determine = false
+      this.browseStatus = false
+      this.agreementitemsList = []
       this.form = {
         fId: null,
         fBillno: null,
@@ -1077,11 +1078,10 @@ export default {
             })
           } else {
             let formData = new window.FormData();
-            // 附件数据
             formData.append("agreement",JSON.stringify(this.form))
             formData.append("agreementitems", JSON.stringify(this.agreementitemsList));
             addAgreement(formData).then(response => {
-              this.msgSuccess('新增成功')
+              this.msgSuccess('保存成功')
               this.form.fId  = response.data.tWarehouseAgreement.fId;
               this.getList()
             })

src/views/startApproval.vue

@@ -16,9 +16,9 @@
           <el-select v-model="dataForm.auditUserId" disabled placeholder="审批人" style="width: 100%;">
             <el-option
               v-for="item in optionsBranch"
-              :key="item.id"
-              :label="item.cname"
-              :value="item.id">
+              :key="item.userId"
+              :label="item.userName"
+              :value="item.userId">
             </el-option>
           </el-select>
         </el-form-item>
@@ -44,35 +44,32 @@ import Global from '@/layout/components/global'
           id: null,
           actId: null,
           auditMsg: null,
-          auditUserId: this.$store.state.user.id
+          auditUserId: null
         },
         visible: false,
-        optionsBranch: [{
-          id: this.$store.state.user.id,
-          cname: this.$store.state.user.actualname
-        }]
+        optionsBranch: []
       }
     },
     components: {
     },
     methods: {
       init (id,actId) {
+        this.optionsBranch = []
         // 默认录入人
         queryUserVal().then((response)=>{
-          this.dataForm.auditUserId = response.user.userName
+          this.dataForm.auditUserId = response.user.userId
+          this.optionsBranch.push(response.user)
         })
-
         this.visible = true
         if (typeof id === 'undefined' || typeof actId === 'undefined') {
           this.$message.error('未检测到对应信息，请选择')
           return false
         }
         this.dataForm.id = id
-        this.dataForm.actId = actId
         this.dataForm.billId = id
+        this.dataForm.actId = actId
       },
       approved () {
-        this.dataForm.auditUserId = ''
         this.$confirm(`是否通过审批?`, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -117,7 +114,6 @@ import Global from '@/layout/components/global'
       //   Global.$emit("removeCache", "closeSelectedTag", view);
       // },
       approvalRejected () {
-        this.dataForm.auditUserId = ''
         this.$confirm(`是否驳回审批?`, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',

src/views/warehouseBusiness/inStock/index.vue

@@ -2481,7 +2481,7 @@
               style="padding-bottom: 0px; font-weight: bold; border: none"
               class="zzss"
             >
-              入库日期: {{ fBsdates }}
+              入库日期：{{ fBsdates }}
             </td>
           </tr>
           <tr v-for="(item, index) in Printinglist" :key="index">
@@ -3265,40 +3265,23 @@ export default {
             this.fPackagespecs = this.dataListSelection[0].fPackagespecs
             var date = new Date(this.dataListSelection[0].fBsdate)
             var Y = date.getFullYear() + '-'
-            var M =
-              (date.getMonth() + 1 < 10
-                ? '0' + (date.getMonth() + 1)
-                : date.getMonth() + 1) + '-'
-            var D =
-              (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) +
-              ' '
+            var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'
+            var D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ' '
             this.fBsdates = Y + M + D
           }
           for (let list in this.goodsOptions) {
-            if (
-              this.Printinglist[li].fGoodsid === this.goodsOptions[list].fId
-            ) {
-              this.$set(
-                this.Printinglist[li],
-                'fGoodsids',
-                this.goodsOptions[list].fName
-              )
+            if (this.Printinglist[li].fGoodsid === this.goodsOptions[list].fId) {
+              this.$set(this.Printinglist[li], 'fGoodsids', this.goodsOptions[list].fName)
             }
           }
         }
         if (this.Printinglist.length > 0) {
           for (let warehouseCr in this.Printinglist) {
-            if (
-              this.Printinglist[warehouseCr].fTruckno !=
-              this.Printinglist[0].fTruckno
-            ) {
+            if (this.Printinglist[warehouseCr].fTruckno !== this.Printinglist[0].fTruckno) {
               this.$message.error('请选择车相同车号')
               return false
             }
-            if (
-              this.Printinglist[warehouseCr].fDriverName !=
-              this.Printinglist[0].fDriverName
-            ) {
+            if (this.Printinglist[warehouseCr].fDriverName != this.Printinglist[0].fDriverName) {
               this.$message.error('请选择相同司机名')
               return false
             }
@@ -4116,7 +4099,7 @@ export default {
                 }
               }
             }
-            this.$refs.tableList.clearSelection();
+            this.$refs.checkout.clearSelection();
           });
         }
       });
@@ -4127,37 +4110,22 @@ export default {
         if (valid) {
           let formData = new window.FormData();
           formData.append("warehouseBills", JSON.stringify(this.form));
-          formData.append(
-            "warehousebillsitems",
-            JSON.stringify(this.dataListSelection)
-          );
-          formData.append(
-            "warehousebillsfeesDr",
-            JSON.stringify(this.warehouseDrList)
-          );
-          formData.append(
-            "warehousebillsfeesCr",
-            JSON.stringify(this.warehouseCrList)
-          );
-          formData.append(
-            "tEnclosure",
-            JSON.stringify(this.relevantAttachments)
-          );
-          for (let li in this.dataListSelection) {
-            this.dataListSelection[li].fBillstatus = 20;
-          }
+          formData.append("warehousebillsitems", JSON.stringify(this.dataListSelection));
+          formData.append("warehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
+          formData.append("warehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
+          formData.append("tEnclosure", JSON.stringify(this.relevantAttachments));
           addJoblist(formData).then((response) => {
             this.formBrowseStatus = true
             let dataSelection = response.data.warehousebillsitems
             for (let li in dataSelection) {
               for (let i in this.dataList) {
-                if (dataSelection[li].fId === this.dataList[i].fId) {
+                if (dataSelection[li].fId === this.dataList[i].fId && this.dataList[i].fBillstatus === 10) {
                   this.$set(this.dataList[i], 'fBillstatus', 20)
                   this.$set(this.dataList[i], 'fSerialNumber', dataSelection[li].fSerialNumber)
                 }
               }
             }
-            this.$refs.tableList.clearSelection()
+            this.$refs.checkout.clearSelection()
           })
         }
       });
@@ -4212,7 +4180,7 @@ export default {
             }
           }
         }
-        this.$refs.tableList.clearSelection();
+        this.$refs.checkout.clearSelection();
       });
     },
     // 卸货按钮
@@ -4267,7 +4235,7 @@ export default {
                 }
               }
               this.msgSuccess("卸货成功");
-              this.$refs.tableList.clearSelection();
+              this.$refs.checkout.clearSelection();
             });
           }
         });

src/views/warehouseBusiness/outStock/index.vue

@@ -292,7 +292,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row, true)"
-            v-hasPermi="['warehouseBusiness:inStock:edit']"
+            v-hasPermi="['warehouseBusiness:outStock:edit']"
           >查看
           </el-button>
           <el-button
@@ -305,17 +305,16 @@
               scope.row.fBillstatus === 3
             "
             @click="handleUpdate(scope.row, false)"
-            v-hasPermi="['warehouseBusiness:inStock:edit']"
+            v-hasPermi="['warehouseBusiness:outStock:edit']"
           >修改
           </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
-            v-show="scope.row.fItemsStatus !== 4"
             v-if="scope.row.fBillstatus < 4"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['warehouseBusiness:inStock:remove']"
+            v-hasPermi="['warehouseBusiness:outStock:remove']"
           >删除
           </el-button>
           <el-button
@@ -704,8 +703,8 @@
         </div>
         <div style="display: flex">
           <el-button @click="detailsHidden ? (detailsHidden = false) : (detailsHidden = true)">{{ detailsHidden ? "隐藏" : "展开" }}</el-button>
-          <el-button type="info" :disabled="printinglist.length <= 0" prop="打印" @click="printJobSheet">作业单</el-button>
-          <el-button :disabled="printinglist.length <= 0" @click="discharge">装货</el-button>
+          <el-button type="info" :disabled="printinglist.length <= 0 || browseStatus" prop="打印" @click="printJobSheet">作业单</el-button>
+          <el-button :disabled="printinglist.length <= 0 || browseStatus" @click="discharge">装货</el-button>
           <el-button
             :disabled="dataListSelection.length <= 0 || browseStatus"
             @click.prevent="creditClick"
@@ -716,7 +715,7 @@
             @click.prevent="withdrawClick"
           >撤回出库</el-button
           >
-          <el-button type="warning" prop="打印" :disabled="printinglist.length <= 0" @click="showEditDialog_s"
+          <el-button type="warning" prop="打印" :disabled="printinglist.length <= 0 || browseStatus" @click="showEditDialog_s"
           >出库单
           </el-button>
           <!-- <el-button type="primary" :disabled="browseStatus" @click="saveForm">保 存</el-button> -->
@@ -784,11 +783,27 @@
         >
         </el-table-column>
         <el-table-column
+          prop="fPlangrossweight"
+          header-align="center"
+          align="center"
+          width="180px"
+          label="*结余毛重"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="fPlannetweight"
+          header-align="center"
+          align="center"
+          width="180px"
+          label="*结余净重"
+        >
+        </el-table-column>
+        <el-table-column
           prop="fQty"
           header-align="center"
           width="180px"
           align="center"
-          label="*结余件数"
+          label="*出库件数"
         >
           <template slot-scope="scope">
             <el-input
@@ -796,7 +811,7 @@
               @change="qtyChange(scope.row)"
               v-model="scope.row.fQty"
               :disabled="browseStatus || scope.row.fBillstatus === 20 || scope.row.fBillstatus === 30 || scope.row.fBillstatus === 40"
-              placeholder="结余件数"
+              placeholder="出库件数"
               show-word-limit
             />
           </template>
@@ -806,14 +821,14 @@
           header-align="center"
           width="180px"
           align="center"
-          label="*结余毛重"
+          label="*出库毛重"
         >
           <template slot-scope="scope">
             <el-input
               :disabled="browseStatus || scope.row.fBillstatus === 20 || scope.row.fBillstatus === 30 || scope.row.fBillstatus === 40"
               oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
               v-model="scope.row.fGrossweight"
-              placeholder="结余毛重"
+              placeholder="出库毛重"
               show-word-limit
             />
           </template>
@@ -823,35 +838,18 @@
           header-align="center"
           width="180px"
           align="center"
-          label="*结余净重"
+          label="*出库净重"
         >
           <template slot-scope="scope">
             <el-input
               oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
               v-model="scope.row.fNetweight"
               :disabled="browseStatus || scope.row.fBillstatus === 20 || scope.row.fBillstatus === 30 || scope.row.fBillstatus === 40"
-              placeholder="结余净重"
+              placeholder="出库净重"
               show-word-limit
             />
           </template>
         </el-table-column>
-<!--        <el-table-column-->
-<!--          prop="fVolumn"-->
-<!--          header-align="center"-->
-<!--          width="180px"-->
-<!--          align="center"-->
-<!--          label="出库尺码"-->
-<!--        >-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-input-->
-<!--              oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d\d).*$/, "$1$2.$3")'-->
-<!--              v-model="scope.row.fVolumn"-->
-<!--              :disabled="browseStatus || scope.row.fBillstatus === 20 || scope.row.fBillstatus === 30 || scope.row.fBillstatus === 40"-->
-<!--              placeholder="出库尺码"-->
-<!--              show-word-limit-->
-<!--            />-->
-<!--          </template>-->
-<!--        </el-table-column>-->
         <el-table-column
           prop="fPackagespecs"
           header-align="center"
@@ -2217,7 +2215,7 @@
             <td width="290" class="zzss">电话：{{ form.fTel }}</td>
           </tr>
         </table>
-        <div style="display: flex; justify-content: space-between">
+        <div>
           <el-button type="primary" @click="printSomething">打印</el-button>
           <el-button @click="closeWindow">取消</el-button>
         </div>
@@ -2684,9 +2682,9 @@ export default {
     },
     revoke(){
       revoke(this.form.fId).then(data=>{
-        console.log(data)
         if (data.code == 200){
           this.open = false;
+          this.getList()
         }
       })
     },
@@ -2718,7 +2716,7 @@ export default {
       this.costStatus = status
       if (!this.form.fCorpid) {
         this.$message({ message: "请维护货权方", type: "warning", });
-      }else if(this.dataList[0].fGoodsid == undefined) {
+      }else if(!this.dataList[0].fGoodsid) {
         this.$message({
           message: "请维护入库明细品名",
           type: "warning",
@@ -2753,8 +2751,6 @@ export default {
     },
     // 查询作业费信息
     getWhgenlegListt() {
-      // this.queryParams.fLineno = this.form.fCorpid;
-      console.log(this.dataList[0].fGoodsid)
       let data = {
         pageNum:1,
         pageSize:10,

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -135,7 +135,6 @@
         <el-select
           v-model="queryParams.fWarehouseid"
           filterable
-          :disabled="browseStatus"
           remote
           clearable
           style="width: 80%"
@@ -349,7 +348,7 @@
                 v-model="form.fCorpid"
                 filterable
                 remote
-                :disabled="notChange"
+                :disabled="notChange || formBrowseStatus"
                 @change="changefCorpid(form)"
                 style="width: 80%"
                 :remote-method="corpsRemoteMethod"
@@ -369,7 +368,7 @@
               <el-select
                 v-model="form.fStltypeid"
                 placeholder="请选择结算方式"
-                :disabled="notChange"
+                :disabled="notChange || formBrowseStatus"
                 clearable
                 style="width: 80%"
               >
@@ -387,7 +386,7 @@
               <el-input
                 v-model="form.fMblno"
                 style="width: 80%"
-                :disabled="notChange"
+                :disabled="notChange || formBrowseStatus"
                 placeholder="手工输入"
               />
             </el-form-item>
@@ -400,7 +399,7 @@
                 v-model="form.fBsdate"
                 style="width: 80%"
                 type="date"
-                :disabled="notChange"
+                :disabled="notChange || formBrowseStatus"
                 @change="changefBsdate"
                 value-format="timestamp"
                 placeholder="业务日期"
@@ -414,7 +413,7 @@
                 v-model="form.fStorekeeper"
                 filterable
                 remote
-                :disabled="notChange"
+                :disabled="notChange || formBrowseStatus"
                 style="width: 80%"
                 :remote-method="userRemoteMethod"
                 placeholder="请输入模糊查找"
@@ -435,7 +434,7 @@
                 filterable
                 remote
                 @change="changefWarehouseid(form)"
-                :disabled="notChange"
+                :disabled="notChange || formBrowseStatus"
                 style="width: 80%"
                 :remote-method="warehouseRemoteMethod"
                 placeholder="请输入模糊查找"
@@ -466,7 +465,7 @@
               <el-select
                 v-model="form.fIfdamage"
                 placeholder="请选择是否破损"
-                :disabled="notChange"
+                :disabled="notChange || formBrowseStatus"
                 clearable
                 style="width: 80%"
               >
@@ -484,7 +483,7 @@
               <el-select
                 v-model="form.fIfweigh"
                 placeholder="请选择是否过磅"
-                :disabled="notChange"
+                :disabled="notChange || formBrowseStatus"
                 clearable
                 style="width: 80%"
               >
@@ -504,7 +503,7 @@
               <el-select
                 v-model="form.fTrademodeid"
                 placeholder="请选择贸易方式"
-                :disabled="notChange"
+                :disabled="notChange || formBrowseStatus"
                 clearable
                 style="width: 80%"
               >
@@ -543,7 +542,7 @@
             <el-input
               style="width: 100%"
               v-model="form.remark"
-              :disabled="notChange"
+              :disabled="notChange || formBrowseStatus"
               type="textarea"
               placeholder="请输入内容"
             />
@@ -555,7 +554,7 @@
               <el-form-item label="仓库联系人" prop="fContacts">
                 <el-input
                   v-model="form.fContacts"
-                  :disabled="notChange"
+                  :disabled="notChange || formBrowseStatus"
                   style="width: 80%"
                   placeholder="仓库联系人"
                 />
@@ -565,7 +564,7 @@
               <el-form-item label="仓库电话" prop="ftel">
                 <el-input
                   v-model="form.fTel"
-                  :disabled="notChange"
+                  :disabled="notChange || formBrowseStatus"
                   style="width: 80%"
                   placeholder="请输仓库入电话"
                 />
@@ -1548,10 +1547,10 @@
         </el-button>-->
         <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
         <approval-comments v-if="addOrUpdateVisib" ref="ApprovalComments" @refreshDataList="returnData"></approval-comments>
+        <el-button type="primary" v-if="notChange" @click="addOrUpdateHandle()">查看审批流</el-button>
         <el-button v-if="approve === true" @click="goApproval">审批</el-button>
         <el-button type="danger" :disabled="disappear" v-if="form.fBillstatus == '4' && Operator == Lander" @click="backApproval">撤销审批</el-button>
         <el-button type="success" @click="backrRconciliation" v-if="form.fBillstatus == '6'">撤销请核</el-button>
-        <el-button type="primary" v-if="notChange" @click="addOrUpdateHandle()">查看审批流</el-button>
         <el-button type="primary" :disabled="browseStatus" @click="saveForm">保 存</el-button>
         <el-button
           style="background-color: #008000; color: #fff"
@@ -2593,15 +2592,19 @@ export default {
     // 新增作业费协议
     addAgreement(status) {
       this.costStatus = status
+      if (this.dataList.length === 0 || !this.dataList[0].fGoodsid) {
+        this.$message({ message: "请维护库存明细，或第一行品名", type: "warning", });
+        return false
+      }
       if (!this.form.fCorpid) {
         this.$message({ message: "请维护货权方", type: "warning", });
-      } else {
-        this.whgenlegList = [];
-        this.dialogWhgenlegList = [];
-        this.whgenlegTotal = 0;
-        this.warehousingagreements = true;
-        this.getWhgenlegListt();
+        return false
       }
+      this.whgenlegList = []
+      this.dialogWhgenlegList = []
+      this.whgenlegTotal = 0
+      this.warehousingagreements = true
+      this.getWhgenlegListt()
     },
     // 新增仓储费协议
     addStorages() {
@@ -2625,8 +2628,13 @@ export default {
     },
     // 查询作业费信息
     getWhgenlegListt() {
-      this.queryParams.fLineno = this.form.fCorpid;
-      operationAgreement(this.queryParams).then((response) => {
+      let data = {
+        pageNum:1,
+        pageSize:10,
+        fLineno:this.form.fCorpid,
+        fFeeid:this.dataList[0].fGoodsid
+      }
+      operationAgreement(data).then((response) => {
         this.tasklegList = response.rows;
         this.whgenlegTotal = response.total;
       });
@@ -3195,7 +3203,6 @@ export default {
       this.detailsHidden = false;
       let data = row || this.ids;
       getStockTransfer(data.fId).then((response) => {
-        console.log(response.data.corps[0].createBy)
         this.Operator = response.data.corps[0].createBy
         if (response.data.warehousebills) {
           this.form = response.data.warehousebills;
@@ -3346,8 +3353,6 @@ export default {
       this.detailsHidden = false;
       let data = row || this.ids;
       getStockTransfer(data.fId).then((response) => {
-        console.log(response)
-
         if (response.data.warehousebills) {
           this.form = response.data.warehousebills;
           this.$set(this.form, "fEta", Date.parse(this.form.fEta));
@@ -3619,29 +3624,20 @@ export default {
           formData.append("warehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
           formData.append("warehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
           addWhgenleg(formData).then((response) => {
-            this.fid = response.data.fPid;
-            // 暂时注释掉，后续可能会加回来 仓储费得出的明细
-            /* this.fWbuOptions = response.data.fees;
-            let warehousebillsfees = response.data.warehousebillsfees;
-            for (let fees in warehousebillsfees) {
-              this.$set(warehousebillsfees[fees], "fFeeid", warehousebillsfees[fees].fFeeid + "");
-              this.$set(warehousebillsfees[fees], "fCorpid", warehousebillsfees[fees].fCorpid + "");
-              this.$set(warehousebillsfees[fees], "fFeeUnitid", warehousebillsfees[fees].fFeeUnitid + "");
-              this.warehouseDrList.push(warehousebillsfees[fees]);
-            } */
+            this.fid = response.data.fPid
             this.dataWithdrawList = []
             this.dataListSelection = []
-            this.msgSuccess("调拨成功");
-            this.$refs.tableList.clearSelection();
-            this.formBrowseStatus = true;
+            this.msgSuccess('调拨成功')
+            this.$refs.tableList.clearSelection()
+            this.formBrowseStatus = true
             for (let li in listSelection) {
               for (let i in this.dataList) {
                 if (listSelection[li].fId === this.dataList[i].fId) {
-                  this.$set(this.dataList[i], "fBillstatus", 6);
+                  this.$set(this.dataList[i], 'fBillstatus', 6)
                 }
               }
             }
-          });
+          })
         }
       });
     },