2023-5-22

src/Form/marketing2/agent/add.vue

@@ -138,6 +138,11 @@
               <el-checkbox v-model="form.saleclassauth" :true-label="0" :false-label="1"></el-checkbox>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否开启授权标准:" style="height:51px" prop="standardsauth" label-width="160px">
+              <el-checkbox v-model="form.standardsauth" :true-label="0" :false-label="1"></el-checkbox>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="是否免运费">
               <el-radio-group v-model="radio" @change="radioChange">
@@ -152,14 +157,6 @@
               <el-input v-model.number="form.freefreightamount" placeholder="请输入免运费额度"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12" style="height:51px">
-              <el-form-item label="授权标准" prop="standardsauth">
-                <el-radio-group v-model="form.standardsauth">
-                  <el-radio :label="1">关闭</el-radio>
-                  <el-radio :label="0">开启</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
         </el-form>
       </el-row>
       </div>

src/Form/marketing2/agent/edit.vue

@@ -151,6 +151,11 @@
                 <el-checkbox v-model="form.saleclassauth" :true-label="0" :false-label="1"></el-checkbox>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+            <el-form-item label="是否开启授权标准:" style="height:51px" prop="standardsauth" label-width="160px">
+              <el-checkbox v-model="form.standardsauth" :true-label="0" :false-label="1"></el-checkbox>
+            </el-form-item>
+          </el-col>
             <el-col :span="12">
               <el-form-item label="是否免运费">
                 <el-radio-group v-model="radio" @change="radioChange">
@@ -165,14 +170,6 @@
                 <el-input v-model.number="form.freefreightamount" placeholder="请输入免运费额度"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12" style="height:51px">
-              <el-form-item label="授权标准" prop="standardsauth">
-                <el-radio-group v-model="form.standardsauth">
-                  <el-radio :label="1">关闭</el-radio>
-                  <el-radio :label="0">开启</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
           </el-form>
         </el-row>
       </div>

src/HManagement/marketing2/agent/details/modules/areaBase/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Add class="inline-16 mt-10" @onSuccess="listData" v-if="tool.checkAuth($route.name,'areaBase') && data.standardsauth == 0"/>
+    <Add class="inline-16 mt-10" @onSuccess="listData" v-if="tool.checkAuth($route.name,'areaBase')"/>
     <el-table
       :data="list"
       style="width: 100%"
@@ -16,7 +16,7 @@
           <el-popconfirm
             title="确定删除吗？"
             @confirm="deleteField(scope.row)">
-            <el-button slot="reference" type="text" size="mini" v-if="tool.checkAuth($route.name,'areaBase') && data.standardsauth == 0">删除</el-button>
+            <el-button slot="reference" type="text" size="mini" v-if="tool.checkAuth($route.name,'areaBase')">删除</el-button>
           </el-popconfirm>
         </template>
       </el-table-column>

src/SManagement/orderclue/components/add.vue

@@ -213,7 +213,9 @@ export default {
         totalinvestment:[
           {
             validator: (rule, value, callback) => {
-              if (!this.isNumber(value)) {
+              if (!value) {
+                callback()
+              } else if (!this.isNumber(value)) {
                 callback(new Error('请输入数字值'))
               } else {
                 callback()
@@ -225,7 +227,9 @@ export default {
         costofconstruction:[
           {
             validator: (rule, value, callback) => {
-              if (!this.isNumber(value)) {
+              if (!value) {
+                callback()
+              } else if (!this.isNumber(value)) {
                 callback(new Error('请输入数字值'))
               } else {
                 callback()

src/SManagement/orderclue/components/edit.vue

@@ -209,7 +209,9 @@ export default {
         totalinvestment:[
           {
             validator: (rule, value, callback) => {
-              if (!this.isNumber(value)) {
+              if (!value) {
+                callback()
+              } else if (!this.isNumber(value)) {
                 callback(new Error('请输入数字值'))
               } else {
                 callback()
@@ -221,7 +223,9 @@ export default {
         costofconstruction:[
           {
             validator: (rule, value, callback) => {
-              if (!this.isNumber(value)) {
+              if (!value) {
+                callback()
+              } else if (!this.isNumber(value)) {
                 callback(new Error('请输入数字值'))
               } else {
                 callback()

src/components/normal-basic-layout/details/modules/tabs/tab.vue

@@ -15,7 +15,7 @@
       <attachmentList v-if="activeName === 'file'" :attinfos="attinfo_attachment" @onSuccess="queryAttments" @cancelEdit="queryAttments">
         <upload slot="upload" :folderid="folderid"
           :bindData="{ ownertable: ownertable, ownerid: editData[idname], usetype: 'default' }"
-          @onSuccess="queryAttments"></upload>
+          @onSuccess="queryAttments" :hidemediastock="hidemediastock"></upload>
       </attachmentList>
     </div>
     <div v-show="activeName === 'log'">
@@ -41,6 +41,7 @@ export default {
       activeName:'tab0',
       attinfo_attachment:[],
       folderid:JSON.parse(sessionStorage.getItem('folderid')).appfolderid,
+      hidemediastock:!JSON.parse(sessionStorage.getItem('activeApp')).selectfileinattachment,
     }
   },
   methods:{

src/components/normal-basic-layout/index.vue

@@ -4,7 +4,7 @@
       <div class="layout-header-panel container normal-panel">
         <div class="flex-align-center flex-between">
           <div class="normal-margin flex-align-center">
-            <div v-if="activeApp" style="font-size:26px;font-weight:300">{{customTitle ? customTitle : activeApp.meta.title}}&nbsp;
+            <div v-if="activeApp" style="font-size:26px;font-weight:300;flex-shrink:0">{{customTitle ? customTitle : activeApp.meta.title}}&nbsp;
               <!-- <i v-if="!customTitle" @click="addToAsideBar" style="color:#999" :class="showAppCollection()?'el-icon-star-on collection':'el-icon-star-off'"></i> -->
               <div v-if="!customTitle" style="display:inline">
                 <img width="20" v-if="showAppCollection()" src="@/assets/icons/incoll.svg" alt="">
@@ -13,7 +13,7 @@
             </div>
             <div style="margin:0 8px"></div>
 
-            <div class="flex-align-center">
+            <div class="flex-align-center flex-wrap" style="line-height: 40px;">
               <div v-if="oldFormPath || formPath">
                 <cpAdd v-if="tool.checkAuth($route.name,'insert')" :formPath="formPath" :oldFormPath="oldFormPath" @onAddSuccess="listData(param.content.pageNumber = 1)"></cpAdd>
               </div>
@@ -28,10 +28,10 @@
                   <el-button @click="printBtn({},scope2.data)" type="text" size="mini">打 印</el-button>
                 </template>
               </reportCenter>
+              <slot name="titleRight"></slot>
             </div>
-            <slot name="titleRight"></slot>
           </div>
-          <div class="normal-margin">
+          <div class="normal-margin" style="flex-shrink:0">
             <setColumn :layout="layout" @changeColumn="changeColumn"></setColumn>
             <setFixed :data="tableLayout" @onFixedClick="onFixedClick"></setFixed>
             <i class="el-icon-refresh" @click="listData(param.content.pageNumber = 1,param.content.where.condition = '')"></i>
@@ -345,4 +345,7 @@ export default {
   color: orange !important;
   flex-direction: row-reverse;
 }
+.flex-wrap {
+  flex-wrap: wrap;
+}
 </style>