2023-4-27

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

@@ -82,13 +82,6 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="form.type =='标准订单' || form.type =='项目订单'">
-              <el-form-item label="特殊订单分类" prop="typemx">
-                <el-select v-model="form.typemx" placeholder="请选择特殊订单分类" clearable :style="{width: '100%'}">
-                  <el-option label="样品" value="样品"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
             <el-col :span="12"  v-if="form.type !=='工具订单' && form.type !=='项目订单'">
               <el-form-item label="选择领域" prop="tradefield">
                 <el-select :disabled="form.type==='促销订单'" v-model="form.tradefield" placeholder="请选择选择领域" clearable :style="{width: '100%'}">
@@ -105,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>
@@ -243,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}})
         })
@@ -333,7 +335,9 @@ export default {
         "billdate":"",//单据日期，默认创建日期
         "signbacknum":""
       }
-      if( this.$refs['enterprise'] ) this.$refs['enterprise'].form.enterprisename = ''
+      if( this.$refs['enterprise'] ) {
+        this.$refs['enterprise'].form.enterprisename = ''
+      }
       this.visible1 = false
       this.visible = false
     }

src/SDrpManagement/agentOrder/modules/add.vue

@@ -67,13 +67,6 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="form.type =='标准订单' || form.type =='项目订单'">
-              <el-form-item label="特殊订单分类" prop="typemx">
-                <el-select v-model="form.typemx" placeholder="请选择特殊订单分类" clearable :style="{width: '100%'}">
-                  <el-option label="样品" value="样品"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
             <el-col :span="12" v-if="form.type !=='工具订单' && form.type !=='项目订单'">
               <el-form-item label="选择领域" prop="tradefield">
                 <el-select :disabled="form.type === '促销订单'" v-model="form.tradefield" placeholder="请选择选择领域" clearable :style="{width: '100%'}">
@@ -82,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>
@@ -199,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

@@ -82,13 +82,6 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12" v-if="form.type =='标准订单' || form.type =='项目订单'">
-              <el-form-item label="特殊订单分类" prop="typemx">
-                <el-select v-model="form.typemx" placeholder="请选择特殊订单分类" clearable :style="{width: '100%'}">
-                  <el-option label="样品" value="样品"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
             <el-col :span="12"  v-if="form.type !=='工具订单' && form.type !=='项目订单'">
               <el-form-item label="选择领域" prop="tradefield">
                 <el-select :disabled="form.type==='促销订单'" v-model="form.tradefield" placeholder="请选择选择领域" clearable :style="{width: '100%'}">
@@ -105,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>
@@ -233,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}})
         })