Browse Source

代码上传

zhangqiOMG 2 năm trước cách đây
mục cha
commit
251b08df3a

+ 7 - 2
src/HDrpManagement/logisticcom/modules/add.vue

@@ -13,8 +13,10 @@
           <el-form :model="form" :rules="rules" ref="form" label-width="85px" label-position="right" size="mini">
             <el-col :span="24">
               <el-form-item label="企业名称:" prop="enterprisename">
-                <!-- <el-input v-model="form.enterprisename" placeholder="输入企业名称"></el-input> -->
-                <enterprise ref="ent" @rowClick="rowClick"></enterprise>
+                <div class="flex-align-center">
+                  <el-input class="inline-16" v-model="form.enterprisename" @change="inputChange" placeholder="输入企业名称"></el-input>
+                  <enterprise showType="button"  ref="ent" @rowClick="rowClick"></enterprise>
+                </div>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -76,6 +78,9 @@ export default {
       this.form = Object.assign({},this.form,{province:val[0],city:val[1],county:val[2]})
       
     },
+    inputChange () {
+      this.form.sa_logiscompid = 0
+    },
     rowClick (row) {
       this.form = Object.assign({},this.form,row)
     },

+ 1 - 1
src/HDrpManagement/orderManage/details/index.vue

@@ -387,7 +387,7 @@ export default {
         "content": {
           "sa_orderid":this.mainData.sa_orderid,
           "sa_orderitemsids": this.selection.map(e=>{
-            return e.itemid
+            return e.sa_orderitemsid
           })
         }
       })

+ 11 - 14
src/SDrpManagement/salerOrder/modules/add.vue

@@ -26,7 +26,7 @@
                 <el-input readonly v-model="form.type" placeholder="订单类型" :maxlength="11" clearable :style="{width: '100%'}"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="form.type !== '项目订单'">
+            <el-col :span="form.type==='工具订单'?24:12" v-if="form.type !== '项目订单'">
               <el-form-item label="选择经销商" prop="sys_enterpriseid">
                 <agent ref="enterprise" ismanage="0" @rowClick="rowClick"></agent>
               </el-form-item>
@@ -184,19 +184,16 @@ export default {
   methods:{
     async handleCommand (command) {
       this.form.type = command
-      if (command === '工具订单') {
-        const res = await this.$api.requested({
-          "id": 20221108111402,
-          "content":this.form
-        })
-        this.tool.showMessage(res,()=>{
-          this.$store.dispatch('changeDetailDrawer',true)
-          this.$router.push({path:'/orderdetail',query:{id:res.data.sa_orderid,rowindex:res.data.rowindex}})
-        })
-      } else {
-        this.drawer = true
-        this.specordermx()
-      }
+      const res = await this.$api.requested({
+        "id": 20221108111402,
+        "content":this.form
+      })
+      // this.tool.showMessage(res,()=>{
+      //   this.$store.dispatch('changeDetailDrawer',true)
+      //   this.$router.push({path:'/orderdetail',query:{id:res.data.sa_orderid,rowindex:res.data.rowindex}})
+      // })
+      this.drawer = true
+      this.specordermx()
      
     },
     submitForm() {

+ 3 - 1
src/components/upload/hw_obs_upload.vue

@@ -89,6 +89,7 @@ export default {
   },
   methods: {
     handleChange (file, filelist) {
+      console.log(file)
       this.filelist = filelist
       var index = file.raw.name.lastIndexOf(".");
       var ext = file.name.substr(index + 1);
@@ -108,7 +109,8 @@ export default {
     },
 
     // 上传到华为云
-    async upoladFileToServer (url, file, ext, obsfilename) {      
+    async upoladFileToServer (url, file, ext, obsfilename) {   
+      console.log(file)   
       let THIS = this
       let config = {
         headers: ext === 'pdf' ? { 'Content-Type': 'application/pdf' } : ext === 'svg'?{ 'Content-Type': 'image/svg+xml' } : { 'Content-Type': 'application/octet-stream' },

+ 3 - 2
src/template/enterprise/index.vue

@@ -50,7 +50,8 @@
           </el-pagination>
         </div>
       </div>
-      <el-input readonly :validate-event="false" slot="reference" v-model="form.enterprisename" @focus="queryEnterpriseArchives"  placeholder="输入经销商信息" clearable></el-input>
+      <el-button v-if="showType === 'button'"  slot="reference" type="primary" size="mini" @click="queryEnterpriseArchives">选择企业</el-button>
+      <el-input v-else readonly :validate-event="false" slot="reference" v-model="form.enterprisename" @focus="queryEnterpriseArchives"  placeholder="输入经销商信息" clearable></el-input>
     </el-popover>
   </div>
 </template>
@@ -61,7 +62,7 @@ export default {
   components:{
     addTemp
   },
-  props:['type','qiyi'],
+  props:['type','qiyi','showType'],
   data () {
     return {
       ENlist:[],

+ 1 - 1
vue.config.js

@@ -14,7 +14,7 @@ module.exports = {
       port: 8000,
       proxy: {
         '/apis': {
-          /*target: 'http://61.164.207.46:8000',  // 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