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

src/HDrpManagement/dispatch/details/index.vue

@@ -137,7 +137,7 @@ import defaultInfo from '../modules/defaultInfo.vue'
             value:this.mainData.freightstatus
           },
           {
-            label:'类型',
+            label:'订单类型',
             value:this.mainData.type
           },
           {

src/HDrpManagement/invoiceapp/detail/tab/blueInvoice/components/canUseInvioceItem.vue

@@ -2,6 +2,15 @@
   <div>
     <el-button v-if="tool.checkAuth($route.name,'editBlueInvioce')" :disabled="status != '提交' && status != '新建'" size="small" type="primary" @click="onShow">添加开票明细行</el-button>
     <el-dialog title="选择开票明细行" :visible.sync="dialogTableVisible" append-to-body>
+      <el-input 
+        style="width:200px;margin-bottom:10px" 
+        size="small"  
+        suffix-icon="el-icon-search" 
+        placeholder="搜索" 
+        v-model="param.content.where.condition"
+        @keyup.enter.native="listData(param.content.pageNumber = 1)" 
+        @clear="listData(param.content.pageNumber = 1)" clearable
+      ></el-input>
       <el-table :data="list" size="mini" border>
         <el-table-column prop="sonum" label="订单号" width="150"></el-table-column>
         <!-- <el-table-column prop="type" label="订单类型" width="90"></el-table-column>

src/HDrpManagement/logistics/details/index.vue

@@ -148,7 +148,7 @@
             value:this.mainData.enterprisename
           },
           {
-            label:'类型',
+            label:'订单类型',
             value:this.mainData.type
           },
           {

src/HDrpManagement/orderManage/modules/add.vue

@@ -20,7 +20,7 @@
         <el-dropdown-item command="项目订单">项目订单</el-dropdown-item>
         <el-dropdown-item command="促销订单">促销订单</el-dropdown-item>
         <el-dropdown-item command="工具订单">工具订单</el-dropdown-item>
-        <el-dropdown-item command="样品订单" v-if="siteId=='HY'">样品订单</el-dropdown-item>
+        <!-- <el-dropdown-item command="样品订单" v-if="siteId=='HY'">样品订单</el-dropdown-item> -->
       </el-dropdown-menu>
     </el-dropdown>
     <el-drawer
@@ -98,6 +98,14 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="12" v-if="form.type =='标准订单' || form.type =='项目订单'">
+              <el-form-item label="是否样品订单" prop="typemx">
+                <el-radio-group v-model="form.typemx">
+                  <el-radio label="样品">是</el-radio>
+                  <el-radio label="">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
             <el-col :span="24"  v-if="form.type ==='标准订单' || form.type ==='特殊订单' || form.type ==='样品订单'">
               <el-form-item label="项目备注">
                 <el-input size="mini" class="order__note__input" type="textarea" v-model="form.projectnote" :autosize="{minRows:5}" placeholder="请输入项目备注"></el-input>
@@ -161,11 +169,6 @@ export default {
           message: '请选择选择领域',
           trigger: 'change'
         }],
