Merge branch 'igirl-channel-web' of gitlab.gongsibao.com:jiangyong/zhichan into igirl-channel-web

igirl-channel-web/app/front/vues/pages/OAjdlist/OAjdlist.js

@@ -596,7 +596,7 @@
         handleSizeChange(){
         handleSizeChange(){
             if (this.$route.query.channelUserId != "") {
             if (this.$route.query.channelUserId != "") {
                 this.indentInfo.pageIndex = this.currentPage;
                 this.indentInfo.pageIndex = this.currentPage;
-                var obj = this.$root.copyParams(this.indentInfo, "getTmOrderList", "/action/tmOrder/springBoard", "yes", "yes");
+                var obj = this.$root.copyParams(this.indentInfo, "getTmOrderListAdmin", "/action/tmOrder/springBoard", "yes", "yes");
                 this.$root.loading = true;
                 this.$root.loading = true;
                 this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => {
                 this.$root.postReq("/web/trademark/tmqueryCtl/doPost", obj).then((d) => {
                     this.$root.loading = false;
                     this.$root.loading = false;

igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.css

@@ -96,7 +96,7 @@
 }
 }
 
 
 .jdindentlist-inquire>div:nth-child(2)>button {
 .jdindentlist-inquire>div:nth-child(2)>button {
-    background: #3071fe;
+    background: #3171ff;
     color: #fff;
     color: #fff;
     border: 1px solid #dee0eb;
     border: 1px solid #dee0eb;
     border-radius: 100px;
     border-radius: 100px;
@@ -196,7 +196,7 @@
 }
 }
 
 
 .jdindentlist-list .dsqcl {
 .jdindentlist-list .dsqcl {
-    color: red;
+    color: #a14faf;
 }
 }
 
 
 .jdindentlist-null {
 .jdindentlist-null {

igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.html

@@ -61,7 +61,7 @@
                         <div><span>申请人：</span>
                         <div><span>申请人：</span>
                             <el-input v-model="name" placeholder="请输入内容"></el-input>
                             <el-input v-model="name" placeholder="请输入内容"></el-input>
                         </div>
                         </div>
-                       
+
                         <!-- <div><span>付款状态：</span>
                         <!-- <div><span>付款状态：</span>
                             <el-select v-model="paymentStatus" placeholder="请选择">
                             <el-select v-model="paymentStatus" placeholder="请选择">
                                 <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
                                 <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
@@ -70,7 +70,7 @@
                         </div> -->
                         </div> -->
                     </div>
                     </div>
                     <div>
                     <div>
-                        <el-button @click="find()" style="border: #3071fe;background: #3071fe; color: #fff;">查询
+                        <el-button @click="find()" style="border: #3071fe;background: #3171ff; color: #fff;">查询
                         </el-button>
                         </el-button>
                         <el-button @click="reset()">重置</el-button>
                         <el-button @click="reset()">重置</el-button>
                     </div>
                     </div>
@@ -92,6 +92,7 @@
                             </template>
                             </template>
                         </el-table-column> -->
                         </el-table-column> -->
                         <el-table-column prop="deliveryOrderNo" label="交付单号" width="180">
                         <el-table-column prop="deliveryOrderNo" label="交付单号" width="180">
+                           
                             <template slot-scope="scope">
                             <template slot-scope="scope">
                                 <el-tooltip placement="top" :content="scope.row.deliveryOrderNo">
                                 <el-tooltip placement="top" :content="scope.row.deliveryOrderNo">
                                     <p solt="content">
                                     <p solt="content">
@@ -119,7 +120,8 @@
                         <el-table-column prop="nclOneCodes" label="类别">
                         <el-table-column prop="nclOneCodes" label="类别">
                             <template slot-scope="scope">
                             <template slot-scope="scope">
                                 <el-tooltip placement="top" :content="scope.row.nclOneCodes">
                                 <el-tooltip placement="top" :content="scope.row.nclOneCodes">
-                                    <p solt="content">{{scope.row.nclOneCodes ?\'第\'+scope.row.nclOneCodes+\'类\': "---"}}
+                                    <p solt="content">
+                                        {{scope.row.nclOneCodes ?\'第\'+scope.row.nclOneCodes+\'类\': "---"}}
                                     </p>
                                     </p>
                                 </el-tooltip>
                                 </el-tooltip>
                             </template>
                             </template>
@@ -151,7 +153,8 @@
                         <el-table-column prop="deliveryStatusName" label="交付状态" class-name="dsqcl">
                         <el-table-column prop="deliveryStatusName" label="交付状态" class-name="dsqcl">
                             <template slot-scope="scope">
                             <template slot-scope="scope">
                                 <el-tooltip placement="top" :content="scope.row.deliveryStatusName">
                                 <el-tooltip placement="top" :content="scope.row.deliveryStatusName">
-                                    <p solt="content">{{scope.row.deliveryStatusName ? scope.row.deliveryStatusName : \'---\'}}
+                                    <p solt="content">
+                                        {{scope.row.deliveryStatusName ? scope.row.deliveryStatusName : \'---\'}}
                                     </p>
                                     </p>
                                 </el-tooltip>
                                 </el-tooltip>
                             </template>
                             </template>

igirl-channel-web/app/front/vues/pages/jdindentlist/jdindentlist.js

@@ -15,6 +15,7 @@
             };
             };
             return {
             return {
                 input: "",
                 input: "",
+                search:"",
                 businessType: [
                 businessType: [
                     {
                     {
                         value: 'zzzc',
                         value: 'zzzc',