销售线索、公海线索、线索管理、线索导入、市场活动，新建编辑线索调整项目名称的位置，物流公司新建编辑必填项调整

src/HDrpManagement/logisticcom/modules/add.vue

@@ -11,7 +11,7 @@
       @close="cancelDrawer">
       <div class="drawer__panel">
          <el-row :gutter="20">
-          <el-form :model="form" :rules="rules" ref="form" :label-width="tool.onlyZh('85px')" label-position="right" size="mini">
+          <el-form :model="form" :rules="rules" ref="form" :label-width="tool.onlyZh('95px')" label-position="right" size="mini">
             <el-col :span="24">
               <el-form-item :label="$t(`企业名称`)+':'" prop="enterprisename">
                 <div class="flex-align-center">
@@ -65,7 +65,10 @@ export default {
       rules:{
         enterprisename: [
           { required: true, message: this.$t('输入企业名称'), trigger: 'blur' },
-        ]
+        ],
+        kd100id: [
+          { required: true, message: this.$t('输入快递100ID'), trigger: 'blur' },
+        ],
       }
     }
   },
@@ -105,14 +108,18 @@ export default {
       this.$refs['ent'].form = {}
     },
     async onSubmit () {
-      const res = await this.$api.requested({
-        "id": "20221121135704",
-        "content": this.form
-      })
-      this.tool.showMessage(res,()=>{
-        this.visible = false
-        this.$emit('onSuccess')
+      this.$refs.form.validate(async (valid)=>{
+        if (!valid) return false
+        const res = await this.$api.requested({
+          "id": "20221121135704",
+          "content": this.form
+        })
+        this.tool.showMessage(res,()=>{
+          this.visible = false
+          this.$emit('onSuccess')
+        })
       })
+
     }
 
   }

src/HDrpManagement/logisticcom/modules/edit.vue

@@ -3,7 +3,7 @@
     <el-button size="small" type="text" @click="onShow(visible = true)">{{$t('编 辑')}}</el-button>
     <el-drawer
       append-to-body
-      :title="$t('新建')"
+      :title="$t('编辑')"
       :visible.sync="visible"
       :wrapperClosable="false"
       direction="rtl"
@@ -11,9 +11,9 @@
       @close="cancelDrawer">
       <div class="drawer__panel">
          <el-row :gutter="20">
-          <el-form :model="form" ref="form" :label-width="tool.onlyZh('85px')" label-position="right" size="mini">
+          <el-form :model="form" :rules="rules" ref="form" :label-width="tool.onlyZh('95px')" label-position="right" size="mini">
             <el-col :span="24">
-              <el-form-item :label="$t(`企业名称`)+':'">
+              <el-form-item :label="$t(`企业名称`)+':'" prop="enterprisename">
                 <el-input v-model="form.abbreviation" readonly :placeholder="$t(`输入企业名称`)"></el-input>
               </el-form-item>
             </el-col>
@@ -57,6 +57,14 @@ export default {
         "industry":"",
         "contact":"",
         "phonenumber":""
+      },
+      rules:{
+        enterprisename: [
+          { required: true, message: this.$t('输入企业名称'), trigger: 'blur' },
+        ],
+        kd100id: [
+          { required: true, message: this.$t('输入快递100ID'), trigger: 'blur' },
+        ],
       }
     }
   },
