Merge remote-tracking branch 'origin/master'

src/components/orderDetail/orderDetail.vue

@@ -3,32 +3,39 @@
     <el-card class="box">
         <span class="box-header-title">
           基本信息(<el-link type="primary">{{ form.orderCode }}</el-link>)
-          <el-link v-show="form.printFileUrlLink != null" target="_blank" :href="form.printFileUrlLink">下载原图文件</el-link>
-          <el-link v-show="form.attachFileUrlLink != null" target="_blank" :href="form.attachFileUrlLink">下载附件文件</el-link>
+<!--          <el-link v-show="form.printFileUrlLink != null" target="_blank" :href="form.printFileUrlLink">下载原图文件</el-link>-->
+          <el-button  v-show="form.printFileUrlLink != null" type="primary" size="mini">
+            <a target="_blank" :href="form.printFileUrlLink">下载原图文件</a>
+            </el-button>
+
+           <el-button  v-show="form.attachFileUrlLink != null" type="success" size="mini">
+            <a target="_blank" :href="form.attachFileUrlLink">下载附件文件</a>
+            </el-button>
+<!--          <el-link v-show="form.attachFileUrlLink != null" target="_blank" :href="form.attachFileUrlLink">下载附件文件</el-link>-->
         </span>
         <i class="box-header-icon el-icon-caret-top" @click="unfold($event,'basicInfo',2)"></i>
 
       <div class="box-content" id="basicInfo">
-        <el-row :gutter="10">
+        <el-row :gutter="5">
           <el-col :span="6">
             <div class="detailItem">
               <label class="item_label">制单时间：</label>
               <div class="item_content" v-if="form.createTime">{{ form.createTime | getTime }}</div>
             </div>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="5">
             <div class="detailItem">
               <label class="item_label">客户名称：</label>
               <div class="item_content">{{ form.clientName }}</div>
             </div>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="5">
             <div class="detailItem">
               <label class="item_label">产品类型：</label>
               <div class="item_content">{{ form.productName }}</div>
             </div>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="5">
             <div class="detailItem">
               <label class="item_label">订单数量：</label>
               <div class="item_content">
@@ -61,30 +68,30 @@
           <el-col style="height: 40px" :span="4">
             <div class="detailItem">
               <label class="item_label">材料类型：</label>
-              <div class="item_content">{{ form.receiptsCount }}</div>
+              <div class="item_content">{{ form.paperName }}</div>
             </div>
           </el-col>
           <el-col style="height: 40px" :span="4">
             <div class="detailItem">
               <label class="item_label">每本页数：</label>
-              <div class="item_content">{{ form.receiptsCount }}</div>
+              <div class="item_content">{{ form.pageCount }}</div>
             </div>
           </el-col>
           <el-col style="height: 40px" :span="4">
             <div class="detailItem">
               <label class="item_label">印刷颜色：</label>
-              <div class="item_content">{{ form.receiptsCount }}</div>
+              <div class="item_content">{{ form.printColor }}</div>
             </div>
           </el-col>
           <el-col style="height: 40px" :span="15">
             <div class="detailItem">
               <label class="item_label">生产工艺：</label>
               <div class="item_content">
-                <el-checkbox v-model="form.printCodeFlag" :true-label="1" :false-label="0" disabled>打码</el-checkbox>
-                <el-checkbox v-model="form.printCoverFlag" :true-label="1" :false-label="0" disabled>封面</el-checkbox>
-                <el-checkbox v-model="form.printMatFlag" :true-label="1" :false-label="0" disabled>加垫</el-checkbox>
-                <el-checkbox v-model="form.printNotCodeFlag" :true-label="1" :false-label="0" disabled>不打码</el-checkbox>
-                <el-checkbox v-model="form.printAllCoverFlag" :true-label="1" :false-label="0" disabled>封面全包</el-checkbox>
+                <el-checkbox  v-model="form.printCodeFlag" :true-label="1" :false-label="0" disabled >打码</el-checkbox>
+                <el-checkbox  v-model="form.printCoverFlag" :true-label="1" :false-label="0" disabled>封面</el-checkbox>
+                <el-checkbox  v-model="form.printMatFlag" :true-label="1" :false-label="0" disabled>加垫</el-checkbox>
+                <el-checkbox  v-model="form.printNotCodeFlag" :true-label="1" :false-label="0" disabled>不打码</el-checkbox>
+                <el-checkbox  v-model="form.printAllCoverFlag" :true-label="1" :false-label="0" disabled>封面全包</el-checkbox>
               </div>
             </div>
           </el-col>
@@ -558,6 +565,28 @@ export default {
   margin: 8px 0;
 }
 
