zanucn

src/Form/promotion/add.vue

@@ -27,7 +27,7 @@
             </el-col>
             <el-col :span="12" >
               <el-form-item label="订货账户:" prop="type">
-                <el-select v-model="form.sa_accountclassid" placeholder="请选择订货账户" style="width: 100%">
+                <el-select v-model="form.sa_accountclassid" placeholder="请选择订货账户" style="width: 100%" @change="accountChange">
                   <el-option
                       v-for="item in accountList"
                       :key="item.sa_accountclassid"
@@ -278,15 +278,25 @@ export default {
     },
     brandChange (val) {
 
+    },
+    accountChange(val){
+      this.form.tradefield = []
+      this.getTradefield(val)
     },
     coverChange (data) {
       this.form.cover = data
     },
     /* 领域 */
-    async getTradefield () {
+    async getTradefield (val) {
       const res = await this.$store.dispatch('optiontypeselect','tradefield')
-      this.tradefieldList = res.data
-      console.log(this.tradefieldList,'领域');
+      if (val === 42){
+        this.tradefieldList =  res.data.filter(item=>item.value != '整装工程')
+      }else if (val === 44) {
+        this.tradefieldList =  res.data.filter(item=>item.value == '整装工程')
+      }else {
+        this.tradefieldList = res.data
+      }
+
     },
     /* 品牌 */
     async getBrand () {
@@ -301,7 +311,7 @@ export default {
       })
       this.brandList = res.data
       console.log(this.brandList,'品牌');
-      
+
     },
     /* 账户类型 */
     async getAccount () {
@@ -317,7 +327,7 @@ export default {
       })
       this.accountList = res.data
       console.log(this.accountList,'账户');
