仓储费修改

src/api/warehouseBusiness/agreement.js

@@ -66,7 +66,7 @@ export function updateAgreement_s(fId, fStatus) {
     method: 'put',
     data: {
       fId:fId,
-      fBillstatus:fStatus
+      fStatus:fStatus
     }
   })
 }

src/views/agreement/agreementTask/index.vue

@@ -101,28 +101,28 @@
         >新增
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['agreement:agreementTask:edit']"
-        >修改
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['agreement:agreementTask:remove']"
-        >删除
-        </el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['agreement:agreementTask:edit']"-->
+<!--        >修改-->
+<!--        </el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['agreement:agreementTask:remove']"-->
+<!--        >删除-->
+<!--        </el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -195,9 +195,8 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-delete"
+            icon="el-icon-view"
             @click="speed(scope.row,0)"
-            v-if="scope.row.fBillstatus == 6"
             v-hasPermi="['agreement:agreementTask:remove']"
           >查看
           </el-button>
@@ -361,6 +360,7 @@
             slot-scope="scope"
             v-model="scope.row.fPrice"
             placeholder="请输入单价"
+            oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
             :disabled="prohibit"
             clearable
             size="small"
@@ -678,6 +678,7 @@ export default {
     },
     speed(row,res){
       if(res == 1){
+        this.tablefilter = false
         this.determine = true
         this.prohibit = true
         this.browseStatus = true
@@ -751,7 +752,7 @@ export default {
               updateAgreement(this.form).then(response => {
                 let formData = new window.FormData();
                 // 附件数据
-                this.form.fBillstatus = 4
+                // this.form.fBillstatus = 4
                 formData.append("agreement",JSON.stringify(this.form))
                 formData.append("agreementitems", JSON.stringify(this.agreementitemsList));
                 collecTask(formData).then(response => {
@@ -822,7 +823,13 @@ export default {
     cancel() {
       console.log(this.cancelButton)
       this.open = false
-      this.agreementitemsList = []
+      this.agreementitemsList = {
+        fFeeunitid:'',
+        fFromdays:'',
+        fEndays:'',
+        fPrice:'',
+        fFeeid:''
+      }
       this.reset()
     },
     handleClose(){
@@ -928,6 +935,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      this.prohibit = false
       this.reset()
       this.open = true
       this.title = '添加作业费'

src/views/warehouseBusiness/agreement/index.vue

@@ -101,29 +101,28 @@
         >新增
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['agreement:agreementStorage:edit']"
-          v-if="form.fBillstatus === '2' || form.fBillstatus === '3'"
-        >修改
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['agreement:agreementStorage:remove']"
-        >删除
-        </el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['agreement:agreementStorage:edit']"-->
+<!--        >修改-->
+<!--        </el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['agreement:agreementStorage:remove']"-->
+<!--        >删除-->
+<!--        </el-button>-->
+<!--      </el-col>-->
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -180,7 +179,6 @@
             type="text"
             icon="el-icon-view"
             @click="check(scope.row,0)"
-            v-if="scope.row.fBillstatus == 6"
             v-hasPermi="['agreement:agreementStorage:edit']"
           >查看
           </el-button>
@@ -200,6 +198,7 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['agreement:agreementStorage:edit']"
+            v-if="scope.row.fBillstatus < 4"
           >修改
           </el-button>
           <el-button
@@ -207,6 +206,7 @@
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
+            v-if="scope.row.fBillstatus < 4"
             v-hasPermi="['agreement:agreementStorage:remove']"
           >删除
           </el-button>
@@ -337,6 +337,7 @@
             <el-input
               v-model="scope.row.fFromdays"
               placeholder="请输入开始天数"
+              oninput='value = value.replace(/[^\d.]/g,"")'
               clearable
               size="small"
               :disabled="notChange"
@@ -348,6 +349,7 @@
             <el-input
               v-model="scope.row.fEndays"
               placeholder="请输入结束天数"
+              oninput='value = value.replace(/[^\d.]/g,"")'
               clearable
               size="small"
               :disabled="notChange"
@@ -359,6 +361,7 @@
             slot-scope="scope"
             v-model="scope.row.fPrice"
             placeholder="请输入单价"
+            oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
             clearable
             size="small"
             :disabled="notChange"
@@ -429,8 +432,8 @@
         <el-button v-if="approve === true" @click="goApproval">审批</el-button>
         <el-button type="danger" :disabled="disappear" @click="backApproval" v-if="form.fBillstatus == '4'">撤销审批</el-button>
         <el-button type="info" v-if="notChange" @click="addOrUpdateHandle()">查看审批流</el-button>
-        <el-button type="success" @click="backrRconciliation" v-if="form.fBillstatus === '6'">撤销请核</el-button>
-        <el-button type="primary" @click="submitForm" :disabled="notChange">确 定</el-button>
+        <el-button type="success" @click="backrRconciliation" v-if="form.fBillstatus == '6'">撤销请核</el-button>
+        <el-button type="primary" @click="submitForm" :disabled="notChange">保 存</el-button>
         <el-button v-if="cancelButton === true" @click="cancel">取 消</el-button>
         <el-button v-if="cancelButton === false" @click="homePage">取消</el-button>
       </div>
@@ -561,6 +564,9 @@ export default {
         ],
         fCorpid: [
           { required: true, message: ' ', trigger: 'blur' }
+        ],
+        tPackages:[
+          { required: true, message: ' ', trigger: 'blur' }
         ]
       }
     }
@@ -695,6 +701,7 @@ export default {
     },
     // 查看按钮
     check(row, res) {
+      this.disappear = false
       this.notChange = true
       this.browseStatus = true
       getAgreement(row.fId).then(response => {
@@ -714,15 +721,13 @@ export default {
         this.fWbuOptions = response.data.feesList
         this.add = row
         console.log(JSON.stringify(this.agreementitemsList))
-        this.open = true
-        this.disappear = true
         this.title = '修改仓储费'
         if (res == 1) {
           this.notChange = true
           if (this.Operator == this.Lander) {
             this.disappear = false
             this.reset()
-            const fId = row.fId || this.ids
+            // const fId = row.fId || this.ids
             getAgreement(row.fId).then(response => {
               console.log(response)
               this.deptName = response.data.dept.deptName
@@ -747,7 +752,7 @@ export default {
           this.reset()
         }
       })
-      const fId = row.fId || this.ids
+      // const fId = row.fId || this.ids
       getAgreement(row.fId).then(response => {
         console.log(response)
         this.deptName = response.data.dept.deptName
@@ -783,25 +788,27 @@ export default {
     },
     // 撤销请核
     backrRconciliation() {
-      this.form.fBillstatus = '1'
-      backFee(this.form.fId).then(response=>{
-        this.msgSuccess("撤回成功")
+      let formData = new window.FormData()
+      // 附件数据
+      formData.append('agreement', JSON.stringify(this.form))
+      formData.append('agreementitems', JSON.stringify(this.agreementitemsList))
+      backFee(formData).then(response => {
+        this.msgSuccess('撤销成功')
+        this.open = false
         this.getList()
+        this.disappear = false
       })
-      this.open = false
-      this.getList()
     },
     // 请核按钮
     submit() {
       if (this.agreementitemsList.length !== 0) {
-        this.form.fBillstatus = '4'
+        this.open = false
         let formData = new window.FormData()
         // 附件数据
         formData.append('agreement', JSON.stringify(this.form))
         formData.append('agreementitems', JSON.stringify(this.agreementitemsList))
         PleaseCheck(formData).then(response => {
           this.msgSuccess('请核成功')
-          this.open = false
           this.getList()
         })
       } else {
@@ -918,8 +925,14 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false
-      this.agreementitemsList = []
       this.reset()
+      this.agreementitemsList = {
+          fFeeunitid:'',
+          fFromdays:'',
+          fEndays:'',
+          fPrice:'',
+          fFeeid:''
+        }
     },
     handleClose() {
       this.open = false
@@ -991,7 +1004,15 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset()
+      // this.agreementitemsList = {
+      //   fFeeunitid:'',
+      //   fFromdays:'',
+      //   fEndays:'',
+      //   fPrice:'',
+      //   fFeeid:''
+      // }
       this.open = true
+      this.browseStatus = false
       this.notChange = false
       this.title = '添加仓储费'
       queryUserVal().then((response) => {

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -3186,6 +3186,7 @@ export default {
       this.formBrowseStatus = false;
     },
     check(row, status){
+      this.disappear = false
       this.notChange = true
       this.browseStatus = status;
       this.reset();
@@ -3256,7 +3257,13 @@ export default {
         this.open = true;
         this.title = "修改调拨";
       });
-
+      if (res == 1) {
+        this.notChange = true
+        if (this.Operator == this.Lander) {
+          this.disappear = false
+          this.reset()
+        }
+      }
     },
     /** 修改按钮操作 */
     handleUpdate(row, status) {
@@ -3727,7 +3734,7 @@ export default {
       this.$set(this.form, 'fMarks', Array.from(new Set(fMarks)).join(","))
       this.$set(this.form, 'fProductName', Array.from(new Set(fGoodsid)).join(","))
     },
-    // 保存
+    // 保存agreementitemsList
     saveForm () {
       this.updateDeduplication()
       this.$refs['form'].validate((valid) => {

vue.config.js

@@ -34,8 +34,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://192.168.137.1:9010`,
-         target: `http://engineering.echepei.com:9010/`,
+        target: `http://192.168.137.1:9010`,
+        //  target: `http://engineering.echepei.com:9010/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''