Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/HDrpManagement/logistics/details/tabs/logisticsBox/logisticsBox.vue

@@ -6,6 +6,7 @@
         style="width: 100%"
         size="small"
         border
+        highlight-current-row
         @row-click="rowClick">
         <el-table-column
           prop="boxnum"

src/HDrpManagement/logistics/details/tabs/logisticsBox/logisticsBoxmx.vue

@@ -3,6 +3,7 @@
    <el-table
       :data="tableData"
       size="small"
+      :loading="loading"
       border>
       <el-table-column
         prop="itemno"
@@ -68,10 +69,12 @@ export default {
       tableData:[],
       total:0,
       currentPage:0,
+      loading:false
     }
   },
   methods:{
     async listData (id) {
+      this.loading = true
       this.params.content.sa_logisticsid = this.$route.query.id
       this.params.content.sa_logistics_boxid = id
 
@@ -79,6 +82,7 @@ export default {
       this.tableData = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
+      this.loading = false
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);

src/HDrpManagement/logistics/index.vue

@@ -1,39 +1,40 @@
 
 <template>
-    <div>
-      <basicLayout 
-        ref="basicLayout" 
-        :oldFormPath="{
-          add:'HDrpManagement/logistics/modules'
-        }"
-        tableName="logisticsTable" 
-        idName="sa_logisticsid" 
-        :apiId="{query:20221122132804,del:20221122132904}"
-        :detailPath="{
-          path:'/logisticsdetail'
-        }">
-        <template #custom>
-          <div class="mt-10">
-            <label  class="search__label" >订单号:</label>
-            <el-input  style="width:200px;" placeholder="搜索" :suffix-icon="$refs.basicLayout.param.content.where.sonum?$refs.basicLayout.param.content.where.sonum.length > 0?'':'':'el-icon-search'" v-model="$refs.basicLayout.param.content.where.sonum" @keyup.native.enter="$refs.basicLayout.listData($refs.basicLayout.param.content.pageNumber = 1)" @clear="$refs.basicLayout.listData($refs.basicLayout.param.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
-            </el-input>
-          </div>
-        </template>
-        <template v-slot:tbList="scope">
-          <div v-if="scope.data.column.columnname == 'status'">
-            <span style="color:#000000" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
-            <span style="color:#d90a0a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '审核'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
-            <span style="color:#52C41A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '收货'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
-          </div>
-          <div v-else>
-            {{scope.data.column.data[[scope.data.column.columnname]]}}
-          </div>
-        </template>
-        <template v-slot:tbOpreation="scope">
-        </template>
-      </basicLayout>
-    </div>
-  </template>
+  <div>
+    <basicLayout 
+      ref="basicLayout" 
+      :oldFormPath="{
+        add:'HDrpManagement/logistics/modules'
+      }"
+      tableName="logisticsTable" 
+      idName="sa_logisticsid" 
+      :apiId="{query:20221122132804,del:20221122132904}"
+      :autoQuery="false"
+      :detailPath="{
+        path:'/logisticsdetail'
+      }">
+      <template #custom>
+        <div class="mt-10">
+          <label  class="search__label" >订单号:</label>
+          <el-input  style="width:200px;" placeholder="搜索" v-model="sonum" @keyup.native.enter="queryData" @clear="queryData" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+          </el-input>
+        </div>
+      </template>
+      <template v-slot:tbList="scope">
+        <div v-if="scope.data.column.columnname == 'status'">
+          <span style="color:#000000" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#d90a0a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '审核'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#52C41A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '收货'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+        </div>
+        <div v-else>
+          {{scope.data.column.data[[scope.data.column.columnname]]}}
+        </div>
+      </template>
+      <template v-slot:tbOpreation="scope">
+      </template>
+    </basicLayout>
+  </div>
+</template>
   
   <script>
   /**
@@ -47,11 +48,20 @@
   export default {
     data () {
       return {
-        options:[]
+        options:[],
+        sonum:''
         
       }
     },
     methods:{
+      queryData () {
+        this.$refs.basicLayout.param.content.pageNumber = 1
+        this.$refs.basicLayout.param.content.where.sonum = this.sonum
+        this.$refs.basicLayout.listData()
+      }
+    },
+    mounted () {
+      this.queryData()
     }
   }
   

src/HDrpManagement/orderManage/details/tabs/changeOrderMx.vue

@@ -3,12 +3,18 @@
     <el-button type="primary" size="small" :disabled="data.length !== 1" @click="onShow">明细变更</el-button>
     <el-dialog title="明细变更" append-to-body :visible.sync="dialogVisible" width="400px">
       <el-form :model="form" size="small">
+        <el-form-item label="产品" :label-width="formLabelWidth">
+          <el-input v-model="form.itemno" disabled autocomplete="off"></el-input>
+        </el-form-item>
         <el-form-item label="产品" :label-width="formLabelWidth">
           <el-input v-model="form.itemname" disabled autocomplete="off"></el-input>
         </el-form-item>
         <el-form-item label="数量变更" :label-width="formLabelWidth">
           <el-input v-model="form.qty" autocomplete="off"></el-input>
         </el-form-item>
+        <el-form-item label="变更备注" :label-width="formLabelWidth">
+          <el-input v-model="form.remarks" autocomplete="off"></el-input>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false" size="small">取 消</el-button>
@@ -46,7 +52,7 @@ export default {
           "itemid":this.form.itemid,//商品ID
           "type":"数量",//调整类型，目前只支持数量
           "newvalue":this.form.qty,//调整后值
-          "remarks":""
+          "remarks":this.form.remarks
         }
       })
       this.tool.showMessage(res,()=>{

src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -4,7 +4,7 @@
       <div class="flex-align-center">
         <excel class="inline-16" :tablecols="columnTitle" :param="param" :total="total" :excelTitle="excelTitle"></excel>
         <slot name="operation"></slot>
-        <el-button style="margin:0 0 10px 10px" size="small" type="primary" @click="setcol = setcol === 24?12:24">{{setcol === 24?'添 加':'取 消'}}</el-button>
+        <el-button style="margin:0 0 10px 10px" size="small" type="primary" :disabled="data.status !== '新建'" v-if="type !== 'confirmdate'" @click="setcol = setcol === 24?12:24">{{setcol === 24?'添 加':'取 消'}}</el-button>
       </div>
       <el-table
         ref="multipleTable"
@@ -144,7 +144,7 @@
           label="价格"
           width="100">
           <template slot-scope="scope">
-            <el-input v-if="data.status === '新建' && data.type === '特殊订单'" v-model.number="scope.row.price" @input="if(scope.row.price > scope.row.oldprice) scope.row.price  = scope.row.oldprice; if(scope.row.price  < 0) scope.row.price  = 0;" placeholder="输入订单备注" size="mini" @change="rowChange(scope.row,scope.$index)"></el-input>
+            <el-input v-if="data.status === '新建' && data.type === '特殊订单'" v-model.number="scope.row.price" @input="onInput(scope.row,scope.$index)" placeholder="输入订单备注" size="mini" @change="rowChange(scope.row,scope.$index)"></el-input>
             <p v-else style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.price,2)}}</p>
           </template>
         </el-table-column>
@@ -266,7 +266,15 @@ export default {
         this.$emit('onSuccess')
       })
     },
-
+    onInput (data,index) {
+      // if (this.data.type !== '特殊订单') {
+      //   if(data.price > data.oldprice) 
+      //     data.price  = data.oldprice; 
+      //   if(data.price  < 0) 
+      //       data.price  = 0;
+      // }
+      this.$set(this.tableData,index,data)
+    },
     rowChange (val,index) {
       let that = this
      

src/HDrpManagement/orderManage/modules/add.vue

@@ -27,7 +27,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12" v-if="form.type !== '项目订单'">
-              <el-form-item label="选择经销商" prop="sys_enterpriseid">
+              <el-form-item label="选择企业" prop="sys_enterpriseid">
                 <agent ref="enterprise" ismanage="1" @rowClick="rowClick"></agent>
               </el-form-item>
             </el-col>
@@ -237,12 +237,16 @@ export default {
         }
       })
       this.tradefieldOptions = res1.data
+
+      this.form.tradefield = this.tradefieldOptions[0]?this.tradefieldOptions[0].tradefield:''
+      this.childField = this.tradefieldOptions[0]?this.tradefieldOptions[0].subvalues:''
+      this.form.sa_brandid = this.sa_brandidOptions[0]?this.sa_brandidOptions[0].sa_brandid:""
     },
     rowClick (row) {
       console.log(row)
       this.form.sys_enterpriseid = row.sys_enterpriseid
       this.form.type === '促销订单'?this.$refs['activity'].listData(row.sys_enterpriseid):''
-      this.form.type === '促销订单'?this.activityClick({}):''
+      // this.form.type === '促销订单'?this.activityClick({}):''
       this.pageData()
     },
     listCreate (param) {
@@ -255,7 +259,6 @@ export default {
       this.visible = false
     },
     setChildField (item) {
-      console.log(item)
       this.childField = item.subvalues
     },
     activityClick (row) {
@@ -296,6 +299,7 @@ export default {
         "billdate":"",//单据日期，默认创建日期
         "signbacknum":""
       }
+      this.$refs['enterprise'].form.enterprisename = ''
       this.visible1 = false
     }
   }

src/template/orderAddCanUseEnterprise/index.vue

@@ -18,7 +18,7 @@
           border>
           <el-table-column
             prop="enterprisename"
-            label="经销商名称"
+            label="企业名称"
             width="180">
           </el-table-column>
           <el-table-column