前后:其他备注删除

src/dashoo.cn/backend/api/controllers/oilsupplier/supplier.go

@@ -1034,6 +1034,9 @@ func (this *OilSupplierController) GetJoinStoreEntityList() {
 	Order := this.GetString("Order")
 	Prop := this.GetString("Prop")
 	if Order != "" && Prop != "" {
+		if Prop == "Remark" {
+			Prop = "b.Remark"
+		}
 		orderby = Prop
 		if Order == "asc" {
 			asc = true

src/dashoo.cn/frontend_web/src/components/oilsupplierstore/basisinfo.vue

@@ -316,20 +316,20 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="备注">
-            <el-input v-model="formData.Remark" maxlength="500" placeholder="请输入" type="textarea" style="width: 100%">
-            </el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="其他备注">
-            <el-input v-model="formData.Remark1"
-                      maxlength="500"
-                      placeholder="请输入"
-                      type="textarea"
-                      style="width: 100%">
+            <el-input v-model="formData.Remark1" maxlength="500" placeholder="请输入" type="textarea" style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
+<!--        <el-col :span="12">-->
+<!--          <el-form-item label="其他备注">-->
+<!--            <el-input v-model="formData.Remark1"-->
+<!--                      maxlength="500"-->
+<!--                      placeholder="请输入"-->
+<!--                      type="textarea"-->
+<!--                      style="width: 100%">-->
+<!--            </el-input>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
       </el-row>
 
     </el-form>

src/dashoo.cn/frontend_web/src/components/oilsupplierstore/goodsinfo.vue

@@ -524,7 +524,7 @@
 
         <el-col :span="12">
           <el-form-item label="备注">
-            <el-input v-model="formData.Remark"
+            <el-input v-model="formData.Remark1"
                       maxlength="500"
                       placeholder="请输入"
                       type="textarea"
@@ -532,16 +532,16 @@
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-            <el-form-item label="其他备注">
-              <el-input v-model="formData.Remark1"
-                        maxlength="500"
-                        placeholder="请输入"
-                        type="textarea"
-                        style="width: 100%">
-              </el-input>
-            </el-form-item>
-        </el-col>
+<!--        <el-col :span="12">-->
+<!--            <el-form-item label="其他备注">-->
+<!--              <el-input v-model="formData.Remark1"-->
+<!--                        maxlength="500"-->
+<!--                        placeholder="请输入"-->
+<!--                        type="textarea"-->
+<!--                        style="width: 100%">-->
+<!--              </el-input>-->
+<!--            </el-form-item>-->
+<!--        </el-col>-->
 
       </el-row>
     </el-form>

src/dashoo.cn/frontend_web/src/components/oilsupplierstore/techinfo.vue

@@ -341,21 +341,21 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="备注">
-            <el-input v-model="formData.Remark" maxlength="500" placeholder="请输入" type="textarea"
-                      style="width: 100%">
-            </el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="其他备注">
-            <el-input v-model="formData.Remark1"
-                      maxlength="500"
-                      placeholder="请输入"
-                      type="textarea"
+            <el-input v-model="formData.Remark1" maxlength="500" placeholder="请输入" type="textarea"
                       style="width: 100%">
             </el-input>
           </el-form-item>
         </el-col>
+<!--        <el-col :span="12">-->
+<!--          <el-form-item label="其他备注">-->
+<!--            <el-input v-model="formData.Remark1"-->
+<!--                      maxlength="500"-->
+<!--                      placeholder="请输入"-->
+<!--                      type="textarea"-->
+<!--                      style="width: 100%">-->
+<!--            </el-input>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
       </el-row>
 
     </el-form>