修改库存调整路由跳转，重订货规则数量设置默认值，样式调整

zuozhengqing

2023-12-18 fa523e19c4e89c3a08aff41fe5acb57392a0f0aa

修改库存调整路由跳转，重订货规则数量设置默认值，样式调整

 src/components/layout/components/appHeader/index.vue

@@ -47,7 +47,7 @@
        prod: `//${window.location.hostname}:9080`,
        test: `//192.168.20.119:9080`,
        // 想跳到本地启动的登录页的话需要把dev改成你本地项目路径
        dev: `//192.168.20.102:8080`
        dev: `//192.168.8.107:8080`
      }
      return loginPathMap[this.environmentType()]
    },

 src/components/makepager/CommonFormTableView.vue

@@ -118,6 +118,7 @@
                    :controls="false"
                    size="mini"
                    style="width: 100%; margin-right: 5px"
                    :min="item.prop==='minInventory'?0:1"
                    @change="
                      (val) => {
                        commonInputChange(val, item.prop, scope.row)

 src/components/makepager/TableCommonView.vue

@@ -66,7 +66,7 @@
            >{{ timeAgo(scope.row[item.prop]) }}</span
          >
          <div v-else-if="item.conversion">
            <span>{{ item.getStatus(scope.row[item.prop]) }}</span>
            <p class="exceed_width">{{ item.getStatus(scope.row[item.prop]) }}</p>
          </div>
          <span
            v-else-if="item.isClick && scope.row[item.prop]"
@@ -348,6 +348,12 @@
    border-top-left-radius: 12px;
    border-top-right-radius: 12px;
    overflow: auto;
    .exceed_width{
      width: 100%;  
      white-space: nowrap;  
      overflow: hidden;  
      text-overflow: ellipsis;
    }
  }
}


 src/router/index.js

@@ -151,8 +151,7 @@
    console.log(result,"result")
    next();
    if (!isSkip) {
      console.log(to,"看看to")
      if(to.path==="/overview/overviewList"){
      if(to.path==="/overview/overviewList"||to.path==="/overview/previewExcel"||to.path==="/operate/inventoryAdjustmentHistory"){
        next();
      }else{
        next('/noData')

 src/views/operate/orderPoint/index.vue

@@ -103,8 +103,8 @@
      amount: 0,
      operationId: 0,
      minInventory: 0,
      maxInventory: 0,
      orderNumber: 0,
      maxInventory: 1,
      orderNumber: 1,
      unit: "",
      reorderId: 0,
      searchTaskMap: [],
@@ -119,7 +119,16 @@
        pageSize: 15,
        page: 1
      })
    } else {
    }else if(this.$route.params.locationId){
      this.searchTaskMap=[]
      this.getData({
        id: this.$route.params.locationId,
        jointName:this.$route.params.locationName,
        // type:"",
        pageSize: 15,
        page: 1
      })
    }else {
      this.getData()
    }
    this.setTable()
@@ -190,7 +199,7 @@
    },
    // 操作输入
    inputContent(val, prop, row) {
      console.log(val, prop, row)
      console.log(row)
      if (prop === "minInventory") {
        this.minInventory = val
        if (parseFloat(this.minInventory) - parseFloat(this.prediction) > 0) {
@@ -249,7 +258,10 @@
        this.showDiscard = false
        let requestUrl = this.currentRowId === 0 ? addReorderRule : updateReorderRule
        let params = this.saveParams()
        requestUrl(params)
        if(params.productId===0){
          this.$message.warning("请填写产品信息!")
        }else{
          requestUrl(params)
          .then((res) => {
            console.log(res)
            if (res.code === 200) {
@@ -262,6 +274,7 @@
            console.log(err)
            this.getData()
          })
        }
        // }
      }
    },

 src/views/operate/outEnterLibrary/index.vue

@@ -83,7 +83,6 @@
  },
  created() {
    this.setTable()
    console.log(this.$route.params)
    var paramsList = sessionStorage.getItem("paramsList")
    let params = {}
    if (paramsList) {
@@ -147,11 +146,11 @@
        },
        {
          label: "业务类型",
          prop: "baseOperationType",
          prop: "operationTypeName",
          isShowColumn: true,
          default: true,
          conversion: true,
          getStatus: this.getBaseOperationTypeList
          // conversion: true,
          // getStatus: this.getBaseOperationTypeList
        },
        {
          label: "从",
@@ -221,6 +220,7 @@
    async getData() {
      if (this.params.name === "报表") {
        await listByCondition({
          // condition:"",
          keyWord:this.params.keyWord,
          produceId:this.params.produceId,
          unit:this.params.unit,
@@ -270,7 +270,6 @@
      this.getData()
    },
    tableRowClick(row,val) {
      console.log(row,"看看")
      this.workType=row.baseOperationType
      this.editConfig.title = val
      getOperationInfo(row.operationId).then((res)=>{

 src/views/productManage/product/index.vue

@@ -160,6 +160,12 @@
    setTableColumn(showcol) {
      let tableColumn = [
        {
          label: "产品编码",
          prop: "id",
          isShowColumn: true,
          default: true
        },
        {
          label: "产品名称",
          prop: "name",
          isShowColumn: true,
@@ -167,7 +173,7 @@
        },
        {
          label: "产品规格",
          prop: "spex",
          prop: "specs",
          isShowColumn: showcol.includes("产品规格"),
          default: false
        },

 src/views/reportForm/inboundOutboundDetail/index.vue

@@ -130,11 +130,11 @@
        },
        {
          label: "业务类型",
          prop: "baseOperationType",
          prop: "operationTypeName",
          isShowColumn: true,
          default: true,
          conversion: true,
          getStatus: this.getBaseOperationTypeList
          // conversion: true,
          // getStatus: this.getBaseOperationTypeList
        },
        {
          label: "从",

 src/views/reportForm/locationReport/index.vue

@@ -28,7 +28,7 @@
                  <i class="el-icon-refresh-left"></i>
                  <span>历史</span>
                </span>
                <span @click="handleAddGoods(scope)" class="margin_left_5px no-cursor">
                <span @click="handleAddGoods(scope.row)" class="margin_left_5px">
                  <i class="el-icon-refresh"></i>
                  <span>补货</span>
                </span>
@@ -163,6 +163,7 @@
        },
        {
          label: "在库数量",
          width:100,
          prop: "amount",
          isShowColumn: true,
          default: true,
@@ -257,7 +258,7 @@
    handleHistoryClick(row) {
      console.log(row)
      this.$router.push({
        name: "inboundOutboundDetail",
        name: "outEnterLibrary",
        params: {
          keyWord:row.productTypeName,
          produceId:row.produceId,
@@ -268,7 +269,15 @@
      })
    },
    // 补货
    handleAddGoods() {}
    handleAddGoods(row) {
      this.$router.push({
        name: 'orderPoint',
        params:{
          locationId:row.locationId,
          locationName:row.locationName
        }
      })
    }
  }
}
</script>

 src/views/reportForm/outboundDetail/index.vue

@@ -118,11 +118,11 @@
        },
        {
          label: "业务类型",
          prop: "baseOperationType",
          prop: "operationTypeName",
          isShowColumn: true,
          default: true,
          conversion: true,
          getStatus: this.getBaseOperationTypeList
          // conversion: true,
          // getStatus: this.getBaseOperationTypeList
        },
        {
          label: "从",