-      
+
     },
     uploadSuccess (data) {
 
@@ -338,4 +348,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/Form/promotion/edit.vue

@@ -27,7 +27,7 @@
             </el-col>
             <el-col :span="12" >
               <el-form-item label="订货账户:" prop="type">
-                <el-select v-model="form.sa_accountclassid" placeholder="请选择订货账户" style="width: 100%">
+                <el-select v-model="form.sa_accountclassid" placeholder="请选择订货账户" style="width: 100%" @change="accountChange">
                   <el-option
                       v-for="item in accountList"
                       :key="item.sa_accountclassid"
@@ -250,7 +250,7 @@ export default {
       this.form = Object.assign({},this.form,this.data)
       this.form.cover = this.form.attinfos
       console.log(this.form);
-      
+
       this.$nextTick(() => {
         this.$refs.upload.fileLinkList = this.form.attinfos
         this.$refs.upload.fileList = this.form.attinfos
@@ -291,11 +291,22 @@ export default {
     coverChange (data) {
       this.form.cover = data
     },
+    accountChange(val){
+      this.form.tradefield = []
+      this.getTradefield(val)
+    },
     /* 领域 */
-    async getTradefield () {
+    async getTradefield (val) {
       const res = await this.$store.dispatch('optiontypeselect','tradefield')
-      this.tradefieldList = res.data
-      console.log(this.tradefieldList,'领域');
+      if (val === 42){
+        this.tradefieldList =  res.data.filter(item=>item.value != '整装工程')
+      }else if (val === 44) {
+        this.tradefieldList =  res.data.filter(item=>item.value == '整装工程')
+      }else {
+        this.tradefieldList = res.data
+      }
+    /*  this.tradefieldList = res.data
+      console.log(this.tradefieldList,'领域');*/
     },
     /* 品牌 */
     async getBrand () {
@@ -310,7 +321,7 @@ export default {
       })
       this.brandList = res.data
       console.log(this.brandList,'品牌');
-      
+
     },
     /* 账户类型 */
     async getAccount () {
@@ -326,7 +337,7 @@ export default {
       })
       this.accountList = res.data
       console.log(this.accountList,'账户');
-      
+
     },
     uploadSuccess (data) {
       this.$emit('onSuccess')
@@ -346,4 +357,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/HDrpManagement/dispatch/modules/productlist.vue

@@ -13,7 +13,7 @@
               <span v-else>{{scope.column.data.qty}}</span>
             </p>
             <p v-else-if="scope.column.columnname == 'batchno'">
-              <el-select :disabled="data.STATUS !== '新建'" v-if="scope.column.data.batchcontrol == 1" v-model="scope.column.data.batchno" placeholder="请选择" @visible-change="visibleChange(scope.column.data)" size="mini" @change="rowChange(scope.column.data,scope.column.data.$index)">
+              <el-select :disabled="data.STATUS !== '新建'" v-if="scope.column.data.batchcontrol == 1" v-model="scope.column.data.batchno" placeholder="请选择" @visible-change="visibleChange(scope.column.data)" size="mini" @change="rowChange(scope.column.data,scope.column.index)">
                 <el-option
                     v-for="item in options"
                     :key="item.fbatchno"
@@ -24,7 +24,7 @@
               <span v-else>{{scope.column.data.batchno}}</span>
             </p>
             <p v-else-if="scope.column.columnname == 'remarks'">
-              <el-input v-if="data.STATUS === '新建'" v-model="scope.column.data.remarks" placeholder="输入订单备注" size="mini" @change="rowChange(scope.column.data,scope.column.data.$index)"></el-input>
+              <el-input v-if="data.STATUS === '新建'" v-model="scope.column.data.remarks" placeholder="输入订单备注" size="mini" @change="rowChange(scope.column.data,scope.column.index)"></el-input>
               <span v-else>{{scope.column.data.remarks}}</span>
             </p>
             <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
@@ -205,7 +205,14 @@ export default {
     },
     rowChange(val,index){
       let that = this
-      this.$set(this.tableData,index,val)
+      if (val.qty > val.undeliqty) {
+        val.qty = val.undeliqty
+      }
+      console.log(val,index)
+
+      // this.$nextTick(()=>{
+      //   this.$set(this.tableData,index,val)
+      // })
       // // 防抖
       if(this.time !== null){
         clearTimeout(this.time);
@@ -222,7 +229,8 @@ export default {
         },()=>{
           this.listData()
         })
-      },500)
+      },1000)
+
     },
     async updateOrder (val,fn) {
       const res  = await this.$api.requested({

src/HDrpManagement/orderManage/index.vue

@@ -95,6 +95,13 @@
                     @keyup.native.enter="change" @clear="change" size="small" class="input-with-select inline-24 layout_search__panel" clearable>
           </el-input>
         </div>
+        <div class="mt-10" >
+          <p class="search__label">待手工关闭:</p>
+          <el-select v-model="where.tobeclosebyhand" clearable style="margin-right:10px" size="small" placeholder="请选择手工关闭状态" @change="change">
+            <el-option label="是" value="1"></el-option>
+            <el-option label="否" value="0"></el-option>
+          </el-select>
+        </div>
       </template>
       <template #custom-right>
         <el-button type="text" v-if="!more" @click="more = true">更多</el-button>
@@ -151,7 +158,8 @@ export default {
         "ischange": '',
         "agentinfo":'',
         "remarks":'',
-        "createby":''
+        "createby":'',
+        "tobeclosebyhand":''
       },
       dateSelect:[],
       more:false,

src/HDrpManagement/orderMx/index.vue

@@ -53,6 +53,23 @@
             </el-option>
           </el-select>
         </div>
+        <div class="mt-10 inline-16">
+          <label class="search__label" >查看未发:</label>
+          <el-select v-model="where.isuncheckout" placeholder="请选择" size="small" @change="selectChange">
+            <el-option
+                label="全部"
+                value="">
+            </el-option>
+            <el-option
+                label="是"
+                value="1">
+            </el-option>
+            <el-option
+                label="否"
+                value="0">
+            </el-option>
+          </el-select>
+        </div>
         <div class="mt-10">
           <p class="search__label">状态:</p>
           <el-select v-model="where.status" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="selectChange">
@@ -111,7 +128,8 @@ export default {
         "invoicestatus":'',
         "isreturn": '',
         "ischange": '',
-        "isfreeze":''
+        "isfreeze":'',
+        "isuncheckout":''
       },
       dateSelect:[]
 
@@ -124,6 +142,7 @@ export default {
         this.$refs.basicLayout.param.content.where.begindate = this.dateSelect[0]
         this.$refs.basicLayout.param.content.where.enddate = this.dateSelect[1]
         this.$refs.basicLayout.param.content.where.isfreeze = this.where.isfreeze
+        this.$refs.basicLayout.param.content.where.isuncheckout = this.where.isuncheckout
         this.$refs.basicLayout.param.content.where.status = this.where.status
         this.$refs.basicLayout.param.content.where.agentinfo = this.where.agentinfo
         this.$refs.basicLayout.param.content.where.iteminfo = this.where.iteminfo

src/HDrpManagement/productStore/index.vue

@@ -118,18 +118,18 @@ export default {
       this.classOptions = res.data[0].ttemclass
     },
     onSubmit () {
-      let bool = false
+      let bool = true
       if (this.itemname == '' && this.itemclassids.length == 0 && this.iteminfo == '' && this.agentinfo == '' && this.isonsale == '' && this.isonsale !== 0 ) {
-        bool = true
+        bool = false
       }
       this.$refs['list'].param.content = {
-        "iteminfo":this.iteminfo,
-        "itemclassids":this.itemclassids.length == 0?[]:[this.itemclassids[this.itemclassids.length - 1]],
-        "agentinfo":this.agentinfo,
-        "pageSize":100,
-        "all":bool,
         "where":{
-          'isonsale':this.isonsale
+          'isonsale':this.isonsale,
+          "iteminfo":this.iteminfo,
+          "itemclassids":this.itemclassids.length == 0?[]:[this.itemclassids[this.itemclassids.length - 1]],
+          "agentinfo":this.agentinfo,
+          "pageSize":100,
+          "all":bool,
         }
       }
       this.$refs['list'].listData()
@@ -139,14 +139,16 @@ export default {
         "id":"20230408091703",
         "version":1,
         "content":{
-          "all":true,
-          "itemclassids":[],
-          "itemname":"",
-          "agentinfo":"",
-          "pageSize":100,
-          "where":{},
-          "itemno":"",
-          "isExport":1
+          "where":{
+            "all":true,
+            "itemclassids":[],
+            "itemname":"",
+            "agentinfo":"",
+            "pageSize":100,
+            "itemno":"",
+            "isExport":1
+          },
+
         }
       })
       window.open(res.data[0].url)

src/components/table/index5.vue

@@ -7,7 +7,7 @@
           type="selection"
           width="35" fixed v-if="checkbox">
       </el-table-column>
-      <el-table-column v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="width" :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?redirect ? redirect : 'right' :false : false">
+      <el-table-column v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="col.width" :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?redirect ? redirect : 'right' :false : false">
         <template slot-scope="scope">
           <div class="table-panel">
             <!-- 自定义表格显示内容 -->
@@ -46,6 +46,7 @@ export default {
   methods:{
     rowClick (row) {
       this.$emit('rowClick',row)
+      this.$refs.table.doLayout()
     },
     tableClassName ({row,rowIndex}) {
       row.index = rowIndex

src/template/invoiceCanUseProduct/index1.vue

@@ -84,6 +84,7 @@ export default {
     },
     onConfirm () {
       this.$emit('onConfirm',this.tableSelectData)
+      this.tableSelectData = []
     },
     clearSelection () {
       this.$refs.multipleTable.clearSelection();

yos/css/5188.1a6bc3a9.css

@@ -1 +0,0 @@
-.upload_image__panel[data-v-b87b2cdc]{position:relative;height:148px;width:148px;border-radius:6px;margin-right:10px;margin-bottom:10px;border:1px solid #c0ccda;overflow:hidden}.upload_image__panel img[data-v-b87b2cdc]{width:100%;height:100%}.upload_image__panel_mod[data-v-b87b2cdc]{position:absolute;top:0;left:0;width:100%;height:100%;color:#fff;background:rgba(0,0,0,.8);opacity:0;transition:.3s linear;cursor:pointer}.upload_image__panel:hover .upload_image__panel_mod[data-v-b87b2cdc]{opacity:1}.pionter[data-v-b87b2cdc]{margin:6px 0;padding:10px;transition:.2s linear;cursor:pointer;border-radius:5px}.pionter[data-v-b87b2cdc]:hover{box-shadow:0 5px 10px rgba(0,0,0,.1)}

yos/index.html

@@ -1 +1 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>yos_manage</title><script defer="defer" type="module" src="js/chunk-vendors.e428fee0.js"></script><script defer="defer" type="module" src="js/app.6ee8a56d.js"></script><link href="css/app.219699e2.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.0beef1e9.js" nomodule></script><script defer="defer" src="js/app-legacy.b6174e37.js" nomodule></script></head><body><noscript><strong>We're sorry but yos_manage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body><head><meta http-equiv="pragma" content="no-cache"></head></html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>yos_manage</title><script defer="defer" type="module" src="js/chunk-vendors.e428fee0.js"></script><script defer="defer" type="module" src="js/app.3b6bf20d.js"></script><link href="css/app.219699e2.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.0beef1e9.js" nomodule></script><script defer="defer" src="js/app-legacy.f42b2cd8.js" nomodule></script></head><body><noscript><strong>We're sorry but yos_manage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body><head><meta http-equiv="pragma" content="no-cache"></head></html>