@@ -78,13 +86,16 @@ export default {
       this.form = {}
     },
     async onSubmit () {
-      const res = await this.$api.requested({
-        "id": "20221121135704",
-        "content": this.form
-      })
-      this.tool.showMessage(res,()=>{
-        this.visible = false
-        this.$emit('onSuccess')
+      this.$refs.form.validate(async (valid)=>{
+        if (!valid) return false
+        const res = await this.$api.requested({
+          "id": "20221121135704",
+          "content": this.form
+        })
+        this.tool.showMessage(res,()=>{
+          this.visible = false
+          this.$emit('onSuccess')
+        })
       })
     }
 

src/HManagement/clueManage/clue_import/detailPage/modules/edit.vue

@@ -11,6 +11,11 @@
       @close="onClose">
       <div class="drawer__panel">
         <el-form ref="form" :model="form" :rules="rules" label-position="right" :label-width="tool.onlyZh('120px')" size="small">
+          <el-col :span="24">
+            <el-form-item :label="$t('项目名称')+':'" prop="projectname">
+              <el-input v-model="form.projectname" :placeholder="$t('请填写项目名称')"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="20">
             <el-form-item :label="$t('客户名称')+':'" prop="enterprisename">
               <el-input v-model="form.enterprisename" size="small" :placeholder="$t('请填写客户名称')"></el-input>
@@ -63,11 +68,6 @@
               <el-input v-model="form.address" autocomplete="off" :placeholder="$t('请填写地址')"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="24">
-            <el-form-item :label="$t('项目名称')+':'" prop="projectname">
-              <el-input v-model="form.projectname" :placeholder="$t('请填写项目名称')"></el-input>
-            </el-form-item>
-          </el-col>
           <el-col :span="20">
             <el-form-item :label="$t('项目规模')+':'" prop="scale" >
               <el-input v-model="form.scale" :placeholder="$t('请填写数值')"  class="inline-16"></el-input>

src/HManagement/clueManage/clue_private/modules/add.vue

@@ -11,6 +11,14 @@
                 <el-checkbox v-model="param.content.isuppictured" :false-label="0" :true-label="1" :disabled="isuppictured === 0" @change="onChange">{{$t('是否上图')}}</el-checkbox>
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t('项目名称')+':'" prop="projectname" v-if="param.content.isuppictured === 1" :rules="{required:true,message:$t('请填写项目名称'),trigger:'blur'}">
+                <el-input v-model="param.content.projectname" :placeholder="$t('请填写项目名称')"></el-input>
+              </el-form-item>
+              <el-form-item :label="$t('项目名称')+':'" prop="projectname" v-else>
+                <el-input v-model="param.content.projectname" :placeholder="$t('请填写项目名称')"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="20">
               <el-form-item :label="$t('客户名称')+':'" prop="enterprisename" v-if="param.content.isuppictured === 1" :rules="{required:true,message:$t('请填写客户名称'),trigger:'blur'}">
                 <el-input v-model="param.content.enterprisename"  :placeholder="$t('请填写客户名称')"></el-input>
@@ -75,14 +83,6 @@
                 <el-input v-model="param.content.address"  :placeholder="$t('请填写地址')"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('项目名称')+':'" prop="projectname" v-if="param.content.isuppictured === 1" :rules="{required:true,message:$t('请填写项目名称'),trigger:'blur'}">
-                <el-input v-model="param.content.projectname" :placeholder="$t('请填写项目名称')"></el-input>
-              </el-form-item>
-              <el-form-item :label="$t('项目名称')+':'" prop="projectname" v-else>
-                <el-input v-model="param.content.projectname" :placeholder="$t('请填写项目名称')"></el-input>
-              </el-form-item>
-            </el-col>
             <el-col :span="20">
               <el-form-item :label="$t('项目规模')+':'" prop="scale" v-if="param.content.isuppictured === 1" :rules="{required: true,pattern:/^\d+(.\d{1,2})?$/, message: $t('请输入数字值'), trigger: 'blur'}">
                 <el-input v-model="param.content.scale" :placeholder="$t('请填写数值')"  class="inline-16"></el-input>

src/HManagement/clueManage/clue_private/modules/edit.vue

@@ -10,6 +10,14 @@
                 <el-checkbox v-model="form.isuppictured" :false-label="0" :true-label="1" :disabled="isuppictured === 0" @change="onChange">{{$t('是否上图')}}</el-checkbox>
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t('项目名称')+':'" prop="projectname" v-if="form.isuppictured === 1" :rules="{required:true,message:$t('请填写项目名称'),trigger:'blur'}">
+                <el-input v-model="form.projectname" :placeholder="$t('请填写项目名称')"></el-input>
+              </el-form-item>
+              <el-form-item :label="$t('项目名称')+':'" prop="projectname" v-else>
+                <el-input v-model="form.projectname" :placeholder="$t('请填写项目名称')"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="20">
               <el-form-item :label="$t('客户名称')+':'" prop="enterprisename" v-if="form.isuppictured === 1" :rules="{required:true,message:$t('请填写客户名称'),trigger:'blur'}">
                 <el-input v-model="form.enterprisename"  :placeholder="$t('请填写客户名称')"></el-input>
@@ -78,14 +86,6 @@
                 <el-input v-model="form.address" autocomplete="off" :placeholder="$t('请填写地址')"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('项目名称')+':'" prop="projectname" v-if="form.isuppictured === 1" :rules="{required:true,message:$t('请填写项目名称'),trigger:'blur'}">
-                <el-input v-model="form.projectname" :placeholder="$t('请填写项目名称')"></el-input>
-              </el-form-item>
-              <el-form-item :label="$t('项目名称')+':'" prop="projectname" v-else>
-                <el-input v-model="form.projectname" :placeholder="$t('请填写项目名称')"></el-input>
-              </el-form-item>
-            </el-col>
             <el-col :span="20">
               <el-form-item :label="$t('项目规模')+':'" prop="scale" v-if="form.isuppictured === 1" :rules="{required: true,pattern:/^\d+(.\d{1,2})?$/, message: $t('请输入数字值'), trigger: 'blur'}">
                 <el-input v-model="form.scale" :placeholder="$t('请填写数值')"  class="inline-16"></el-input>

src/HManagement/clueManage/clue_public/modules/add.vue

@@ -6,6 +6,11 @@
         <el-row :gutter="10">
           <el-form :model="param.content" :rules="rules" ref="ruleForm" :label-width="tool.onlyZh('120px')" class="demo-ruleForm"
                    label-position="right" size="small">
+            <el-col :span="24">
+              <el-form-item :label="$t('项目名称')+':'" prop="projectname">
+                <el-input v-model="param.content.projectname" :placeholder="$t('请填写项目名称')"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="20">
               <el-form-item :label="$t('客户名称')+':'" prop="enterprisename">
                 <el-input v-model="param.content.enterprisename"  :placeholder="$t('请填写客户名称')"></el-input>
@@ -59,11 +64,6 @@
                 <el-input v-model="param.content.address"  :placeholder="$t('请填写地址')"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('项目名称')+':'" prop="projectname">
-                <el-input v-model="param.content.projectname" :placeholder="$t('请填写项目名称')"></el-input>
-              </el-form-item>
-            </el-col>
             <el-col :span="20">
               <el-form-item :label="$t('项目规模')+':'" prop="scale" >
                 <el-input v-model="param.content.scale" :placeholder="$t('请填写数值')"  class="inline-16"></el-input>

src/HManagement/clueManage/clue_public/modules/edit.vue

@@ -5,6 +5,11 @@
       <div class="drawer__panel">
         <el-row :gutter="10">
           <el-form :model="form" :rules="rule" ref="form" label-position="right" :label-width="tool.onlyZh('120px')" size="small">
+            <el-col :span="24">
+              <el-form-item :label="$t('项目名称')+':'" prop="projectname">
+                <el-input v-model="form.projectname" :placeholder="$t('请填写项目名称')"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="20">
               <el-form-item :label="$t('客户名称')+':'" prop="enterprisename">
                 <el-input v-model="form.enterprisename" :placeholder="$t('请填写客户名称')"></el-input>
@@ -62,11 +67,6 @@
                 <el-input v-model="form.address" autocomplete="off" :placeholder="$t('请填写地址')"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('项目名称')+':'" prop="projectname">
-                <el-input v-model="form.projectname" :placeholder="$t('请填写项目名称')"></el-input>
-              </el-form-item>
-            </el-col>
             <el-col :span="20">
               <el-form-item :label="$t('项目规模')+':'" prop="scale" >
                 <el-input v-model="form.scale" :placeholder="$t('请填写数值')"  class="inline-16"></el-input>

src/HManagement/clueManage/m_activity/modules/addClue.vue

@@ -1,8 +1,8 @@
 <template>
   <div>
-    <el-button type="primary" :disabled="!data.disabled" size="mini" @click="onShow">{{$t('新 建')}}</el-button>
+    <el-button type="primary" :disabled="!data.disabled" size="mini" @click="onShow">{{$t('新建公海线索')}}</el-button>
     <el-drawer
-      :title="$t(`新建线索`)"
+      :title="$t(`新建公海线索`)"
       :visible.sync="drawer"
       size="700px"
       direction="rtl"
@@ -12,6 +12,11 @@
       <div class="drawer__panel">
         <el-row :gutter="10">
           <el-form :model="form" :rules="rules" ref="form" :label-width="tool.onlyZh('120px')" label-position="right" size="mini">
+            <el-col :span="24">
+              <el-form-item :label="$t('项目名称')+':'" prop="projectname">
+                <el-input v-model="form.projectname" :placeholder="$t('请填写项目名称')"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="20">
               <el-form-item :label="$t('客户名称')+':'" prop="enterprisename">
                 <el-input v-model="form.enterprisename" :placeholder="$t('请填写客户名称')"></el-input>
@@ -69,12 +74,6 @@
                 <el-input v-model="form.address" :placeholder="$t('请填写地址')"></el-input>
               </el-form-item>
             </el-col>
-
-            <el-col :span="24">
-              <el-form-item :label="$t('项目名称')+':'" prop="projectname">
-                <el-input v-model="form.projectname" :placeholder="$t('请填写项目名称')"></el-input>
-              </el-form-item>
-            </el-col>
             <el-col :span="20">
               <el-form-item :label="$t('项目规模')+':'" prop="scale" >
                 <el-input v-model="form.scale" :placeholder="$t('请填写数值')"  class="inline-16"></el-input>

src/HManagement/clueManage/m_activity/modules/editClue.vue

@@ -12,6 +12,11 @@
       <div class="drawer__panel">
         <el-row :gutter="10">
           <el-form :model="form" :rules="rules" ref="form" :label-width="tool.onlyZh('120px')" label-position="right" size="mini">
+            <el-col :span="24">
+              <el-form-item :label="$t('项目名称')+':'" prop="projectname">
+                <el-input v-model="form.projectname" :placeholder="$t('请填写项目名称')"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="20">
               <el-form-item :label="$t('客户名称')" prop="enterprisename">
                 <el-input v-model="form.enterprisename" :placeholder="$t('请输入客户名称')"></el-input>
@@ -69,31 +74,23 @@
                 <el-input v-model="form.address" :placeholder="$t(`请输入地址`)"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('项目名称')+':'" prop="projectname">
-                <el-input v-model="form.projectname" :placeholder="$t('请填写项目名称')"></el-input>
+            <el-col :span="20">
+              <el-form-item :label="$t('项目规模')+':'" prop="scale" >
+                <el-input v-model="form.scale" :placeholder="$t('请填写数值')"  class="inline-16"></el-input>
               </el-form-item>
             </el-col>
-
-              <el-col :span="20">
-                <el-form-item :label="$t('项目规模')+':'" prop="scale" >
-                  <el-input v-model="form.scale" :placeholder="$t('请填写数值')"  class="inline-16"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="4">
-                <el-select v-model="form.unitname" :placeholder="$t('请选择单位')" size="mini" >
-                  <el-option
-                      v-for="item in unitnameList"
-                      :key="item.value"
-                      :label="$t(item.value)"
-                      :value="item.value">
-                    <!--                    <span style="float: left">{{ $t(item.value) }}</span>-->
-                    <!--                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?$t(item.remarks):$t('暂无描述') }}</span>-->
-                  </el-option>
-                </el-select>
-              </el-col>
-
-
+            <el-col :span="4">
+              <el-select v-model="form.unitname" :placeholder="$t('请选择单位')" size="mini" >
+                <el-option
+                    v-for="item in unitnameList"
+                    :key="item.value"
+                    :label="$t(item.value)"
+                    :value="item.value">
+                  <!--                    <span style="float: left">{{ $t(item.value) }}</span>-->
+                  <!--                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?$t(item.remarks):$t('暂无描述') }}</span>-->
+                </el-option>
+              </el-select>
+            </el-col>
             <el-col :span="24"  v-if="siteid !== 'HY'">
               <el-form-item :label="$t('总投资额(万元)')+':'" prop="totalinvestment">
                 <el-input v-model="form.totalinvestment" :placeholder="$t('请填写金额(万元)')"></el-input>

