物流单，发货单，项目商机合同bug修复

src/HDrpManagement/ProductMag/modules/add.vue

@@ -159,28 +159,28 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item :label="$t(`重量(kg)`)">
+              <el-form-item :label="$t(`重量(kg)`)" prop="weight">
                 <el-input v-model="form.weight" :placeholder="$t(`重量(kg)`)"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item :label="$t(`交期`)">
+              <el-form-item :label="$t(`交期`)" prop="delivery">
                 <el-input v-model="form.delivery" :placeholder="$t(`输入交期(天)`)"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item :label="$t(`保修期限`)">
+              <el-form-item :label="$t(`保修期限`)" prop="warrantyday">
                 <el-input v-model="form.warrantyday" :placeholder="$t(`输入保修期限(年)`)"></el-input>
               </el-form-item>
             </el-col>
 
             <el-col :span="12">
-              <el-form-item :label="$t(`满库存量`)">
+              <el-form-item :label="$t(`满库存量`)" prop="stockstatus1">
                 <el-input v-model="form.stockstatus1" :placeholder="$t(`满库存量`)"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item :label="$t(`缺货提醒`)">
+              <el-form-item :label="$t(`缺货提醒`)" prop="stockstatus2">
                 <el-input v-model="form.stockstatus2" :placeholder="$t(`缺货提醒`)"></el-input>
               </el-form-item>
             </el-col>
