Merge branch 'mergeBranch' into orangeUrgent

src/HDrpManagement/orderManage/modules/add.vue

@@ -234,6 +234,9 @@ export default {
       console.log(this.form)
       this.$refs['form'].validate(async valid => {
         if (!valid) return
+        if (this.form.type === '工具订单') {
+          this.form.tradefield = ''
+        }
         this.$store.commit('setLoading',true)
         const res = await this.$api.requested({
           "id":this.form.type ==='项目订单'?20230103141402: 20221108111402,

src/HDrpManagement/writeoffbill/components/edit.vue

@@ -40,7 +40,7 @@
                 <el-date-picker
                   v-model="form.billnodate"
                   type="date"
-                  value-format="yy-mm-dd"
+                  value-format="yyyy-MM-dd"
                   placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>