zhangqiOMG пре 2 година
родитељ
комит
2825a76bcc

+ 7 - 1
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,()=>{

+ 11 - 3
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
      

+ 2 - 2
vue.config.js

@@ -14,8 +14,8 @@ module.exports = {
       port: 8000,
       proxy: {
         '/apis': {
-          target: 'http://61.164.207.46:8000',  // target host*/
-            // target: 'http://122.226.136.204:8082/',  // target host
+          // target: 'http://61.164.207.46:8000',  // target host*/
+            target: 'http://122.226.136.204:8082/',  // target host
           // target: 'localhost:8080',  // target host
           ws: true,  // proxy websockets 
           changeOrigin: true,  // needed for virtual hosted sites