src/SDrpManagement/performanceGoals_saler/index.vue

@@ -60,7 +60,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column :label="$t('目标') / $t('实际')" width="100">
+        <el-table-column :label="$t('目标') +'/'+ $t('实际')" width="100">
           <template>
             <p class="center d-text">{{ $t("目标") }}</p>
             <p class="border"></p>

src/SManagement/orderclue/components/add.vue

@@ -6,6 +6,11 @@
         <el-row :gutter="10">
           <el-form :model="param.content" :rules="rules" ref="ruleForm" :label-width="tool.onlyZh('120px')" class="demo-ruleForm"
                    label-position="right" size="small">
+            <el-col :span="24">
+              <el-form-item :label="$t('项目名称')+':'" prop="projectname">
+                <el-input v-model="param.content.projectname" :placeholder="$t('请填写项目名称')"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="20">
               <el-form-item :label="$t('客户名称') +':'" prop="enterprisename">
                 <el-input v-model="param.content.enterprisename"  :placeholder="$t('请填写客户名称')"></el-input>
@@ -59,11 +64,6 @@
                 <el-input v-model="param.content.address"  :placeholder="$t('请填写地址')"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('项目名称')+':'" prop="projectname">
-                <el-input v-model="param.content.projectname" :placeholder="$t('请填写项目名称')"></el-input>
-              </el-form-item>
-            </el-col>
             <el-col :span="20">
               <el-form-item :label="$t('项目规模')+':'" prop="scale" >
                 <el-input v-model="param.content.scale" :placeholder="$t('请填写数值')"  class="inline-16"></el-input>

src/SManagement/orderclue/components/edit.vue

@@ -6,6 +6,11 @@
         <el-row :gutter="10">
           <el-form :model="param" :rules="rules" ref="ruleForm" :label-width="tool.onlyZh('120px')" class="demo-ruleForm"
                    label-position="right" size="small">
+            <el-col :span="24">
+              <el-form-item :label="$t('项目名称')+':'" prop="projectname">
+                <el-input v-model="param.projectname" :placeholder="$t('请填写项目名称')"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="20">
               <el-form-item :label="$t('客户名称')+':'" prop="enterprisename">
                 <el-input v-model="param.enterprisename"  :placeholder="$t('请填写客户名称')"></el-input>
@@ -59,11 +64,6 @@
                 <el-input v-model="param.address"  :placeholder="$t('请填写地址')"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('项目名称')+':'" prop="projectname">
-                <el-input v-model="param.projectname" :placeholder="$t('请填写项目名称')"></el-input>
-              </el-form-item>
-            </el-col>
             <el-col :span="20">
               <el-form-item :label="$t('项目规模')+':'" prop="scale" >
                 <el-input v-model="param.scale" :placeholder="$t('请填写数值')" class="inline-16"></el-input>