调整

src/HDrpManagement/ProductGroupMag/modules/add.vue

@@ -75,9 +75,8 @@ export default {
         groupname: '',
         itemno: '',
         itemname:'',
-        sequence:'',
+        sequence:'1',
         tag: [],
-        sequence:'',
         sa_itemgroupid:0,
       },
       rules: {
@@ -91,7 +90,7 @@ export default {
           { required: true, message: '请选择商品', trigger: 'blur' },
         ],
         sequence: [
-          { required: true, message: '请输入序号', trigger: 'blur' },
+          { required: false, message: '请输入序号', trigger: 'blur' },
         ],
       }
     }

src/HDrpManagement/ProductGroupMag/modules/edit.vue

@@ -71,7 +71,7 @@ export default {
           { required: true, message: '请选择商品', trigger: 'blur' },
         ],
         sequence: [
-          { required: true, message: '请输入序号', trigger: 'blur' },
+          { required: false, message: '请输入序号', trigger: 'blur' },
         ],
       }
     }

src/HDrpManagement/ProductMag/detail/modules/detailedData.vue

@@ -54,6 +54,8 @@
         <el-descriptions-item label="创建时间">{{ basic.createdate?basic.createdate:"--" }}</el-descriptions-item>
         <el-descriptions-item label="最近编辑人">{{ basic.changeby?basic.changeby:"--" }}</el-descriptions-item>
         <el-descriptions-item label="最近编辑时间">{{ basic.changedate?basic.changedate:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="上架人">{{ basic.onsaleby?basic.onsaleby:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="上架时间">{{ basic.onsaledate?basic.onsaledate:"--" }}</el-descriptions-item>
         <el-descriptions-item label="审核人">{{ basic.checkby?basic.checkby:"--" }}</el-descriptions-item>
         <el-descriptions-item label="审核时间">{{ basic.checkdate?basic.checkdate:"--" }}</el-descriptions-item>
       </el-descriptions>

src/HDrpManagement/ProductMag/index.vue

@@ -56,6 +56,21 @@
             </el-option>
           </el-select>
         </div>
+        <div class="mt-10">
+          <label class="search__label" >上架时间:</label>
+          <el-date-picker
+              style="margin-right: 24px !important;"
+              size="small"
+              @change="selectChange"
+              value-format="yyyy-MM-dd"
+              v-model="dateSelect"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              clearable>
+          </el-date-picker>
+        </div>
       </template>
       <template v-slot:tbList="scope">
         <div>
@@ -155,10 +170,13 @@ export default {
       ],
       selectParam:{
         isonsale:'',
-        status:''
+        status:'',
+        begindate:'',
+        enddate:''
       },
       rowData:[],
-      errorUrl:null
+      errorUrl:null,
+      dateSelect:'',
     }
   },
   components:{
@@ -217,6 +235,13 @@ export default {
       })
     },
     selectChange(){
+      if (this.dateSelect !== '' && this.dateSelect !== null){
+        this.selectParam.begindate = this.dateSelect[0]
+        this.selectParam.enddate = this.dateSelect[1]
+      }else {
+        this.selectParam.begindate = ''
+        this.selectParam.enddate = ''
+      }
       this.$refs.basicLayout.param.content.where = this.selectParam
       this.$refs.basicLayout.listData()
     },

src/HDrpManagement/contractManage/components/itemClass/index.vue

@@ -181,5 +181,7 @@ export default {
 </script>
 
 <style scoped>
-
+/deep/ .el-input.is-disabled .el-input__inner{
+  color: #666666;
+}
 </style>

src/HDrpManagement/contractManage/components/productClassList/productClassList.vue

@@ -189,5 +189,7 @@ export default {
 </script>
 
 <style scoped>
-
+/deep/ .el-input.is-disabled .el-input__inner{
+  color: #666666;
+}
 </style>

src/HDrpManagement/contractManage/components/productDetailList/productDetailList.vue

@@ -356,5 +356,7 @@ export default {
 </script>
 
 <style scoped>
-
+/deep/ .el-input.is-disabled .el-input__inner{
+  color: #666666;
+}
 </style>

src/HDrpManagement/contractManage/components/productList/productBillno.vue

@@ -419,5 +419,7 @@ export default {
 </script>
 
 <style scoped>
-
+/deep/ .el-input.is-disabled .el-input__inner{
+  color: #666666;
+}
 </style>

src/HDrpManagement/contractManage/components/toolList/toolList.vue

@@ -340,4 +340,7 @@ export default {
     height: 38px;
     margin: 0;
   }
+  /deep/ .el-input.is-disabled .el-input__inner{
+    color: #666666;
+  }
 </style>

src/HDrpManagement/contractManage/index.vue

@@ -228,10 +228,30 @@ export default {
         this.selectParam.begindate = ''
         this.selectParam.enddate = ''
       }
+      let sort = [
+        {
+          reversed : 0,
+          sorted: 1,
+          sortid: 78,
+          sortname: "默认"
+        },
+        {
+          reversed : 0,
+          sorted: 1,
+          sortid: 135,
+          sortname: "站点全部"
+        }
+      ]
       this.$refs.list.param.content.type = this.area
       this.selectParam.type = this.type
       this.selectParam.status = this.status
       this.$refs.list.param.content.where = this.selectParam
+
+      if (this.area == '99'){
+        this.$refs.list.param.content.sort = [sort[1]]
+      }else {
+        this.$refs.list.param.content.sort = [sort[0]]
+      }
       this.$refs.list.listData()
     },
     async querytemplet () {

src/HDrpManagement/projectChange/modules/modules/productSet/index.vue

@@ -403,6 +403,9 @@ export default {
   /* box-shadow: 0 5px 5px rgb(0 0 0 / 10%);
   transform: translate3d(0,-2px,0); */
 }
+/deep/ .el-input.is-disabled .el-input__inner{
+  color: #666666;
+}
 .image {
   width:38px;height:38px;margin:0px auto;
 }

src/HDrpManagement/projectChange/modules/modules/quotation/index.vue

@@ -198,4 +198,7 @@ export default {
   display: flex;
   justify-content: s;
 } */
+/deep/ .el-input.is-disabled .el-input__inner{
+  color: #666666;
+}
 </style>

src/SDrpManagement/QuotedPrice/detail/modules/itemClass/index.vue

@@ -190,5 +190,8 @@ export default {
 </script>
 
 <style scoped>
+/deep/ .el-input.is-disabled .el-input__inner{
+  color: #666666;
+}
 
 </style>

src/SDrpManagement/QuotedPrice/detail/modules/productInventory/index.vue

@@ -43,8 +43,8 @@
           <div v-if="scope.column.columnname == 'qty'">
             <el-input-number :disabled="data.status !== '新建' || !tool.checkAuth($route.name,'productDetails') || !disabled" v-model="scope.column.data.qty" size="mini"  :min="1" label="描述文字" @change="onChangeNum(scope.column.data.qty,scope.column.data,scope.$index)"></el-input-number>
           </div>
-          <div v-else-if="scope.column.columnname == 'discountrate'">
-            <el-input :disabled="data.status !== '新建' || !tool.checkAuth($route.name,'productDetails') || !disabled"  v-model="scope.column.data.discountrate" size="mini" placeholder="请输入折扣" @change="onChangeDiscountrate(scope.column.data.discountrate,scope.column.data,scope.$index)"></el-input>
+          <div v-else-if="scope.column.columnname == 'discountrate'" >
+            <el-input  :disabled="data.status !== '新建' || !tool.checkAuth($route.name,'productDetails') || !disabled"  v-model="scope.column.data.discountrate" size="mini" placeholder="请输入折扣" @change="onChangeDiscountrate(scope.column.data.discountrate,scope.column.data,scope.$index)"></el-input>
           </div>
           <div v-else-if="scope.column.columnname == 'price'">
             <el-input :disabled="data.status !== '新建' || !tool.checkAuth($route.name,'productDetails') || !disabled"  v-model="scope.column.data.price" size="mini" placeholder="请输入单价" @change="onChangePrice(scope.column.data.price,scope.column.data,scope.$index)"></el-input>
@@ -457,6 +457,9 @@ export default {
   border:1px solid rgb(0 0 0 / 5%)
   /* box-shadow: 0 5px 5px rgb(0 0 0 / 10%);
   transform: translate3d(0,-2px,0); */
+}
+ /deep/ .el-input.is-disabled .el-input__inner{
+  color: #666666;
 }
 .image {
   width:38px;height:38px;margin:0px auto;

src/SDrpManagement/QuotedPrice/index.vue

@@ -171,7 +171,7 @@ export default {
         },
         {
           reversed : 0,
-          sorted: 0,
+          sorted: 1,
           sortid: 136,
           sortname: "站点全部"
         }
@@ -185,6 +185,12 @@ export default {
       }
       this.$refs.quotedPriceList.param.content.type = this.tabIndex
       this.$refs.quotedPriceList.param.content.where = this.selectParam
+      if (this.tabIndex == '99'){
+        this.$refs.quotedPriceList.param.content.sort = [sort[1]]
+      }else {
+        this.$refs.quotedPriceList.param.content.sort = [sort[0]]
+      }
+
       this.$refs.quotedPriceList.listData()
     },
     /*是否经销商*/

src/template/addProduct/index.vue

@@ -186,7 +186,42 @@ export default {
           "sa_brandid":this.sa_brandid !== '' ? this.sa_brandid : 0
         }
       })
+      console.log(res.data[0].ttemclass,'获取分类数据')
+      let arr = []
+      function converTree(node) {
+        console.log(node)
+        var elNode = {
+          isdeep:node["isdeep"],
+          ishide:node["ishide"],
+          istool:node["istool"],
+          itemclassfullname:node["itemclassfullname"],
+          itemclassfullnum:node["itemclassfullnum"],
+          itemclassid:node["itemclassid"],
+          itemclassname:node["itemclassname"],
+          itemclassnum:node["itemclassnum"],
+          num:node["num"],
+          parentid:node["parentid"],
+          rowindex:node["rowindex"],
+          subdep:[]
+        }
+        if (node.subdep.length > 0) {
+          // 如果存在子节点
+          for (var index = 0; index < node.subdep.length; index++) {
+            // 遍历子节点, 把每个子节点看做一颗独立的树, 传入递归构造子树, 并把结果放回到新node的children中
+            elNode.subdep.push(converTree(node.subdep[index]));
+          }
+        }
+        return elNode;
+      }
+      // this.options.itemclass = arr
+      res.data[0].ttemclass.forEach(e=>{
+        arr.push(converTree(e))
+      });
+
       this.options.itemclass = res.data[0].ttemclass
+      console.log(arr,'arr的数据')
+
+      return arr
 
     },
     classChange(){

vue.config.js

@@ -15,8 +15,8 @@ module.exports = {
       proxy: {
         '/apis': {
           // target: 'http://61.164.207.46:8000',  // target host*/
-          // target: 'http://192.168.3.9:8090',  // target host*!
-          target: 'https://oms.idcgroup.com.cn:8079/',  // target host
+          target: 'http://192.168.3.9:8090',  // target host*!
+          // target: 'https://oms.idcgroup.com.cn:8079/',  // target host
           // target: 'localhost:8080',  // target host
           ws: true,  // proxy websockets 
           changeOrigin: true,  // needed for virtual hosted sites