线索管理、公海线索、销售线索,省市县展示调整；订货业务新增调整

src/SDrpManagement/salerOrder/modules/add.vue

@@ -179,7 +179,7 @@
               :span="12"
               v-if="form.type !== '工具订单' && form.type !== '项目订单'"
             >
-              <el-form-item :label="$t(`领域明细`)">
+              <el-form-item :label="$t(`领域明细`)" prop="tradefieldmx">
                 <el-select
                   v-model="form.tradefieldmx"
                   :placeholder="$t(`请选择领域明细`)"
@@ -217,7 +217,7 @@
                 form.type === '样品订单'
               "
             >
-              <el-form-item :label="$t(`项目备注`)">
+              <el-form-item :label="$t(`项目备注`)" prop="projectnote">
                 <el-input
                   size="mini"
                   class="order__note__input"
@@ -395,7 +395,10 @@ export default {
       this.typemxlist = res.data;
     },
     resetForm() {
-      this.$refs["form"].resetFields();
+      // this.$refs["form"].resetFields();
+      let type = this.form.type
+      this.$refs.form.resetFields()
+      this.form.type = type
       if (this.$refs.enterprise) this.$refs.enterprise.form.enterprisename = "";
     },
     async pageData() {
@@ -431,6 +434,7 @@ export default {
       this.form.sa_contractid = row.sa_contractid;
       this.form.sa_projectid = row.sa_projectid;
       this.form.contractname = row.title === "" ? this.$t("未知") : row.title;
+      this.$refs.form.validateField("contractname")
       this.visible = false;
     },
     setChildField(item) {
@@ -474,6 +478,7 @@ export default {
         rebate_used: 0, //默认0，是否使用返利金
         billdate: "", //单据日期，默认创建日期
         signbacknum: "",
+        contractname:""
       };
       this.visible1 = false;
     },

src/SManagement/orderclue/index.vue

@@ -84,6 +84,14 @@
           </div>
           <div v-else>--</div>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'city'">
+          <span v-if="scope.data.column.data.province.length > 0"
+          >{{ scope.data.column.data.province }}-{{
+              scope.data.column.data.city
+            }}-{{ scope.data.column.data.county }}</span
+          >
+          <span v-else>--</span>
+        </div>
         <div v-else-if="scope.data.column.columnname == 'scale'">
           <span>{{scope.data.column.data[[scope.data.column.columnname]] !== '' &&  scope.data.column.data[[scope.data.column.columnname]] !== 0?scope.data.column.data[[scope.data.column.columnname]]+$t(scope.data.column.data.unitname):'--'}}</span>
         </div>