Browse Source

Merge branch 'develop_sale20' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_sale20

chenrui 2 years ago
parent
commit
ab5632df1b

+ 1 - 4
src/components/UploadFile/index.vue

@@ -58,7 +58,7 @@ export default {
     },
     upText: {
       type: String,
-      default: ''
+      default: '上传文件'
     },
     value: {
       type: String
@@ -256,15 +256,12 @@ export default {
   .upload-file{
     float: left;
     overflow: hidden;
-    height: 80px;
     /* you can make up upload button and sample style by using stylesheets */
     .ant-upload-select-picture-card i {
       font-size: 32px;
       color: #999;
-      margin-top: 9px;
     }
     .ant-upload-select-picture-card .ant-upload-text {
-      margin-top: 8px;
       color: #666;
     }
     .ant-upload-btn{

+ 3 - 9
src/views/promotionRulesManagement/promotionManagement/editModal.vue

@@ -62,13 +62,7 @@
             <span class="upload-desc">说明:单张大小小于10Mb,最多10张;建议尺寸:宽(420px)*高(230px)</span>
           </a-form-model-item>
           <a-form-model-item label="排序" prop="sort">
-            <a-input
-              id="promotionEdit-sort"
-              type="number"
-              v-model.trim="form.sort"
-              placeholder="请输入排序数字(数字越大越靠后)"
-              :disabled="isDisabled"
-              allowClear />
+              <a-input-number style="width:300px;" id="promotionEdit-sort" :disabled="isDisabled" allowClear placeholder="请输入排序数字(数字越大越靠后)" v-model="form.sort" :min="0" :max="999999"/>
           </a-form-model-item>
           <a-form-model-item label="内容类型" prop="contentType">
             <v-select
@@ -108,7 +102,7 @@
               :fileSize="100"
               :maxNums="1"
               @change="changeVideo"
-              listType="picture-card"></Upload>
+              ></Upload>
             <Upload
               v-else-if="pageType==='edit'&&!isDisabled"
               class="upload"
@@ -119,7 +113,7 @@
               :fileSize="100"
               :maxNums="1"
               @change="changeVideo"
-              listType="picture-card"></Upload>
+              ></Upload>
             <div v-if="pageType==='edit'&&isDisabled">
               <video width="230" height="150" controls loop controlsList="nodownload">
                 <source :src="form.content" type="video/mp4">

+ 2 - 1
src/views/salesManagement/stockPrint/list.vue

@@ -300,10 +300,11 @@ export default {
       }
       if (this.$hasPermissions('M_stockPrintList_salesPrice')) { //  售价权限
         const ind = this.isShowWarehouse ? 11 : 10
-		arr.splice(ind, 0, { slots: { title: 'costTitle' }, dataIndex: 'receiveTotalAmount', width: '90px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+		    arr.splice(ind, 0, { slots: { title: 'costTitle' }, dataIndex: 'receiveTotalAmount', width: '90px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
         arr.splice(ind+1, 0, { title: '易损件售价', dataIndex: 'receiveYsjTotalAmount', width: '90px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
         arr.splice(ind+2, 0, { title: '电池售价', dataIndex: 'receiveDcTotalAmount', width: '70px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
         arr.splice(ind+3, 0, { title: '机油售价', dataIndex: 'receiveJyTotalAmount', width: '70px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
+        arr.splice(ind+4, 0, { title: '轮胎售价', dataIndex: 'receiveLtTotalAmount', width: '70px', align: 'right', customRender: text => ((text || text == 0) ? this.toThousands(text) : '--') })
       }
       return arr
     }