@@ -441,6 +441,116 @@ export default {
         categories: [
           { required: true,message:this.$t('请选择商品大类'), trigger:'change'}
         ],
+        weight:[
+          // { required: false,message:this.$t('不可输入空格'), trigger:'blur'}
+          {
+            validator: (rule, value, callback) => {
+              if (value == null || value === '') {
+                return callback(); // 允许为空
+              }
+
+              // 去掉前后空格后判断是否为空（可选）
+              // if (value.trim() === '') return callback(new Error(self.$t('不可全为空格')));
+
+              // 检查是否包含任何空格字符（包括全角空格）
+              const hasSpace = /[\s\u3000]/.test(value);
+              if (hasSpace) {
+                callback(new Error(this.$t('不可输入空格')));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'change'
+          }
+        ],
+        delivery:[
+          // { required: false,message:this.$t('不可输入空格'), trigger:'blur'}
+          {
+            validator: (rule, value, callback) => {
+              if (value == null || value === '') {
+                return callback(); // 允许为空
+              }
+
+              // 去掉前后空格后判断是否为空（可选）
+              // if (value.trim() === '') return callback(new Error(self.$t('不可全为空格')));
+
+              // 检查是否包含任何空格字符（包括全角空格）
+              const hasSpace = /[\s\u3000]/.test(value);
+              if (hasSpace) {
+                callback(new Error(this.$t('不可输入空格')));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'change'
+          }
+        ],
+        warrantyday:[
+          // { required: false,message:this.$t('不可输入空格'), trigger:'blur'}
+          {
+            validator: (rule, value, callback) => {
+              if (value == null || value === '') {
+                return callback(); // 允许为空
+              }
+
+              // 去掉前后空格后判断是否为空（可选）
+              // if (value.trim() === '') return callback(new Error(self.$t('不可全为空格')));
+
+              // 检查是否包含任何空格字符（包括全角空格）
+              const hasSpace = /[\s\u3000]/.test(value);
+              if (hasSpace) {
+                callback(new Error(this.$t('不可输入空格')));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'change'
+          }
+        ],
+        stockstatus1:[
+          // { required: false,message:this.$t('不可输入空格'), trigger:'blur'}
+          {
+            validator: (rule, value, callback) => {
+              if (value == null || value === '') {
+                return callback(); // 允许为空
+              }
+
+              // 去掉前后空格后判断是否为空（可选）
+              // if (value.trim() === '') return callback(new Error(self.$t('不可全为空格')));
+
+              // 检查是否包含任何空格字符（包括全角空格）
+              const hasSpace = /[\s\u3000]/.test(value);
+              if (hasSpace) {
+                callback(new Error(this.$t('不可输入空格')));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'change'
+          }
+        ],
+        stockstatus2:[
+          // { required: false,message:this.$t('不可输入空格'), trigger:'blur'}
+          {
+            validator: (rule, value, callback) => {
+              if (value == null || value === '') {
+                return callback(); // 允许为空
+              }
+
+              // 去掉前后空格后判断是否为空（可选）
+              // if (value.trim() === '') return callback(new Error(self.$t('不可全为空格')));
+
+              // 检查是否包含任何空格字符（包括全角空格）
+              const hasSpace = /[\s\u3000]/.test(value);
+              if (hasSpace) {
+                callback(new Error(this.$t('不可输入空格')));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'change'
+          }
+        ]
       },
       unitGroupData:[],
       unitData:[],

src/HDrpManagement/ProductMag/modules/edit.vue

@@ -159,28 +159,28 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item :label="$t(`重量(kg)`)">
+              <el-form-item :label="$t(`重量(kg)`)" prop="weight">
                 <el-input v-model="form.weight" :placeholder="$t(`重量(kg)`)"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item :label="$t(`交期`)">
+              <el-form-item :label="$t(`交期`)" prop="delivery">
                 <el-input v-model="form.delivery" :placeholder="$t(`输入交期`)"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item :label="$t(`保修期限`)">
+              <el-form-item :label="$t(`保修期限`)" prop="warrantyday">
                 <el-input v-model="form.warrantyday" :placeholder="$t(`输入保修期限`)"></el-input>
               </el-form-item>
             </el-col>
 
             <el-col :span="12">
-              <el-form-item :label="$t(`满库存量`)">
+              <el-form-item :label="$t(`满库存量`)" prop="stockstatus1">
                 <el-input v-model="form.stockstatus1" :placeholder="$t(`满库存量`)"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item :label="$t(`缺货提醒`)">
+              <el-form-item :label="$t(`缺货提醒`)" prop="stockstatus2">
                 <el-input v-model="form.stockstatus2" :placeholder="$t(`缺货提醒`)"></el-input>
               </el-form-item>
             </el-col>
@@ -444,6 +444,116 @@ export default {
         categories: [
           { required: true,message:this.$t('请选择商品大类'), trigger:'change'}
         ],
+        weight:[
+          // { required: false,message:this.$t('不可输入空格'), trigger:'blur'}
+          {
+            validator: (rule, value, callback) => {
+              if (value == null || value === '') {
+                return callback(); // 允许为空
+              }
+
+              // 去掉前后空格后判断是否为空（可选）
+              // if (value.trim() === '') return callback(new Error(self.$t('不可全为空格')));
+
+              // 检查是否包含任何空格字符（包括全角空格）
+              const hasSpace = /[\s\u3000]/.test(value);
+              if (hasSpace) {
+                callback(new Error(this.$t('不可输入空格')));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'change'
+          }
+        ],
+        delivery:[
+          // { required: false,message:this.$t('不可输入空格'), trigger:'blur'}
+          {
+            validator: (rule, value, callback) => {
+              if (value == null || value === '') {
+                return callback(); // 允许为空
+              }
+
+              // 去掉前后空格后判断是否为空（可选）
+              // if (value.trim() === '') return callback(new Error(self.$t('不可全为空格')));
+
+              // 检查是否包含任何空格字符（包括全角空格）
+              const hasSpace = /[\s\u3000]/.test(value);
+              if (hasSpace) {
+                callback(new Error(this.$t('不可输入空格')));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'change'
+          }
+        ],
+        warrantyday:[
+          // { required: false,message:this.$t('不可输入空格'), trigger:'blur'}
+          {
+            validator: (rule, value, callback) => {
+              if (value == null || value === '') {
+                return callback(); // 允许为空
+              }
+
+              // 去掉前后空格后判断是否为空（可选）
+              // if (value.trim() === '') return callback(new Error(self.$t('不可全为空格')));
+
+              // 检查是否包含任何空格字符（包括全角空格）
+              const hasSpace = /[\s\u3000]/.test(value);
+              if (hasSpace) {
+                callback(new Error(this.$t('不可输入空格')));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'change'
+          }
+        ],
+        stockstatus1:[
+          // { required: false,message:this.$t('不可输入空格'), trigger:'blur'}
+          {
+            validator: (rule, value, callback) => {
+              if (value == null || value === '') {
+                return callback(); // 允许为空
+              }
+
+              // 去掉前后空格后判断是否为空（可选）
+              // if (value.trim() === '') return callback(new Error(self.$t('不可全为空格')));
+
+              // 检查是否包含任何空格字符（包括全角空格）
+              const hasSpace = /[\s\u3000]/.test(value);
+              if (hasSpace) {
+                callback(new Error(this.$t('不可输入空格')));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'change'
+          }
+        ],
+        stockstatus2:[
+          // { required: false,message:this.$t('不可输入空格'), trigger:'blur'}
+          {
+            validator: (rule, value, callback) => {
+              if (value == null || value === '') {
+                return callback(); // 允许为空
+              }
+
+              // 去掉前后空格后判断是否为空（可选）
+              // if (value.trim() === '') return callback(new Error(self.$t('不可全为空格')));
+
+              // 检查是否包含任何空格字符（包括全角空格）
+              const hasSpace = /[\s\u3000]/.test(value);
+              if (hasSpace) {
+                callback(new Error(this.$t('不可输入空格')));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'change'
+          }
+        ]
       },
       unitGroupData:[],
       unitData:[],

src/HDrpManagement/dispatch/modules/add.vue

@@ -62,7 +62,7 @@
           prop="checkdate"
           :label="$t(`审核时间`)"
         ></el-table-column>
-        <el-table-column prop="remarks" :label="$t('备注')"></el-table-column>
+        <el-table-column prop="remarks" :label="$t('对外备注')"></el-table-column>
         <el-table-column :label="$t('操作')" width="90">
           <template slot-scope="scope">
             <el-button

src/HDrpManagement/dispatch/modules/edit.vue

@@ -165,7 +165,8 @@ export default {
         logist_info:{},
         billdate:(new Date()).toISOString().split('T')[0],
         freightstatus:'',
-        remarks:''
+        remarks:'',
+        remarks_in:''
       },
       setcol:24,
       pickerOptions: {
@@ -201,6 +202,7 @@ export default {
       this.defaultData.freightstatus = this.data.freightstatus
       this.defaultData.billdate = this.data.billdate?this.data.billdate:this.siteid == 'YOSTEST1' || this.siteid == 'HY'?'':(new Date()).toISOString().split('T')[0]
       this.defaultData.remarks = this.data.remarks
+      this.defaultData.remarks_in = this.data.remarks_in
     },
     async deleteContacts (row) {
       const res = await this.$api.requested({

src/HDrpManagement/logistics/modules/add.vue

@@ -45,9 +45,12 @@
         <el-form-item :label="$t(`运费`)">
           <el-input v-model.number="form.freightamount" :placeholder="$t(`运费`)"></el-input>
         </el-form-item>
-        <el-form-item :label="$t('备注')">
+        <el-form-item :label="$t('对外备注')">
           <el-input v-model="form.remarks" :placeholder="$t('备注')"></el-input>
         </el-form-item>
+        <el-form-item :label="$t('对内备注')">
+          <el-input v-model="form.remarks_in" :placeholder="$t('备注')"></el-input>
+        </el-form-item>
         <el-form-item :label="$t(`单据日期`)" prop="billdate">
           <el-date-picker
             v-model="form.billdate"
@@ -104,6 +107,7 @@ export default {
         "logisticno": "",
         "paytype": "",
         "remarks": "",
+        "remarks_in":"",
         "sa_dispatchids": [],
         "sa_logiscompid": 0,
         "sa_logisticsid": 0,
@@ -158,6 +162,7 @@ export default {
       this.$refs['dislist'].tableData = unique([...this.$refs['dislist'].tableData,...data],'billno')
       this.isCorrelate = this.$refs.dislist.tableData.length
       this.form.remarks = this.$refs['dislist'].tableData[0].remarks
+      this.form.remarks_in = this.$refs['dislist'].tableData[0].remarks_in
       this.selectList = this.$refs.dislist.tableData
     },
     async onSubmit () {

src/HDrpManagement/projectChange/modules/modules/contract/index.vue

@@ -18,10 +18,7 @@
       <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  fixedName="operation" height="calc(100vh - 465px)">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname === 'status'">
-            <span style="color:#3874f6" v-if="scope.column.data[[scope.column.columnname]] == '新建'">{{$t(scope.column.data[[scope.column.columnname]])}}</span>
-            <span style="color:#52c41a" v-else-if="scope.column.data[[scope.column.columnname]] == '已提交'">{{$t(scope.column.data[[scope.column.columnname]])}}</span>
-            <span style="color:#333333" v-else-if="scope.column.data[[scope.column.columnname]] == '审核'">{{$t(scope.column.data[[scope.column.columnname]])}}</span>
-            <span style="color:#000000" v-else>{{$t(scope.column.data[[scope.column.columnname]])}}</span>
+            <span :style="tool.getStatusColor(scope.column.data[[scope.column.columnname]])">{{$t(scope.column.data[[scope.column.columnname]])}}</span>
           </div>
           <div v-else-if="scope.column.columnname === 'operation'">
             <span>{{$t(scope.column.data[scope.column.columnname])}}</span>