+::v-deep .el-checkbox__input.is-disabled .el-checkbox__inner::after {
+  box-sizing: content-box;
+  content: "";
+  border: 2px solid #409eff;
+  border-left: 0;
+  border-top: 0;
+  height: 7px;
+  left: 4px;
+  position: absolute;
+  top: 1px;
+  transform-origin: center;
+}
+
+::v-deep .el-radio__input.is-disabled.is-checked .el-radio__inner::after {
+  background-color:#409eff;
+  width: 10px;
+  height: 10px;
+}
+::v-deep .el-radio__input.is-disabled .el-radio__inner, .el-radio__input.is-disabled.is-checked .el-radio__inner {
+  border-color:#E4E7ED;
+  background-color: #ffffff;
+}
 /*end*/
 
 .orderDetail {
@@ -565,6 +594,9 @@ export default {
   ::v-deep .el-card__header {
     padding: 9px 20px;
   }
+  .el-checkbox__original {
+    background-color: #c91111 !important;
+  }
 
   ::v-deep .el-card__body {
     padding: 10px 20px;

src/views/doc/client/clientList.vue

@@ -86,7 +86,7 @@
           <span class="ellipsis"> {{ row.clientName }}</span>
         </template>
       </el-table-column>
-      <template v-if="!isChoose|| !webType">
+      <template>
         <el-table-column
           width="90px"
           prop="contactMan"
@@ -104,7 +104,7 @@
         <el-table-column
           align="left"
           class-name="status-col"
-          width="280"
+          width="388px"
           show-overflow-tooltip
           label="联系地址">
           <template slot-scope="{row}">

src/views/order/orderList/component/ordermis.vue

@@ -23,14 +23,14 @@
           </el-option>
         </el-select>
         <span v-if="idOrder">
-          ({{ orderCode }})
+          订单编号：{{ orderCode }}
         </span>
-        <template v-if="orderCategory != 1">
-            <span v-if="form.originFileLink"><el-link
-              :href="form.originFileLink"
-              target="_blank">{{ form.fileDescription }}</el-link></span>
-          <span v-else style="color: red;font-weight: 700">订单未上传原图文件</span>
-        </template>
+<!--        <template v-if="orderCategory != 1">-->
+<!--            <span v-if="form.originFileLink"><el-link-->
+<!--              :href="form.originFileLink"-->
+<!--              target="_blank">{{ form.fileDescription }}</el-link></span>-->
+<!--          <span v-else style="color: red;font-weight: 700">订单未上传原图文件</span>-->
+<!--        </template>-->
       </div>
       <el-row :gutter="0" type="flex" >
         <el-col :span="24">
@@ -151,32 +151,25 @@
       <el-row :gutter="24" type="flex" justify="left">
         <el-col :span="5">
           <el-form-item size="small" label="数量">
-            <el-select
-              filterable
-              type="number"
-              allow-create
-              style="width: 63%"
-              v-model="form.printQty">
-              <el-option
-                v-for="item in printQtyOptions"
-                :key="item.id"
-                :label="item.dictLabel"
-                :value="item.dictValue">
-              </el-option>
-            </el-select>
-            <el-input v-model="form.printQtyUnit" placeholder="单位" style="width: 20%"></el-input>
+            <el-input type="number"  v-model="form.printQty" placeholder="数量" style="width: 53%"></el-input>
+            <el-input v-model="form.printQtyUnit" placeholder="单位" style="width: 30%"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="4">
+        <el-col :span="3">
           <el-form-item size="small" label="单价">
             <el-input type="number" v-model="form.printPrice"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="4">
-          <el-form-item size="small" label="金额">
+        <el-col :span="3">
+          <el-form-item size="small" label="总金额">
             <el-input type="number" v-model="form.printMoneyTotal"></el-input>
           </el-form-item>
         </el-col>
+        <el-col :span="3">
+          <el-form-item size="small" label="已收金额">
+            <el-input type="number" v-model="form.payMoney"></el-input>
+          </el-form-item>
+        </el-col>
       </el-row>
       <el-row :gutter="24" type="flex" justify="left">
         <el-col :span="5">
@@ -194,14 +187,14 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <el-col :span="9">
           <el-form-item size="small" label="送货地址">
             <el-input v-model="form.sendAddress"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="24" type="flex" justify="left">
-        <el-col :span="13">
+        <el-col :span="14">
           <el-form-item size="small" label="备注">
             <el-input type="textarea" :rows="2"  v-model="form.orderMemo"></el-input>
           </el-form-item>
@@ -362,6 +355,7 @@ const form = {
   printQtyUnit: '',
   printPrice: '',
   printMoneyTotal: '',
+  payMoney: '',
   sendKind: '',
   sendAddress: '',
   orderMemo: '',
@@ -937,5 +931,12 @@ export default {
 ::v-deep .el-card__body {
   padding: 10px;
 }
-
+/*去除 el- input 当type = 'number 时 输入框里的恶心上下箭头*/
+::v-deep input::-webkit-outer-spin-button,::v-deep input::-webkit-inner-spin-button{
+  -webkit-appearance: none !important;
+}
+::v-deep input[type = 'number']{
+  -moz-appearance: textfield !important;
+}
+/*去除 el- input 当type = 'number 时 输入框里的恶心上下箭头*/
 </style>