-        typemx: [{
-          required: true,
-          message: '请选择选子分类',
-          trigger: 'change'
-        }],
         sys_enterpriseid:[{
           required: true,
           message: '订货经销商不能为空',
@@ -211,6 +214,15 @@ export default {
   methods:{
     async handleCommand (command) {
       this.form.type = command
+      if (this.form.type == '特殊订单') {
+        this.rules.typemx = [{
+          required: true,
+          message: '请选择选子分类',
+          trigger: 'change'
+        }]
+      } else {
+        delete this.rules.typemx
+      }
       // const res = await this.$api.requested({
       //   "id": 20221108111402,
       //   "content":this.form
@@ -232,6 +244,7 @@ export default {
         })
         this.tool.showMessage(res,()=>{
           this.drawer = false
+          this.refresh()
           this.$store.dispatch('changeDetailDrawer',true)
           this.$router.push({path:'/orderdetail',query:{id:res.data.sa_orderid,rowindex:res.data.rowindex}})
         })
@@ -322,7 +335,9 @@ export default {
         "billdate":"",//单据日期，默认创建日期
         "signbacknum":""
       }
-      this.$refs['enterprise'].form.enterprisename = ''
+      if( this.$refs['enterprise'] ) {
+        this.$refs['enterprise'].form.enterprisename = ''
+      }
       this.visible1 = false
       this.visible = false
     }

src/HDrpManagement/serveWorkBill/components/printTable.vue

@@ -2,7 +2,7 @@
 <template>
   <div style="display:flex">
     <!-- <canvas id="mycanvas" width="400" hight="400"></canvas> -->
-    <img :src="previewImage" alt="" v-if="previewImage" style="margin:0 auto;">
+    <img style="width:100%;object-fit:fill" :src="previewImage" alt="" v-if="previewImage">
     <div style="display:inline-block;margin:0 auto;" v-else>
       <!--安装培训确认单-->
       <div ref="container" style="background:#ffffff" v-if="detail.workorder.type == '安装培训'">
@@ -68,7 +68,7 @@
           <tr>
             <td colspan="6" style="padding:0">
               <el-table :data="detail.trainertitems" :header-cell-style="{background:'#F2F3F5',color:'#000000'}" size="mini">
-              <el-table-column width="260" prop="itemname" label="培训产品名">
+              <el-table-column width="260" prop="itemname" label="产品名">
                 <template slot-scope="scope">
                     {{ scope.row.itemname ? scope.row.itemname : '--' }}
                 </template>
@@ -158,7 +158,7 @@
           <tr>
             <td colspan="6" style="padding:0">
               <el-table :data="detail.trainertitems" :header-cell-style="{background:'#F2F3F5',color:'#000000'}" size="mini">
-                <el-table-column width="260" prop="itemname" label="培训产品名">
+                <el-table-column width="260" prop="itemname" label="产品名">
                   <template slot-scope="scope">
                       {{ scope.row.itemname ? scope.row.itemname : '--' }}
                   </template>
@@ -256,7 +256,7 @@
           <tr>
             <td colspan="6" style="padding:0">
               <el-table :data="detail.trainertitems" :header-cell-style="{background:'#F2F3F5',color:'#000000'}" size="mini">
-                <el-table-column width="260" prop="itemname" label="培训产品名">
+                <el-table-column width="260" prop="itemname" label="产品名">
                   <template slot-scope="scope">
                       {{ scope.row.itemname ? scope.row.itemname : '--' }}
                   </template>
@@ -392,7 +392,7 @@
           <tr>
             <td colspan="6" style="padding:0">
               <el-table :data="detail.trainertitems" :header-cell-style="{background:'#F2F3F5',color:'#000000'}" size="mini">
-                <el-table-column width="260" prop="itemname" label="培训产品名">
+                <el-table-column width="260" prop="itemname" label="产品名">
                   <template slot-scope="scope">
                       {{ scope.row.itemname ? scope.row.itemname : '--' }}
                   </template>
@@ -429,24 +429,33 @@
             <td class="td__title" colspan="6" style="text-align:center">处理过程</td>
           </tr>
           <tr v-for="(item,index) in detail.trainertitems" :key="item.sa_workorder_node_itemsid">
-            <td class="td__title">{{ index + 1 }}</td>
-            <td colspan="6">{{ item.itemname + '：' + item.processing }}</td>
+            <td>
+              <p>{{ item.itemname }}</p>
+              <p>{{ item.itemno }}</p>
+            </td>
+            <td colspan="6">{{ item.processing }}</td>
           </tr>
           <tr>
             <tr>
             <td class="td__title" colspan="6" style="text-align:center">处理结果</td>
           </tr>
           <tr v-for="(item,index) in detail.trainertitems" :key="item.sa_workorder_node_itemsid">
-            <td class="td__title">{{ index + 1 }}</td>
-            <td colspan="6">{{ item.itemname + '：' + item.result }}</td>
+            <td>
+              <p>{{ item.itemname }}</p>
+              <p>{{ item.itemno }}</p>
+            </td>
+            <td colspan="6">{{ item.result }}</td>
           </tr>
           <tr>
             <tr>
             <td class="td__title" colspan="6" style="text-align:center">原因分析</td>
           </tr>
           <tr v-for="(item,index) in detail.trainertitems" :key="item.sa_workorder_node_itemsid">
-            <td class="td__title">{{ index + 1 }}</td>
-            <td colspan="6">{{ item.itemname + '：' + item.reason }}</td>
+            <td>
+              <p>{{ item.itemname }}</p>
+              <p>{{ item.itemno }}</p>
+            </td>
+            <td colspan="6">{{ item.reason }}</td>
           </tr>
           <tr>
             <td style="background:#FAFAFA">客户意见及签字确认:</td>

src/SDrpManagement/agentOrder/modules/add.vue

@@ -18,7 +18,7 @@
         <el-dropdown-item command="项目订单">项目订单</el-dropdown-item>
         <!-- <el-dropdown-item command="促销订单">促销订单</el-dropdown-item> -->
         <el-dropdown-item command="工具订单">工具订单</el-dropdown-item>
-        <el-dropdown-item command="样品订单" v-if="siteId=='HY'">样品订单</el-dropdown-item>
+        <!-- <el-dropdown-item command="样品订单" v-if="siteId=='HY'">样品订单</el-dropdown-item> -->
       </el-dropdown-menu>
     </el-dropdown>
     <el-drawer
@@ -75,6 +75,14 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="12" v-if="form.type =='标准订单' || form.type =='项目订单'">
+              <el-form-item label="是否样品订单" prop="typemx">
+                <el-radio-group v-model="form.typemx">
+                  <el-radio label="样品">是</el-radio>
+                  <el-radio label="">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
             <el-col :span="24"  v-if="form.type ==='标准订单' || form.type ==='特殊订单' || form.type ==='样品订单'">
               <el-form-item label="项目备注">
                 <el-input size="mini" class="order__note__input" type="textarea" v-model="form.projectnote" :autosize="{minRows:5}" placeholder="请输入项目备注"></el-input>
@@ -135,11 +143,6 @@ export default {
           message: '请选择选择领域',
           trigger: 'change'
         }],
-        typemx: [{
-          required: true,
-          message: '请选择选子分类',
-          trigger: 'change'
-        }],
         sys_enterpriseid:[{
           required: true,
           message: '订货企业不能为空',
@@ -164,6 +167,15 @@ export default {
   methods:{
     async handleCommand (command) {
       this.form.type = command
+      if (this.form.type == '特殊订单') {
+        this.rules.typemx = [{
+          required: true,
+          message: '请选择选子分类',
+          trigger: 'change'
+        }]
+      } else {
+        delete this.rules.typemx
+      }
       if (command === '工具订单') {
         const res = await this.$api.requested({
           "id": 20221108111402,
@@ -188,6 +200,7 @@ export default {
         })
         this.tool.showMessage(res,()=>{
           this.drawer = false
+          this.refresh()
           this.$store.dispatch('changeDetailDrawer',true)
           this.$router.push({path:'/agent_orderDetails',query:{id:res.data.sa_orderid,rowindex:res.data.rowindex}})
         })

src/SDrpManagement/salerOrder/modules/add.vue

@@ -20,7 +20,7 @@
         <el-dropdown-item command="项目订单">项目订单</el-dropdown-item>
 <!--        <el-dropdown-item command="促销订单">促销订单</el-dropdown-item>-->
         <el-dropdown-item command="工具订单">工具订单</el-dropdown-item>
-        <el-dropdown-item command="样品订单" v-if="siteId=='HY'">样品订单</el-dropdown-item>
+        <!-- <el-dropdown-item command="样品订单" v-if="siteId=='HY'">样品订单</el-dropdown-item> -->
       </el-dropdown-menu>
     </el-dropdown>
     <el-drawer
@@ -98,6 +98,14 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="12" v-if="form.type =='标准订单' || form.type =='项目订单'">
+              <el-form-item label="是否样品订单" prop="typemx">
+                <el-radio-group v-model="form.typemx">
+                  <el-radio label="样品">是</el-radio>
+                  <el-radio label="">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
             <el-col :span="24"  v-if="form.type ==='标准订单' || form.type ==='特殊订单' || form.type ==='样品订单'">
               <el-form-item label="项目备注">
                 <el-input size="mini" class="order__note__input" type="textarea" v-model="form.projectnote" :autosize="{minRows:5}" placeholder="请输入项目备注"></el-input>
@@ -160,11 +168,6 @@ export default {
           message: '请选择选择领域',
           trigger: 'change'
         }],
-        typemx: [{
-          required: true,
-          message: '请选择选子分类',
-          trigger: 'change'
-        }],
         sys_enterpriseid:[{
           required: true,
           message: '订货经销商不能为空',
@@ -209,6 +212,15 @@ export default {
   methods:{
     async handleCommand (command) {
       this.form.type = command
+      if (this.form.type == '特殊订单') {
+        this.rules.typemx = [{
+          required: true,
+          message: '请选择选子分类',
+          trigger: 'change'
+        }]
+      } else {
+        delete this.rules.typemx
+      }
       this.drawer = true
       this.specordermx()
      
@@ -222,6 +234,7 @@ export default {
         })
         this.tool.showMessage(res,()=>{
           this.drawer = false
+          this.refresh()
           this.$store.dispatch('changeDetailDrawer',true)
           this.$router.push({path:'/saler_orderDetails',query:{id:res.data.sa_orderid,rowindex:res.data.rowindex}})
         })

vue.config.js

@@ -10,8 +10,8 @@ module.exports = {
       },
       open: true,
       // host: '192.168.4.170',
-      host: 'oms.idcgroup.com.cn',
-      port: 8000,
+      host: 'localhost',
+      port: 8080,
       proxy: {
         '/apis': {
           target: 'http://61.164.207.46:8000',  // target host*/